Mesa (master): spirv: Update the headers from latest Khronos master
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Jul 8 16:36:46 UTC 2019
Module: Mesa
Branch: master
Commit: 5a7c69399d4800f6e7794177991bce2e9a967371
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5a7c69399d4800f6e7794177991bce2e9a967371
Author: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
Date: Fri Jun 7 16:41:04 2019 -0700
spirv: Update the headers from latest Khronos master
This corresponds to 29c11140baaf9f7fdaa39a583672c556bf1795a1 in
https://github.com/KhronosGroup/SPIRV-Headers.
Acked-by: Jason Ekstrand <jason at jlekstrand.net>
---
src/compiler/spirv/spirv.core.grammar.json | 410 +++++++++++++++++------------
src/compiler/spirv/spirv.h | 12 +-
2 files changed, 258 insertions(+), 164 deletions(-)
diff --git a/src/compiler/spirv/spirv.core.grammar.json b/src/compiler/spirv/spirv.core.grammar.json
index 285f0a29331..495aff08283 100644
--- a/src/compiler/spirv/spirv.core.grammar.json
+++ b/src/compiler/spirv/spirv.core.grammar.json
@@ -4045,6 +4045,38 @@
"version" : "None"
},
{
+ "opname" : "OpBeginInvocationInterlockEXT",
+ "opcode" : 5364,
+ "capabilities" : [ "FragmentShaderSampleInterlockEXT", "FragmentShaderPixelInterlockEXT", "FragmentShaderShadingRateInterlockEXT" ],
+ "extensions" : [ "SPV_EXT_fragment_shader_interlock" ],
+ "version" : "None"
+ },
+ {
+ "opname" : "OpEndInvocationInterlockEXT",
+ "opcode" : 5365,
+ "capabilities" : [ "FragmentShaderSampleInterlockEXT", "FragmentShaderPixelInterlockEXT", "FragmentShaderShadingRateInterlockEXT" ],
+ "extensions" : [ "SPV_EXT_fragment_shader_interlock" ],
+ "version" : "None"
+ },
+ {
+ "opname" : "OpDemoteToHelperInvocationEXT",
+ "opcode" : 5380,
+ "capabilities" : [ "DemoteToHelperInvocationEXT" ],
+ "extensions" : [ "SPV_EXT_demote_to_helper_invocation" ],
+ "version" : "None"
+ },
+ {
+ "opname" : "OpIsHelperInvocationEXT",
+ "opcode" : 5381,
+ "operands" : [
+ { "kind" : "IdResultType" },
+ { "kind" : "IdResult" }
+ ],
+ "capabilities" : [ "DemoteToHelperInvocationEXT" ],
+ "extensions" : [ "SPV_EXT_demote_to_helper_invocation" ],
+ "version" : "None"
+ },
+ {
"opname" : "OpSubgroupShuffleINTEL",
"opcode" : 5571,
"operands" : [
@@ -5771,20 +5803,6 @@
],
"capabilities" : [ "SubgroupAvcMotionEstimationINTEL" ],
"version" : "None"
- },
- {
- "opname" : "OpBeginInvocationInterlockEXT",
- "opcode" : 5364,
- "capabilities" : [ "FragmentShaderSampleInterlockEXT", "FragmentShaderPixelInterlockEXT", "FragmentShaderShadingRateInterlockEXT" ],
- "extensions" : [ "SPV_EXT_fragment_shader_interlock" ],
- "version" : "None"
- },
- {
- "opname" : "OpEndInvocationInterlockEXT",
- "opcode" : 5365,
- "capabilities" : [ "FragmentShaderSampleInterlockEXT", "FragmentShaderPixelInterlockEXT", "FragmentShaderShadingRateInterlockEXT" ],
- "extensions" : [ "SPV_EXT_fragment_shader_interlock" ],
- "version" : "None"
}
],
"operand_kinds" : [
@@ -5863,7 +5881,8 @@
"capabilities" : [ "VulkanMemoryModelKHR" ],
"parameters" : [
{ "kind" : "IdScope" }
- ]
+ ],
+ "version" : "None"
},
{
"enumerant" : "MakeTexelVisibleKHR",
@@ -5871,17 +5890,20 @@
"capabilities" : [ "VulkanMemoryModelKHR" ],
"parameters" : [
{ "kind" : "IdScope" }
- ]
+ ],
+ "version" : "None"
},
{
"enumerant" : "NonPrivateTexelKHR",
"value" : "0x0400",
- "capabilities" : [ "VulkanMemoryModelKHR" ]
+ "capabilities" : [ "VulkanMemoryModelKHR" ],
+ "version" : "None"
},
{
"enumerant" : "VolatileTexelKHR",
"value" : "0x0800",
- "capabilities" : [ "VulkanMemoryModelKHR" ]
+ "capabilities" : [ "VulkanMemoryModelKHR" ],
+ "version" : "None"
},
{
"enumerant" : "SignExtend",
@@ -6102,17 +6124,26 @@
{
"enumerant" : "OutputMemoryKHR",
"value" : "0x1000",
- "capabilities" : [ "VulkanMemoryModelKHR" ]
+ "capabilities" : [ "VulkanMemoryModelKHR" ],
+ "version" : "None"
},
{
"enumerant" : "MakeAvailableKHR",
"value" : "0x2000",
- "capabilities" : [ "VulkanMemoryModelKHR" ]
+ "capabilities" : [ "VulkanMemoryModelKHR" ],
+ "version" : "None"
},
{
"enumerant" : "MakeVisibleKHR",
"value" : "0x4000",
- "capabilities" : [ "VulkanMemoryModelKHR" ]
+ "capabilities" : [ "VulkanMemoryModelKHR" ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "Volatile",
+ "value" : "0x8000",
+ "capabilities" : [ "VulkanMemoryModelKHR" ],
+ "version" : "None"
}
]
},
@@ -6145,7 +6176,8 @@
"parameters" : [
{ "kind" : "IdScope" }
],
- "capabilities" : [ "VulkanMemoryModelKHR" ]
+ "capabilities" : [ "VulkanMemoryModelKHR" ],
+ "version" : "None"
},
{
"enumerant" : "MakePointerVisibleKHR",
@@ -6153,12 +6185,14 @@
"parameters" : [
{ "kind" : "IdScope" }
],
- "capabilities" : [ "VulkanMemoryModelKHR" ]
+ "capabilities" : [ "VulkanMemoryModelKHR" ],
+ "version" : "None"
},
{
"enumerant" : "NonPrivatePointerKHR",
"value" : "0x0020",
- "capabilities" : [ "VulkanMemoryModelKHR" ]
+ "capabilities" : [ "VulkanMemoryModelKHR" ],
+ "version" : "None"
}
]
},
@@ -6249,42 +6283,50 @@
{
"enumerant" : "TaskNV",
"value" : 5267,
- "capabilities" : [ "MeshShadingNV" ]
+ "capabilities" : [ "MeshShadingNV" ],
+ "version" : "None"
},
{
"enumerant" : "MeshNV",
"value" : 5268,
- "capabilities" : [ "MeshShadingNV" ]
+ "capabilities" : [ "MeshShadingNV" ],
+ "version" : "None"
},
{
"enumerant" : "RayGenerationNV",
"value" : 5313,
- "capabilities" : [ "RayTracingNV" ]
+ "capabilities" : [ "RayTracingNV" ],
+ "version" : "None"
},
{
"enumerant" : "IntersectionNV",
"value" : 5314,
- "capabilities" : [ "RayTracingNV" ]
+ "capabilities" : [ "RayTracingNV" ],
+ "version" : "None"
},
{
"enumerant" : "AnyHitNV",
"value" : 5315,
- "capabilities" : [ "RayTracingNV" ]
+ "capabilities" : [ "RayTracingNV" ],
+ "version" : "None"
},
{
"enumerant" : "ClosestHitNV",
"value" : 5316,
- "capabilities" : [ "RayTracingNV" ]
+ "capabilities" : [ "RayTracingNV" ],
+ "version" : "None"
},
{
"enumerant" : "MissNV",
"value" : 5317,
- "capabilities" : [ "RayTracingNV" ]
+ "capabilities" : [ "RayTracingNV" ],
+ "version" : "None"
},
{
"enumerant" : "CallableNV",
"value" : 5318,
- "capabilities" : [ "RayTracingNV" ]
+ "capabilities" : [ "RayTracingNV" ],
+ "version" : "None"
}
]
},
@@ -6310,7 +6352,8 @@
"enumerant" : "PhysicalStorageBuffer64EXT",
"value" : 5348,
"extensions" : [ "SPV_EXT_physical_storage_buffer" ],
- "capabilities" : [ "PhysicalStorageBufferAddressesEXT" ]
+ "capabilities" : [ "PhysicalStorageBufferAddressesEXT" ],
+ "version" : "None"
}
]
},
@@ -6336,7 +6379,8 @@
{
"enumerant" : "VulkanKHR",
"value" : 3,
- "capabilities" : [ "VulkanMemoryModelKHR" ]
+ "capabilities" : [ "VulkanMemoryModelKHR" ],
+ "version" : "None"
}
]
},
@@ -6793,43 +6837,50 @@
"enumerant" : "CallableDataNV",
"value" : 5328,
"extensions" : [ "SPV_NV_ray_tracing" ],
- "capabilities" : [ "RayTracingNV" ]
+ "capabilities" : [ "RayTracingNV" ],
+ "version" : "None"
},
{
"enumerant" : "IncomingCallableDataNV",
"value" : 5329,
"extensions" : [ "SPV_NV_ray_tracing" ],
- "capabilities" : [ "RayTracingNV" ]
+ "capabilities" : [ "RayTracingNV" ],
+ "version" : "None"
},
{
"enumerant" : "RayPayloadNV",
"value" : 5338,
"extensions" : [ "SPV_NV_ray_tracing" ],
- "capabilities" : [ "RayTracingNV" ]
+ "capabilities" : [ "RayTracingNV" ],
+ "version" : "None"
},
{
"enumerant" : "HitAttributeNV",
"value" : 5339,
"extensions" : [ "SPV_NV_ray_tracing" ],
- "capabilities" : [ "RayTracingNV" ]
+ "capabilities" : [ "RayTracingNV" ],
+ "version" : "None"
},
{
"enumerant" : "IncomingRayPayloadNV",
"value" : 5342,
"extensions" : [ "SPV_NV_ray_tracing" ],
- "capabilities" : [ "RayTracingNV" ]
+ "capabilities" : [ "RayTracingNV" ],
+ "version" : "None"
},
{
"enumerant" : "ShaderRecordBufferNV",
"value" : 5343,
"extensions" : [ "SPV_NV_ray_tracing" ],
- "capabilities" : [ "RayTracingNV" ]
+ "capabilities" : [ "RayTracingNV" ],
+ "version" : "None"
},
{
"enumerant" : "PhysicalStorageBufferEXT",
"value" : 5349,
"extensions" : [ "SPV_EXT_physical_storage_buffer" ],
- "capabilities" : [ "PhysicalStorageBufferAddressesEXT" ]
+ "capabilities" : [ "PhysicalStorageBufferAddressesEXT" ],
+ "version" : "None"
}
]
},
@@ -7815,6 +7866,20 @@
"capabilities" : [ "ShaderNonUniformEXT" ]
},
{
+ "enumerant" : "RestrictPointerEXT",
+ "value" : 5355,
+ "capabilities" : [ "PhysicalStorageBufferAddressesEXT" ],
+ "extensions" : [ "SPV_EXT_physical_storage_buffer" ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "AliasedPointerEXT",
+ "value" : 5356,
+ "capabilities" : [ "PhysicalStorageBufferAddressesEXT" ],
+ "extensions" : [ "SPV_EXT_physical_storage_buffer" ],
+ "version" : "None"
+ },
+ {
"enumerant" : "CounterBuffer",
"value" : 5634,
"parameters" : [
@@ -7849,17 +7914,12 @@
"version" : "None"
},
{
- "enumerant" : "RestrictPointerEXT",
- "value" : 5355,
- "capabilities" : [ "PhysicalStorageBufferAddressesEXT" ],
- "extensions" : [ "SPV_EXT_physical_storage_buffer" ],
- "version" : "None"
- },
- {
- "enumerant" : "AliasedPointerEXT",
- "value" : 5356,
- "capabilities" : [ "PhysicalStorageBufferAddressesEXT" ],
- "extensions" : [ "SPV_EXT_physical_storage_buffer" ],
+ "enumerant" : "UserTypeGOOGLE",
+ "value" : 5636,
+ "parameters" : [
+ { "kind" : "LiteralString", "name" : "'User Type'" }
+ ],
+ "extensions" : [ "SPV_GOOGLE_user_type" ],
"version" : "None"
}
]
@@ -8360,109 +8420,127 @@
"enumerant" : "LaunchIdNV",
"value" : 5319,
"capabilities" : [ "RayTracingNV" ],
- "extensions" : [ "SPV_NV_ray_tracing" ]
+ "extensions" : [ "SPV_NV_ray_tracing" ],
+ "version" : "None"
},
{
"enumerant" : "LaunchSizeNV",
"value" : 5320,
"capabilities" : [ "RayTracingNV" ],
- "extensions" : [ "SPV_NV_ray_tracing" ]
+ "extensions" : [ "SPV_NV_ray_tracing" ],
+ "version" : "None"
},
{
"enumerant" : "WorldRayOriginNV",
"value" : 5321,
"capabilities" : [ "RayTracingNV" ],
- "extensions" : [ "SPV_NV_ray_tracing" ]
+ "extensions" : [ "SPV_NV_ray_tracing" ],
+ "version" : "None"
},
{
"enumerant" : "WorldRayDirectionNV",
"value" : 5322,
"capabilities" : [ "RayTracingNV" ],
- "extensions" : [ "SPV_NV_ray_tracing" ]
+ "extensions" : [ "SPV_NV_ray_tracing" ],
+ "version" : "None"
},
{
"enumerant" : "ObjectRayOriginNV",
"value" : 5323,
"capabilities" : [ "RayTracingNV" ],
- "extensions" : [ "SPV_NV_ray_tracing" ]
+ "extensions" : [ "SPV_NV_ray_tracing" ],
+ "version" : "None"
},
{
"enumerant" : "ObjectRayDirectionNV",
"value" : 5324,
"capabilities" : [ "RayTracingNV" ],
- "extensions" : [ "SPV_NV_ray_tracing" ]
+ "extensions" : [ "SPV_NV_ray_tracing" ],
+ "version" : "None"
},
{
"enumerant" : "RayTminNV",
"value" : 5325,
"capabilities" : [ "RayTracingNV" ],
- "extensions" : [ "SPV_NV_ray_tracing" ]
+ "extensions" : [ "SPV_NV_ray_tracing" ],
+ "version" : "None"
},
{
"enumerant" : "RayTmaxNV",
"value" : 5326,
"capabilities" : [ "RayTracingNV" ],
- "extensions" : [ "SPV_NV_ray_tracing" ]
+ "extensions" : [ "SPV_NV_ray_tracing" ],
+ "version" : "None"
},
{
"enumerant" : "InstanceCustomIndexNV",
"value" : 5327,
"capabilities" : [ "RayTracingNV" ],
- "extensions" : [ "SPV_NV_ray_tracing" ]
+ "extensions" : [ "SPV_NV_ray_tracing" ],
+ "version" : "None"
},
{
"enumerant" : "ObjectToWorldNV",
"value" : 5330,
"capabilities" : [ "RayTracingNV" ],
- "extensions" : [ "SPV_NV_ray_tracing" ]
+ "extensions" : [ "SPV_NV_ray_tracing" ],
+ "version" : "None"
},
{
"enumerant" : "WorldToObjectNV",
"value" : 5331,
"capabilities" : [ "RayTracingNV" ],
- "extensions" : [ "SPV_NV_ray_tracing" ]
+ "extensions" : [ "SPV_NV_ray_tracing" ],
+ "version" : "None"
},
{
"enumerant" : "HitTNV",
"value" : 5332,
"capabilities" : [ "RayTracingNV" ],
- "extensions" : [ "SPV_NV_ray_tracing" ]
+ "extensions" : [ "SPV_NV_ray_tracing" ],
+ "version" : "None"
},
{
"enumerant" : "HitKindNV",
"value" : 5333,
"capabilities" : [ "RayTracingNV" ],
- "extensions" : [ "SPV_NV_ray_tracing" ]
+ "extensions" : [ "SPV_NV_ray_tracing" ],
+ "version" : "None"
},
{
"enumerant" : "IncomingRayFlagsNV",
"value" : 5351,
"capabilities" : [ "RayTracingNV" ],
- "extensions" : [ "SPV_NV_ray_tracing" ]
+ "extensions" : [ "SPV_NV_ray_tracing" ],
+ "version" : "None"
},
{
"enumerant" : "WarpsPerSMNV",
"value" : 5374,
"capabilities" : [ "ShaderSMBuiltinsNV" ],
- "extensions" : [ "SPV_NV_shader_sm_builtins" ]
+ "extensions" : [ "SPV_NV_shader_sm_builtins" ],
+ "version" : "None"
},
{
"enumerant" : "SMCountNV",
"value" : 5375,
"capabilities" : [ "ShaderSMBuiltinsNV" ],
- "extensions" : [ "SPV_NV_shader_sm_builtins" ]
+ "extensions" : [ "SPV_NV_shader_sm_builtins" ],
+ "version" : "None"
},
{
"enumerant" : "WarpIDNV",
"value" : 5376,
"capabilities" : [ "ShaderSMBuiltinsNV" ],
- "extensions" : [ "SPV_NV_shader_sm_builtins" ]
+ "extensions" : [ "SPV_NV_shader_sm_builtins" ],
+ "version" : "None"
},
{
"enumerant" : "SMIDNV",
"value" : 5377,
"capabilities" : [ "ShaderSMBuiltinsNV" ],
- "extensions" : [ "SPV_NV_shader_sm_builtins" ]
+ "extensions" : [ "SPV_NV_shader_sm_builtins" ],
+ "version" : "None"
}
]
},
@@ -8493,7 +8571,8 @@
{
"enumerant" : "QueueFamilyKHR",
"value" : 5,
- "capabilities" : [ "VulkanMemoryModelKHR" ]
+ "capabilities" : [ "VulkanMemoryModelKHR" ],
+ "version" : "None"
}
]
},
@@ -9154,6 +9233,44 @@
"version" : "None"
},
{
+ "enumerant" : "ImageFootprintNV",
+ "value" : 5282,
+ "extensions" : [ "SPV_NV_shader_image_footprint" ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "FragmentBarycentricNV",
+ "value" : 5284,
+ "extensions" : [ "SPV_NV_fragment_shader_barycentric" ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "ComputeDerivativeGroupQuadsNV",
+ "value" : 5288,
+ "extensions" : [ "SPV_NV_compute_shader_derivatives" ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "FragmentDensityEXT",
+ "value" : 5291,
+ "capabilities" : [ "Shader" ],
+ "extensions" : [ "SPV_EXT_fragment_invocation_density", "SPV_NV_shading_rate" ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "ShadingRateNV",
+ "value" : 5291,
+ "capabilities" : [ "Shader" ],
+ "extensions" : [ "SPV_NV_shading_rate", "SPV_EXT_fragment_invocation_density" ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "GroupNonUniformPartitionedNV",
+ "value" : 5297,
+ "extensions" : [ "SPV_NV_shader_subgroup_partitioned" ],
+ "version" : "None"
+ },
+ {
"enumerant" : "ShaderNonUniformEXT",
"value" : 5301,
"capabilities" : [ "Shader" ],
@@ -9245,150 +9362,119 @@
"version" : "None"
},
{
- "enumerant" : "SubgroupShuffleINTEL",
- "value" : 5568,
- "extensions" : [ "SPV_INTEL_subgroups" ],
- "version" : "None"
- },
- {
- "enumerant" : "SubgroupBufferBlockIOINTEL",
- "value" : 5569,
- "extensions" : [ "SPV_INTEL_subgroups" ],
- "version" : "None"
- },
- {
- "enumerant" : "SubgroupImageBlockIOINTEL",
- "value" : 5570,
- "extensions" : [ "SPV_INTEL_subgroups" ],
+ "enumerant" : "VulkanMemoryModelKHR",
+ "value" : 5345,
+ "extensions" : [ "SPV_KHR_vulkan_memory_model" ],
"version" : "None"
},
{
- "enumerant" : "SubgroupImageMediaBlockIOINTEL",
- "value" : 5579,
- "extensions" : [ "SPV_INTEL_media_block_io" ],
+ "enumerant" : "VulkanMemoryModelDeviceScopeKHR",
+ "value" : 5346,
+ "extensions" : [ "SPV_KHR_vulkan_memory_model" ],
"version" : "None"
},
{
- "enumerant" : "IntegerFunctions2INTEL",
- "value" : 5584,
+ "enumerant" : "PhysicalStorageBufferAddressesEXT",
+ "value" : 5347,
"capabilities" : [ "Shader" ],
- "extensions" : [ "SPV_INTEL_shader_integer_functions2" ],
- "version" : "None"
- },
- {
- "enumerant" : "SubgroupAvcMotionEstimationINTEL",
- "value" : 5696,
- "extensions" : [ "SPV_INTEL_device_side_avc_motion_estimation" ],
- "version" : "None"
- },
- {
- "enumerant" : "SubgroupAvcMotionEstimationIntraINTEL",
- "value" : 5697,
- "extensions" : [ "SPV_INTEL_device_side_avc_motion_estimation" ],
- "version" : "None"
- },
- {
- "enumerant" : "SubgroupAvcMotionEstimationChromaINTEL",
- "value" : 5698,
- "extensions" : [ "SPV_INTEL_device_side_avc_motion_estimation" ],
+ "extensions" : [ "SPV_EXT_physical_storage_buffer" ],
"version" : "None"
},
{
- "enumerant" : "GroupNonUniformPartitionedNV",
- "value" : 5297,
- "extensions" : [ "SPV_NV_shader_subgroup_partitioned" ],
+ "enumerant" : "ComputeDerivativeGroupLinearNV",
+ "value" : 5350,
+ "extensions" : [ "SPV_NV_compute_shader_derivatives" ],
"version" : "None"
},
{
- "enumerant" : "VulkanMemoryModelKHR",
- "value" : 5345,
- "extensions" : [ "SPV_KHR_vulkan_memory_model" ],
+ "enumerant" : "CooperativeMatrixNV",
+ "value" : 5357,
+ "capabilities" : [ "Shader" ],
+ "extensions" : [ "SPV_NV_cooperative_matrix" ],
"version" : "None"
},
{
- "enumerant" : "VulkanMemoryModelDeviceScopeKHR",
- "value" : 5346,
- "extensions" : [ "SPV_KHR_vulkan_memory_model" ],
+ "enumerant" : "FragmentShaderSampleInterlockEXT",
+ "value" : 5363,
+ "capabilities" : [ "Shader" ],
+ "extensions" : [ "SPV_EXT_fragment_shader_interlock" ],
"version" : "None"
},
{
- "enumerant" : "ImageFootprintNV",
- "value" : 5282,
- "extensions" : [ "SPV_NV_shader_image_footprint" ],
+ "enumerant" : "FragmentShaderShadingRateInterlockEXT",
+ "value" : 5372,
+ "capabilities" : [ "Shader" ],
+ "extensions" : [ "SPV_EXT_fragment_shader_interlock" ],
"version" : "None"
},
{
- "enumerant" : "FragmentBarycentricNV",
- "value" : 5284,
- "extensions" : [ "SPV_NV_fragment_shader_barycentric" ],
+ "enumerant" : "ShaderSMBuiltinsNV",
+ "value" : 5373,
+ "capabilities" : [ "Shader" ],
+ "extensions" : [ "SPV_NV_shader_sm_builtins" ],
"version" : "None"
},
{
- "enumerant" : "ComputeDerivativeGroupQuadsNV",
- "value" : 5288,
- "extensions" : [ "SPV_NV_compute_shader_derivatives" ],
+ "enumerant" : "FragmentShaderPixelInterlockEXT",
+ "value" : 5378,
+ "capabilities" : [ "Shader" ],
+ "extensions" : [ "SPV_EXT_fragment_shader_interlock" ],
"version" : "None"
},
{
- "enumerant" : "ComputeDerivativeGroupLinearNV",
- "value" : 5350,
- "extensions" : [ "SPV_NV_compute_shader_derivatives" ],
+ "enumerant" : "DemoteToHelperInvocationEXT",
+ "value" : 5379,
+ "capabilities" : [ "Shader" ],
+ "extensions" : [ "SPV_EXT_demote_to_helper_invocation" ],
"version" : "None"
},
{
- "enumerant" : "FragmentDensityEXT",
- "value" : 5291,
- "capabilities" : [ "Shader" ],
- "extensions" : [ "SPV_EXT_fragment_invocation_density", "SPV_NV_shading_rate" ],
+ "enumerant" : "SubgroupShuffleINTEL",
+ "value" : 5568,
+ "extensions" : [ "SPV_INTEL_subgroups" ],
"version" : "None"
},
{
- "enumerant" : "ShadingRateNV",
- "value" : 5291,
- "capabilities" : [ "Shader" ],
- "extensions" : [ "SPV_NV_shading_rate", "SPV_EXT_fragment_invocation_density" ],
+ "enumerant" : "SubgroupBufferBlockIOINTEL",
+ "value" : 5569,
+ "extensions" : [ "SPV_INTEL_subgroups" ],
"version" : "None"
},
{
- "enumerant" : "PhysicalStorageBufferAddressesEXT",
- "value" : 5347,
- "capabilities" : [ "Shader" ],
- "extensions" : [ "SPV_EXT_physical_storage_buffer" ],
+ "enumerant" : "SubgroupImageBlockIOINTEL",
+ "value" : 5570,
+ "extensions" : [ "SPV_INTEL_subgroups" ],
"version" : "None"
},
{
- "enumerant" : "CooperativeMatrixNV",
- "value" : 5357,
- "capabilities" : [ "Shader" ],
- "extensions" : [ "SPV_NV_cooperative_matrix" ],
+ "enumerant" : "SubgroupImageMediaBlockIOINTEL",
+ "value" : 5579,
+ "extensions" : [ "SPV_INTEL_media_block_io" ],
"version" : "None"
},
{
- "enumerant" : "FragmentShaderSampleInterlockEXT",
- "value" : 5363,
+ "enumerant" : "IntegerFunctions2INTEL",
+ "value" : 5584,
"capabilities" : [ "Shader" ],
- "extensions" : [ "SPV_EXT_fragment_shader_interlock" ],
+ "extensions" : [ "SPV_INTEL_shader_integer_functions2" ],
"version" : "None"
},
{
- "enumerant" : "FragmentShaderShadingRateInterlockEXT",
- "value" : 5372,
- "capabilities" : [ "Shader" ],
- "extensions" : [ "SPV_EXT_fragment_shader_interlock" ],
+ "enumerant" : "SubgroupAvcMotionEstimationINTEL",
+ "value" : 5696,
+ "extensions" : [ "SPV_INTEL_device_side_avc_motion_estimation" ],
"version" : "None"
},
{
- "enumerant" : "FragmentShaderPixelInterlockEXT",
- "value" : 5378,
- "capabilities" : [ "Shader" ],
- "extensions" : [ "SPV_EXT_fragment_shader_interlock" ],
+ "enumerant" : "SubgroupAvcMotionEstimationIntraINTEL",
+ "value" : 5697,
+ "extensions" : [ "SPV_INTEL_device_side_avc_motion_estimation" ],
"version" : "None"
},
{
- "enumerant" : "ShaderSMBuiltinsNV",
- "value" : 5373,
- "capabilities" : [ "Shader" ],
- "extensions" : [ "SPV_NV_shader_sm_builtins" ],
+ "enumerant" : "SubgroupAvcMotionEstimationChromaINTEL",
+ "value" : 5698,
+ "extensions" : [ "SPV_INTEL_device_side_avc_motion_estimation" ],
"version" : "None"
}
]
diff --git a/src/compiler/spirv/spirv.h b/src/compiler/spirv/spirv.h
index 99b6fbb9edc..4b6d9dc49a8 100644
--- a/src/compiler/spirv/spirv.h
+++ b/src/compiler/spirv/spirv.h
@@ -459,6 +459,7 @@ typedef enum SpvDecoration_ {
SpvDecorationHlslCounterBufferGOOGLE = 5634,
SpvDecorationHlslSemanticGOOGLE = 5635,
SpvDecorationUserSemantic = 5635,
+ SpvDecorationUserTypeGOOGLE = 5636,
SpvDecorationMax = 0x7fffffff,
} SpvDecoration;
@@ -636,6 +637,7 @@ typedef enum SpvMemorySemanticsShift_ {
SpvMemorySemanticsOutputMemoryKHRShift = 12,
SpvMemorySemanticsMakeAvailableKHRShift = 13,
SpvMemorySemanticsMakeVisibleKHRShift = 14,
+ SpvMemorySemanticsVolatileShift = 15,
SpvMemorySemanticsMax = 0x7fffffff,
} SpvMemorySemanticsShift;
@@ -654,6 +656,7 @@ typedef enum SpvMemorySemanticsMask_ {
SpvMemorySemanticsOutputMemoryKHRMask = 0x00001000,
SpvMemorySemanticsMakeAvailableKHRMask = 0x00002000,
SpvMemorySemanticsMakeVisibleKHRMask = 0x00004000,
+ SpvMemorySemanticsVolatileMask = 0x00008000,
} SpvMemorySemanticsMask;
typedef enum SpvMemoryAccessShift_ {
@@ -847,6 +850,7 @@ typedef enum SpvCapability_ {
SpvCapabilityFragmentShaderShadingRateInterlockEXT = 5372,
SpvCapabilityShaderSMBuiltinsNV = 5373,
SpvCapabilityFragmentShaderPixelInterlockEXT = 5378,
+ SpvCapabilityDemoteToHelperInvocationEXT = 5379,
SpvCapabilitySubgroupShuffleINTEL = 5568,
SpvCapabilitySubgroupBufferBlockIOINTEL = 5569,
SpvCapabilitySubgroupImageBlockIOINTEL = 5570,
@@ -1235,6 +1239,8 @@ typedef enum SpvOp_ {
SpvOpCooperativeMatrixLengthNV = 5362,
SpvOpBeginInvocationInterlockEXT = 5364,
SpvOpEndInvocationInterlockEXT = 5365,
+ SpvOpDemoteToHelperInvocationEXT = 5380,
+ SpvOpIsHelperInvocationEXT = 5381,
SpvOpSubgroupShuffleINTEL = 5571,
SpvOpSubgroupShuffleDownINTEL = 5572,
SpvOpSubgroupShuffleUpINTEL = 5573,
@@ -1763,6 +1769,10 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy
case SpvOpCooperativeMatrixStoreNV: *hasResult = false; *hasResultType = false; break;
case SpvOpCooperativeMatrixMulAddNV: *hasResult = true; *hasResultType = true; break;
case SpvOpCooperativeMatrixLengthNV: *hasResult = true; *hasResultType = true; break;
+ case SpvOpBeginInvocationInterlockEXT: *hasResult = false; *hasResultType = false; break;
+ case SpvOpEndInvocationInterlockEXT: *hasResult = false; *hasResultType = false; break;
+ case SpvOpDemoteToHelperInvocationEXT: *hasResult = false; *hasResultType = false; break;
+ case SpvOpIsHelperInvocationEXT: *hasResult = true; *hasResultType = true; break;
case SpvOpSubgroupShuffleINTEL: *hasResult = true; *hasResultType = true; break;
case SpvOpSubgroupShuffleDownINTEL: *hasResult = true; *hasResultType = true; break;
case SpvOpSubgroupShuffleUpINTEL: *hasResult = true; *hasResultType = true; break;
@@ -1907,8 +1917,6 @@ inline void SpvHasResultAndType(SpvOp opcode, bool *hasResult, bool *hasResultTy
case SpvOpSubgroupAvcSicGetPackedSkcLumaCountThresholdINTEL: *hasResult = true; *hasResultType = true; break;
case SpvOpSubgroupAvcSicGetPackedSkcLumaSumThresholdINTEL: *hasResult = true; *hasResultType = true; break;
case SpvOpSubgroupAvcSicGetInterRawSadsINTEL: *hasResult = true; *hasResultType = true; break;
- case SpvOpBeginInvocationInterlockEXT: *hasResult = false; *hasResultType = false; break;
- case SpvOpEndInvocationInterlockEXT: *hasResult = false; *hasResultType = false; break;
}
}
#endif /* SPV_ENABLE_UTILITY_CODE */
More information about the mesa-commit
mailing list