From 3960d0e3329657202abaf2ffd4f4dc32b63c58b0 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 19 Sep 2017 13:49:05 -0700 Subject: [PATCH] vulkan: Rename multiview from KHX to KHR MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Lionel Landwerlin Reviewed-by: Samuel Iglesias Gonsálvez Reviewed-by: Dave Airlie --- include/vulkan/vulkan.h | 24 ++++++++++++------------ src/amd/vulkan/radv_device.c | 8 ++++---- src/amd/vulkan/radv_extensions.py | 2 +- src/amd/vulkan/radv_pass.c | 6 +++--- src/intel/vulkan/anv_device.c | 12 ++++++------ src/intel/vulkan/anv_extensions.py | 2 +- src/intel/vulkan/anv_pass.c | 4 ++-- src/intel/vulkan/genX_pipeline.c | 2 +- src/vulkan/registry/vk.xml | 32 ++++++++++++++++---------------- 9 files changed, 46 insertions(+), 46 deletions(-) diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index d3e2e24..53cee54 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -224,9 +224,9 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_BUFFER_CREATE_INFO_NV = 1000026001, VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV = 1000026002, VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD = 1000041000, - VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHX = 1000053000, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHX = 1000053001, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHX = 1000053002, + VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR = 1000053000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHR = 1000053001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHR = 1000053002, VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_NV = 1000056000, VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_NV = 1000056001, VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_NV = 1000057000, @@ -5547,11 +5547,11 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetShaderInfoAMD( #define VK_AMD_SHADER_IMAGE_LOAD_STORE_LOD_EXTENSION_NAME "VK_AMD_shader_image_load_store_lod" -#define VK_KHX_multiview 1 -#define VK_KHX_MULTIVIEW_SPEC_VERSION 1 -#define VK_KHX_MULTIVIEW_EXTENSION_NAME "VK_KHX_multiview" +#define VK_KHR_multiview 1 +#define VK_KHR_MULTIVIEW_SPEC_VERSION 1 +#define VK_KHR_MULTIVIEW_EXTENSION_NAME "VK_KHR_multiview" -typedef struct VkRenderPassMultiviewCreateInfoKHX { +typedef struct VkRenderPassMultiviewCreateInfoKHR { VkStructureType sType; const void* pNext; uint32_t subpassCount; @@ -5560,22 +5560,22 @@ typedef struct VkRenderPassMultiviewCreateInfoKHX { const int32_t* pViewOffsets; uint32_t correlationMaskCount; const uint32_t* pCorrelationMasks; -} VkRenderPassMultiviewCreateInfoKHX; +} VkRenderPassMultiviewCreateInfoKHR; -typedef struct VkPhysicalDeviceMultiviewFeaturesKHX { +typedef struct VkPhysicalDeviceMultiviewFeaturesKHR { VkStructureType sType; void* pNext; VkBool32 multiview; VkBool32 multiviewGeometryShader; VkBool32 multiviewTessellationShader; -} VkPhysicalDeviceMultiviewFeaturesKHX; +} VkPhysicalDeviceMultiviewFeaturesKHR; -typedef struct VkPhysicalDeviceMultiviewPropertiesKHX { +typedef struct VkPhysicalDeviceMultiviewPropertiesKHR { VkStructureType sType; void* pNext; uint32_t maxMultiviewViewCount; uint32_t maxMultiviewInstanceIndex; -} VkPhysicalDeviceMultiviewPropertiesKHX; +} VkPhysicalDeviceMultiviewPropertiesKHR; diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 36d7a40..666818f 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 6a323ea..458f056 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 a52dae3..3028955 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; diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 78cd0da..62dc1b1 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -767,9 +767,9 @@ void anv_GetPhysicalDeviceFeatures2KHR( vk_foreach_struct(ext, pFeatures->pNext) { switch (ext->sType) { - 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; @@ -984,9 +984,9 @@ void anv_GetPhysicalDeviceProperties2KHR( 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 = 16; properties->maxMultiviewInstanceIndex = UINT32_MAX / 16; break; diff --git a/src/intel/vulkan/anv_extensions.py b/src/intel/vulkan/anv_extensions.py index 676efa4..5a36708 100644 --- a/src/intel/vulkan/anv_extensions.py +++ b/src/intel/vulkan/anv_extensions.py @@ -83,7 +83,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', 8, True), Extension('VK_EXT_external_memory_dma_buf', 1, True), Extension('VK_EXT_global_priority', 1, diff --git a/src/intel/vulkan/anv_pass.c b/src/intel/vulkan/anv_pass.c index 5b8b138..994a7e2 100644 --- a/src/intel/vulkan/anv_pass.c +++ b/src/intel/vulkan/anv_pass.c @@ -293,8 +293,8 @@ VkResult anv_CreateRenderPass( vk_foreach_struct(ext, pCreateInfo->pNext) { switch (ext->sType) { - case VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHX: { - VkRenderPassMultiviewCreateInfoKHX *mv = (void *)ext; + case VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR: { + VkRenderPassMultiviewCreateInfoKHR *mv = (void *)ext; for (uint32_t i = 0; i < mv->subpassCount; i++) { pass->subpasses[i].view_mask = mv->pViewMasks[i]; diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c index 412fb6a..9c08bc2 100644 --- a/src/intel/vulkan/genX_pipeline.c +++ b/src/intel/vulkan/genX_pipeline.c @@ -156,7 +156,7 @@ emit_vertex_input(struct anv_pipeline *pipeline, anv_batch_emit(&pipeline->batch, GENX(3DSTATE_VF_INSTANCING), vfi) { vfi.InstancingEnable = pipeline->instancing_enable[desc->binding]; vfi.VertexElementIndex = slot; - /* Our implementation of VK_KHX_multiview uses instancing to draw + /* Our implementation of VK_KHR_multiview uses instancing to draw * the different views. If the client asks for instancing, we * need to use the Instance Data Step Rate to ensure that we * repeat the client's per-instance data once for each view. diff --git a/src/vulkan/registry/vk.xml b/src/vulkan/registry/vk.xml index 13fc262..91ace82 100644 --- a/src/vulkan/registry/vk.xml +++ b/src/vulkan/registry/vk.xml @@ -2087,21 +2087,21 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkFence fence VkExternalFenceHandleTypeFlagBitsKHR handleType - - VkStructureType sType + + VkStructureType sType void* pNext VkBool32 multiviewMultiple views in a renderpass VkBool32 multiviewGeometryShaderMultiple views in a renderpass w/ geometry shader VkBool32 multiviewTessellationShaderMultiple views in a renderpass w/ tessellation shader - - VkStructureType sType + + VkStructureType sType void* pNext uint32_t maxMultiviewViewCountmax number of views in a subpass uint32_t maxMultiviewInstanceIndexmax instance index for a draw in a multiview subpass - - VkStructureType sType + + VkStructureType sType const void* pNext uint32_t subpassCount const uint32_t* pViewMasks @@ -6154,17 +6154,17 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - - - - - - - - - + + + + + + + + + -- 2.7.4