Reviewed-by: Dave Airlie <airl...@redhat.com>
---
 src/amd/vulkan/radv_device.c      | 8 ++++----
 src/amd/vulkan/radv_extensions.py | 2 +-
 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 36d7a406bf..666818f2c4 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 92b1ea3e14..6c143a21cd 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 a52dae39d9..3028955716 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;
-- 
2.16.1

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to