diff options
| author | Jason Ekstrand <[email protected]> | 2017-09-19 13:49:05 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2018-03-07 12:13:47 -0800 |
| commit | 3960d0e3329657202abaf2ffd4f4dc32b63c58b0 (patch) | |
| tree | 6fcf4f56f0e8d2392b0f1256f6d02a3826342b7a /src/amd | |
| parent | 68af9f04a4a3cd5d8d6777d4b2c575d5fbabda97 (diff) | |
vulkan: Rename multiview from KHX to KHR
Reviewed-by: Lionel Landwerlin <[email protected]>
Reviewed-by: Samuel Iglesias Gonsálvez <[email protected]>
Reviewed-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/amd')
| -rw-r--r-- | src/amd/vulkan/radv_device.c | 8 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_extensions.py | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_pass.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 36d7a406bf8..666818f2c49 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -659,8 +659,8 @@ void radv_GetPhysicalDeviceFeatures2KHR( features->variablePointers = false; break; } - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHX: { - VkPhysicalDeviceMultiviewFeaturesKHX *features = (VkPhysicalDeviceMultiviewFeaturesKHX*)ext; + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHR: { + VkPhysicalDeviceMultiviewFeaturesKHR *features = (VkPhysicalDeviceMultiviewFeaturesKHR*)ext; features->multiview = true; features->multiviewGeometryShader = true; features->multiviewTessellationShader = true; @@ -842,8 +842,8 @@ void radv_GetPhysicalDeviceProperties2KHR( properties->deviceLUIDValid = false; break; } - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHX: { - VkPhysicalDeviceMultiviewPropertiesKHX *properties = (VkPhysicalDeviceMultiviewPropertiesKHX*)ext; + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHR: { + VkPhysicalDeviceMultiviewPropertiesKHR *properties = (VkPhysicalDeviceMultiviewPropertiesKHR*)ext; properties->maxMultiviewViewCount = MAX_VIEWS; properties->maxMultiviewInstanceIndex = INT_MAX; break; diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py index 6a323ea9b0b..458f05668ae 100644 --- a/src/amd/vulkan/radv_extensions.py +++ b/src/amd/vulkan/radv_extensions.py @@ -81,7 +81,7 @@ EXTENSIONS = [ Extension('VK_KHR_wayland_surface', 6, 'VK_USE_PLATFORM_WAYLAND_KHR'), Extension('VK_KHR_xcb_surface', 6, 'VK_USE_PLATFORM_XCB_KHR'), Extension('VK_KHR_xlib_surface', 6, 'VK_USE_PLATFORM_XLIB_KHR'), - Extension('VK_KHX_multiview', 1, '!ANDROID'), + Extension('VK_KHR_multiview', 1, True), Extension('VK_EXT_debug_report', 9, True), Extension('VK_EXT_discard_rectangles', 1, True), Extension('VK_EXT_external_memory_dma_buf', 1, True), diff --git a/src/amd/vulkan/radv_pass.c b/src/amd/vulkan/radv_pass.c index a52dae39d93..30289557164 100644 --- a/src/amd/vulkan/radv_pass.c +++ b/src/amd/vulkan/radv_pass.c @@ -38,7 +38,7 @@ VkResult radv_CreateRenderPass( struct radv_render_pass *pass; size_t size; size_t attachments_offset; - VkRenderPassMultiviewCreateInfoKHX *multiview_info = NULL; + VkRenderPassMultiviewCreateInfoKHR *multiview_info = NULL; assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO); @@ -59,8 +59,8 @@ VkResult radv_CreateRenderPass( vk_foreach_struct(ext, pCreateInfo->pNext) { switch(ext->sType) { - case VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHX: - multiview_info = ( VkRenderPassMultiviewCreateInfoKHX*)ext; + case VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR: + multiview_info = ( VkRenderPassMultiviewCreateInfoKHR*)ext; break; default: break; |