From: Tobin Ehlis <tobine@google.com>
Date: Thu, 4 Jun 2020 21:54:56 +0000 (-0600)
Subject: icd:Correctly Support Vulkan 1.1
X-Git-Tag: upstream/1.2.179~89
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b40c4aa0dba6bf479431267d8ef715ab1376cc1;p=platform%2Fupstream%2FVulkan-Tools.git

icd:Correctly Support Vulkan 1.1

Mock ICD supports Vulkan 1.1 but was only returning 1.0.
Fixing this.
---

diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp
index 4688e99..dab223d 100644
--- a/icd/generated/mock_icd.cpp
+++ b/icd/generated/mock_icd.cpp
@@ -276,7 +276,7 @@ static VKAPI_ATTR void VKAPI_CALL GetPhysicalDeviceProperties(
     VkPhysicalDeviceProperties*                 pProperties)
 {
     // TODO: Just hard-coding some values for now
-    pProperties->apiVersion = VK_API_VERSION_1_0;
+    pProperties->apiVersion = VK_API_VERSION_1_1;
     pProperties->driverVersion = 1;
     pProperties->vendorID = 0xba5eba11;
     pProperties->deviceID = 0xf005ba11;
@@ -1693,7 +1693,8 @@ static VKAPI_ATTR void VKAPI_CALL CmdExecuteCommands(
 static VKAPI_ATTR VkResult VKAPI_CALL EnumerateInstanceVersion(
     uint32_t*                                   pApiVersion)
 {
-//Not a CREATE or DESTROY function
+
+    *pApiVersion = VK_API_VERSION_1_1;
     return VK_SUCCESS;
 }
 
diff --git a/scripts/mock_icd_generator.py b/scripts/mock_icd_generator.py
index bf48520..9a785a9 100644
--- a/scripts/mock_icd_generator.py
+++ b/scripts/mock_icd_generator.py
@@ -496,6 +496,10 @@ CUSTOM_C_INTERCEPTS = {
 'vkEnumerateInstanceLayerProperties': '''
     return VK_SUCCESS;
 ''',
+'vkEnumerateInstanceVersion': '''
+    *pApiVersion = VK_API_VERSION_1_1;
+    return VK_SUCCESS;
+''',
 'vkEnumerateDeviceLayerProperties': '''
     return VK_SUCCESS;
 ''',
@@ -765,7 +769,7 @@ CUSTOM_C_INTERCEPTS = {
 ''',
 'vkGetPhysicalDeviceProperties': '''
     // TODO: Just hard-coding some values for now
-    pProperties->apiVersion = VK_API_VERSION_1_0;
+    pProperties->apiVersion = VK_API_VERSION_1_1;
     pProperties->driverVersion = 1;
     pProperties->vendorID = 0xba5eba11;
     pProperties->deviceID = 0xf005ba11;
@@ -1302,7 +1306,7 @@ class MockICDOutputGenerator(OutputGenerator):
             return
 
         manual_functions = [
-            # Include functions here to be interecpted w/ manually implemented function bodies
+            # Include functions here to be intercepted w/ manually implemented function bodies
             'vkGetDeviceProcAddr',
             'vkGetInstanceProcAddr',
             'vkCreateDevice',
@@ -1312,6 +1316,7 @@ class MockICDOutputGenerator(OutputGenerator):
             #'vkCreateDebugReportCallbackEXT',
             #'vkDestroyDebugReportCallbackEXT',
             'vkEnumerateInstanceLayerProperties',
+            'vkEnumerateInstanceVersion',
             'vkEnumerateInstanceExtensionProperties',
             'vkEnumerateDeviceLayerProperties',
             'vkEnumerateDeviceExtensionProperties',