diff options
| author | Tobin Ehlis <tobine@google.com> | 2020-06-04 15:54:56 -0600 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2020-06-04 17:13:30 -0600 |
| commit | 5b40c4aa0dba6bf479431267d8ef715ab1376cc1 (patch) | |
| tree | 611c4c0e52d2161c2bf76ca28adb888b253c98cc | |
| parent | 322784a873be43731be6eca906cbfc895fe59f00 (diff) | |
| download | usermoji-5b40c4aa0dba6bf479431267d8ef715ab1376cc1.tar.xz | |
icd:Correctly Support Vulkan 1.1
Mock ICD supports Vulkan 1.1 but was only returning 1.0.
Fixing this.
| -rw-r--r-- | icd/generated/mock_icd.cpp | 5 | ||||
| -rw-r--r-- | scripts/mock_icd_generator.py | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp index 4688e992..dab223d2 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 bf48520f..9a785a9e 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', |