Józef Kucia : winevulkan: Trace VkApplicationInfo in wine_vkCreateInstance().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3cad90e3341de6102284a39f449e13b77be2f280
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3cad90e3341de6102284a39f4...

Author: Józef Kucia 
Date:   Mon Sep 10 15:42:45 2018 +0200

winevulkan: Trace VkApplicationInfo in wine_vkCreateInstance().

Signed-off-by: Józef Kucia 
Signed-off-by: Alexandre Julliard

---

dlls/winevulkan/vulkan.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index 83041a5..c30f666 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -362,16 +362,6 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo

*dst = *src;

-    if (dst->pApplicationInfo)
-    {
-        const VkApplicationInfo *app_info = dst->pApplicationInfo;
-        TRACE("Application name %s, application version %#x\n",
-                debugstr_a(app_info->pApplicationName), app_info->applicationVersion);
-        TRACE("Engine name %s, engine version %#x\n", debugstr_a(app_info->pEngineName),
-                app_info->engineVersion);
-        TRACE("API version %#x\n", app_info->apiVersion);
-    }
-
     /* Application and loader can pass in a chain of extensions through pNext.
      * We can't blindly pass these through as often these contain callbacks or
      * they can even be pass structures for loader / ICD internal use. For now
@@ -762,10 +752,17 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info,
         return res;
     }

-    if ((app_info = create_info->pApplicationInfo) && app_info->pApplicationName)
+    if ((app_info = create_info->pApplicationInfo))
     {
-        if (!strcmp(app_info->pApplicationName, "DOOM")
-                || !strcmp(app_info->pApplicationName, "Wolfenstein II The New Colossus"))
+        TRACE("Application name %s, application version %#x.\n",
+                debugstr_a(app_info->pApplicationName), app_info->applicationVersion);
+        TRACE("Engine name %s, engine version %#x.\n", debugstr_a(app_info->pEngineName),
+                app_info->engineVersion);
+        TRACE("API version %#x.\n", app_info->apiVersion);
+
+        if (app_info->pApplicationName
+                && (!strcmp(app_info->pApplicationName, "DOOM")
+                || !strcmp(app_info->pApplicationName, "Wolfenstein II The New Colossus")))
             object->quirks |= WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR;
     }