Józef Kucia : vkd3d: Trace decoded driver versions.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 52e44b55334bec429c3193773c4cad46bdc1e8c2
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=52e44b55334bec429c319377...

Author: Józef Kucia 
Date:   Thu Feb 14 12:22:27 2019 +0100

vkd3d: Trace decoded driver versions.

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

---

libs/vkd3d/device.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index b71d442..438e189 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -576,6 +576,8 @@ static void vkd3d_trace_physical_device(VkPhysicalDevice device,
         const VkPhysicalDeviceProperties *vk_device_properties,
         const struct vkd3d_vk_instance_procs *vk_procs)
 {
+    const uint32_t driver_version = vk_device_properties->driverVersion;
+    const uint32_t api_version = vk_device_properties->apiVersion;
     VkPhysicalDeviceMemoryProperties memory_properties;
     VkQueueFamilyProperties *queue_properties;
     unsigned int i, j;
@@ -583,9 +585,11 @@ static void vkd3d_trace_physical_device(VkPhysicalDevice device,

TRACE("Device name: %s.\n", vk_device_properties->deviceName);
     TRACE("Vendor ID: %#x, Device ID: %#x.\n", vk_device_properties->vendorID, vk_device_properties->deviceID);
-    TRACE("Driver version: %#x.\n", vk_device_properties->driverVersion);
-    TRACE("API version: %u.%u.%u.\n", VK_VERSION_MAJOR(vk_device_properties->apiVersion),
-            VK_VERSION_MINOR(vk_device_properties->apiVersion), VK_VERSION_PATCH(vk_device_properties->apiVersion));
+    TRACE("Driver version: %#x (%u.%u.%u, %u.%u.%u.%u).\n", driver_version,
+            VK_VERSION_MAJOR(driver_version), VK_VERSION_MINOR(driver_version), VK_VERSION_PATCH(driver_version),
+            driver_version >> 22, (driver_version >> 14) & 0xff, (driver_version >> 6) & 0xff, driver_version & 0x3f);
+    TRACE("API version: %u.%u.%u.\n",
+            VK_VERSION_MAJOR(api_version), VK_VERSION_MINOR(api_version), VK_VERSION_PATCH(api_version));

VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(device, &count, NULL));
     TRACE("Queue families [%u]:\n", count);