Please squash
https://patchwork.freedesktop.org/patch/208665/
Into this to avoid radv build failures.
On Wed, Mar 7, 2018 at 3:34 PM, Jason Ekstrand <ja...@jlekstrand.net> wrote:
> Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>
> Reviewed-by: Samuel Iglesias Gonsálvez <sigles...@igalia.com>
> ---
> include/vulkan/vulkan.h | 24 ++++++++++++------------
> 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 ++++++++++++++++----------------
> 6 files changed, 38 insertions(+), 38 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/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.
> <member><type>VkFence</type>
> <name>fence</name></member>
> <member><type>VkExternalFenceHandleTypeFlagBitsKHR</type>
> <name>handleType</name></member>
> </type>
> - <type category="struct" name="VkPhysicalDeviceMultiviewFeaturesKHX"
> structextends="VkPhysicalDeviceFeatures2KHR,VkDeviceCreateInfo">
> - <member
> values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHX"><type>VkStructureType</type>
> <name>sType</name></member>
> + <type category="struct" name="VkPhysicalDeviceMultiviewFeaturesKHR"
> structextends="VkPhysicalDeviceFeatures2KHR,VkDeviceCreateInfo">
> + <member
> values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHR"><type>VkStructureType</type>
> <name>sType</name></member>
> <member noautovalidity="true"><type>void</type>*
> <name>pNext</name></member>
> <member><type>VkBool32</type>
> <name>multiview</name><comment>Multiple views in a
> renderpass</comment></member>
> <member><type>VkBool32</type>
> <name>multiviewGeometryShader</name><comment>Multiple views in a renderpass
> w/ geometry shader</comment></member>
> <member><type>VkBool32</type>
> <name>multiviewTessellationShader</name><comment>Multiple views in a
> renderpass w/ tessellation shader</comment></member>
> </type>
> - <type category="struct"
> name="VkPhysicalDeviceMultiviewPropertiesKHX" returnedonly="true"
> structextends="VkPhysicalDeviceProperties2KHR">
> - <member
> values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHX"><type>VkStructureType</type>
> <name>sType</name></member>
> + <type category="struct"
> name="VkPhysicalDeviceMultiviewPropertiesKHR" returnedonly="true"
> structextends="VkPhysicalDeviceProperties2KHR">
> + <member
> values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHR"><type>VkStructureType</type>
> <name>sType</name></member>
> <member><type>void</type>*
> <name>pNext</name></member>
> <member><type>uint32_t</type>
> <name>maxMultiviewViewCount</name><comment>max number of views in a
> subpass</comment></member>
> <member><type>uint32_t</type>
> <name>maxMultiviewInstanceIndex</name><comment>max instance index for a draw
> in a multiview subpass</comment></member>
> </type>
> - <type category="struct" name="VkRenderPassMultiviewCreateInfoKHX"
> structextends="VkRenderPassCreateInfo">
> - <member
> values="VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHX"><type>VkStructureType</type>
> <name>sType</name></member>
> + <type category="struct" name="VkRenderPassMultiviewCreateInfoKHR"
> structextends="VkRenderPassCreateInfo">
> + <member
> values="VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR"><type>VkStructureType</type>
> <name>sType</name></member>
> <member>const <type>void</type>*
> <name>pNext</name></member>
> <member optional="true"><type>uint32_t</type>
> <name>subpassCount</name></member>
> <member len="subpassCount">const <type>uint32_t</type>*
> <name>pViewMasks</name></member>
> @@ -6154,17 +6154,17 @@ private version is maintained in the 1.0 branch of
> the member gitlab server.
> <enum value=""VK_NV_extension_53""
> name="VK_NV_EXTENSION_53_EXTENSION_NAME"/>
> </require>
> </extension>
> - <extension name="VK_KHX_multiview" number="54" type="device"
> author="NV" requires="VK_KHR_get_physical_device_properties2" contact="Jeff
> Bolz @jbolz" supported="vulkan">
> + <extension name="VK_KHR_multiview" number="54" type="device"
> author="NV" requires="VK_KHR_get_physical_device_properties2" contact="Jeff
> Bolz @jbolz" supported="vulkan">
> <require>
> - <enum value="1"
> name="VK_KHX_MULTIVIEW_SPEC_VERSION"/>
> - <enum value=""VK_KHX_multiview""
> name="VK_KHX_MULTIVIEW_EXTENSION_NAME"/>
> - <enum offset="0" extends="VkStructureType"
> name="VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHX"/>
> - <enum offset="1" extends="VkStructureType"
> name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHX"/>
> - <enum offset="2" extends="VkStructureType"
> name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHX"/>
> - <enum bitpos="1" extends="VkDependencyFlagBits"
> name="VK_DEPENDENCY_VIEW_LOCAL_BIT_KHX"/>
> - <type name="VkRenderPassMultiviewCreateInfoKHX"/>
> - <type name="VkPhysicalDeviceMultiviewFeaturesKHX"/>
> - <type name="VkPhysicalDeviceMultiviewPropertiesKHX"/>
> + <enum value="1"
> name="VK_KHR_MULTIVIEW_SPEC_VERSION"/>
> + <enum value=""VK_KHR_multiview""
> name="VK_KHR_MULTIVIEW_EXTENSION_NAME"/>
> + <enum offset="0" extends="VkStructureType"
> name="VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR"/>
> + <enum offset="1" extends="VkStructureType"
> name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHR"/>
> + <enum offset="2" extends="VkStructureType"
> name="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHR"/>
> + <enum bitpos="1" extends="VkDependencyFlagBits"
> name="VK_DEPENDENCY_VIEW_LOCAL_BIT_KHR"/>
> + <type name="VkRenderPassMultiviewCreateInfoKHR"/>
> + <type name="VkPhysicalDeviceMultiviewFeaturesKHR"/>
> + <type name="VkPhysicalDeviceMultiviewPropertiesKHR"/>
> </require>
> </extension>
> <extension name="VK_IMG_format_pvrtc" number="55" type="device"
> author="IMG" contact="Tobias Hector @tobias" supported="vulkan">
> --
> 2.5.0.400.gff86faf
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
