subject:"\[Mesa\-dev\] \[PATCH 03\/56\] vulkan\: Rename multiview from KHX to KHR"

Re: [Mesa-dev] [PATCH 03/56] vulkan: Rename multiview from KHX to KHR

2018-03-07 Thread Bas Nieuwenhuizen

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  wrote:
> Reviewed-by: Lionel Landwerlin 
> Reviewed-by: Samuel Iglesias Gonsálvez 
> ---
>  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 = 
> 126001,
>  VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV = 
> 126002,
>  VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD = 141000,
> -VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHX = 153000,
> -VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHX = 153001,
> -VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHX = 153002,
> +VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR = 153000,
> +VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHR = 153001,
> +VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHR = 153002,
>  VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_NV = 156000,
>  VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_NV = 156001,
>  VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_NV = 157000,
> @@ -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 {
>  VkStructureTypesType;
>  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 {
>  VkStructureTypesType;
>  void*  pNext;
>  VkBool32   multiview;
>  VkBool32   multiviewGeometryShader;
>  VkBool32   multiviewTessellationShader;
> -} VkPhysicalDeviceMultiviewFeaturesKHX;
> +} VkPhysicalDeviceMultiviewFeaturesKHR;
>
> -typedef struct VkPhysicalDeviceMultiviewPropertiesKHX {
> +typedef struct VkPhysicalDeviceMultiviewPropertiesKHR {
>  VkStructureTypesType;
>  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 =
> +

[Mesa-dev] [PATCH 03/56] vulkan: Rename multiview from KHX to KHR

2018-03-07 Thread Jason Ekstrand

Reviewed-by: Lionel Landwerlin 
Reviewed-by: Samuel Iglesias Gonsálvez 
---
 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 = 126001,
 VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV = 
126002,
 VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD = 141000,
-VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHX = 153000,
-VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHX = 153001,
-VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHX = 153002,
+VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR = 153000,
+VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHR = 153001,
+VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHR = 153002,
 VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_NV = 156000,
 VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_NV = 156001,
 VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_NV = 157000,
@@ -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 {
 VkStructureTypesType;
 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 {
 VkStructureTypesType;
 void*  pNext;
 VkBool32   multiview;
 VkBool32   multiviewGeometryShader;
 VkBool32   multiviewTessellationShader;
-} VkPhysicalDeviceMultiviewFeaturesKHX;
+} VkPhysicalDeviceMultiviewFeaturesKHR;
 
-typedef struct VkPhysicalDeviceMultiviewPropertiesKHX {
+typedef struct VkPhysicalDeviceMultiviewPropertiesKHR {
 VkStructureTypesType;
 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 @@

Re: [Mesa-dev] [PATCH 03/56] vulkan: Rename multiview from KHX to KHR

[Mesa-dev] [PATCH 03/56] vulkan: Rename multiview from KHX to KHR

2 matches

Site Navigation

Mail list logo

Footer information