Skip to content

G
glslang
Commit 13e27f9d by Jeremy Hayes
Options

Default to KHR extension

Fix #2530.
parent 6701c254
Showing with 20 additions and 23 deletions
SPIRV/GlslangToSpv.cpp
...@@ -1493,7 +1493,7 @@ TGlslangToSpvTraverser::TGlslangToSpvTraverser(unsigned int spvVersion, ...@@ -1493,7 +1493,7 @@ TGlslangToSpvTraverser::TGlslangToSpvTraverser(unsigned int spvVersion,
if (glslangIntermediate->usingPhysicalStorageBuffer()) { if (glslangIntermediate->usingPhysicalStorageBuffer()) {
addressingModel = spv::AddressingModelPhysicalStorageBuffer64EXT; addressingModel = spv::AddressingModelPhysicalStorageBuffer64EXT;
builder.addIncorporatedExtension(spv::E_SPV_EXT_physical_storage_buffer, spv::Spv_1_5); builder.addIncorporatedExtension(spv::E_SPV_KHR_physical_storage_buffer, spv::Spv_1_5);
builder.addCapability(spv::CapabilityPhysicalStorageBufferAddressesEXT); builder.addCapability(spv::CapabilityPhysicalStorageBufferAddressesEXT);
} }
if (glslangIntermediate->usingVulkanMemoryModel()) { if (glslangIntermediate->usingVulkanMemoryModel()) {
...@@ -6836,9 +6836,6 @@ spv::Id TGlslangToSpvTraverser::createConversion(glslang::TOperator op, OpDecora ...@@ -6836,9 +6836,6 @@ spv::Id TGlslangToSpvTraverser::createConversion(glslang::TOperator op, OpDecora
break; break;
case glslang::EOpConvPtrToUvec2: case glslang::EOpConvPtrToUvec2:
case glslang::EOpConvUvec2ToPtr: case glslang::EOpConvUvec2ToPtr:
if (builder.isVector(operand))
builder.promoteIncorporatedExtension(spv::E_SPV_EXT_physical_storage_buffer,
spv::E_SPV_KHR_physical_storage_buffer, spv::Spv_1_5);
convOp = spv::OpBitcast; convOp = spv::OpBitcast;
break; break;
#endif #endif
......
Test/baseResults/spv.bufferhandle1.frag.out
...@@ -6,7 +6,7 @@ spv.bufferhandle1.frag ...@@ -6,7 +6,7 @@ spv.bufferhandle1.frag
Capability Shader Capability Shader
Capability VulkanMemoryModelKHR Capability VulkanMemoryModelKHR
Capability PhysicalStorageBufferAddressesEXT Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_EXT_physical_storage_buffer" Extension "SPV_KHR_physical_storage_buffer"
Extension "SPV_KHR_storage_buffer_storage_class" Extension "SPV_KHR_storage_buffer_storage_class"
Extension "SPV_KHR_vulkan_memory_model" Extension "SPV_KHR_vulkan_memory_model"
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
......
Test/baseResults/spv.bufferhandle10.frag.out
...@@ -6,7 +6,7 @@ spv.bufferhandle10.frag ...@@ -6,7 +6,7 @@ spv.bufferhandle10.frag
Capability Shader Capability Shader
Capability VulkanMemoryModelKHR Capability VulkanMemoryModelKHR
Capability PhysicalStorageBufferAddressesEXT Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_EXT_physical_storage_buffer" Extension "SPV_KHR_physical_storage_buffer"
Extension "SPV_KHR_storage_buffer_storage_class" Extension "SPV_KHR_storage_buffer_storage_class"
Extension "SPV_KHR_vulkan_memory_model" Extension "SPV_KHR_vulkan_memory_model"
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
......
Test/baseResults/spv.bufferhandle11.frag.out
...@@ -9,8 +9,8 @@ WARNING: 0:6: '' : all default precisions are highp; use precision statements to ...@@ -9,8 +9,8 @@ WARNING: 0:6: '' : all default precisions are highp; use precision statements to
Capability Shader Capability Shader
Capability StorageBuffer8BitAccess Capability StorageBuffer8BitAccess
Capability PhysicalStorageBufferAddressesEXT Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_EXT_physical_storage_buffer"
Extension "SPV_KHR_8bit_storage" Extension "SPV_KHR_8bit_storage"
Extension "SPV_KHR_physical_storage_buffer"
Extension "SPV_KHR_storage_buffer_storage_class" Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450 MemoryModel PhysicalStorageBuffer64EXT GLSL450
......
Test/baseResults/spv.bufferhandle12.frag.out
...@@ -9,8 +9,8 @@ WARNING: 0:6: '' : all default precisions are highp; use precision statements to ...@@ -9,8 +9,8 @@ WARNING: 0:6: '' : all default precisions are highp; use precision statements to
Capability Shader Capability Shader
Capability StorageUniformBufferBlock16 Capability StorageUniformBufferBlock16
Capability PhysicalStorageBufferAddressesEXT Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_EXT_physical_storage_buffer"
Extension "SPV_KHR_16bit_storage" Extension "SPV_KHR_16bit_storage"
Extension "SPV_KHR_physical_storage_buffer"
Extension "SPV_KHR_storage_buffer_storage_class" Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450 MemoryModel PhysicalStorageBuffer64EXT GLSL450
......
Test/baseResults/spv.bufferhandle13.frag.out
...@@ -5,7 +5,7 @@ spv.bufferhandle13.frag ...@@ -5,7 +5,7 @@ spv.bufferhandle13.frag
Capability Shader Capability Shader
Capability PhysicalStorageBufferAddressesEXT Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_EXT_physical_storage_buffer" Extension "SPV_KHR_physical_storage_buffer"
Extension "SPV_KHR_storage_buffer_storage_class" Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450 MemoryModel PhysicalStorageBuffer64EXT GLSL450
......
Test/baseResults/spv.bufferhandle14.frag.out
...@@ -5,7 +5,7 @@ spv.bufferhandle14.frag ...@@ -5,7 +5,7 @@ spv.bufferhandle14.frag
Capability Shader Capability Shader
Capability PhysicalStorageBufferAddressesEXT Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_EXT_physical_storage_buffer" Extension "SPV_KHR_physical_storage_buffer"
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450 MemoryModel PhysicalStorageBuffer64EXT GLSL450
EntryPoint Fragment 4 "main" EntryPoint Fragment 4 "main"
......
Test/baseResults/spv.bufferhandle15.frag.out
...@@ -8,7 +8,7 @@ WARNING: 0:16: '' : all default precisions are highp; use precision statements t ...@@ -8,7 +8,7 @@ WARNING: 0:16: '' : all default precisions are highp; use precision statements t
Capability Shader Capability Shader
Capability PhysicalStorageBufferAddressesEXT Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_EXT_physical_storage_buffer" Extension "SPV_KHR_physical_storage_buffer"
Extension "SPV_KHR_storage_buffer_storage_class" Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450 MemoryModel PhysicalStorageBuffer64EXT GLSL450
......
Test/baseResults/spv.bufferhandle16.frag.out
...@@ -6,7 +6,7 @@ spv.bufferhandle16.frag ...@@ -6,7 +6,7 @@ spv.bufferhandle16.frag
Capability Shader Capability Shader
Capability Int64 Capability Int64
Capability PhysicalStorageBufferAddressesEXT Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_EXT_physical_storage_buffer" Extension "SPV_KHR_physical_storage_buffer"
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450 MemoryModel PhysicalStorageBuffer64EXT GLSL450
EntryPoint Fragment 4 "main" EntryPoint Fragment 4 "main"
......
Test/baseResults/spv.bufferhandle18.frag.out
...@@ -6,7 +6,7 @@ spv.bufferhandle18.frag ...@@ -6,7 +6,7 @@ spv.bufferhandle18.frag
Capability Shader Capability Shader
Capability Int64 Capability Int64
Capability PhysicalStorageBufferAddressesEXT Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_EXT_physical_storage_buffer" Extension "SPV_KHR_physical_storage_buffer"
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450 MemoryModel PhysicalStorageBuffer64EXT GLSL450
EntryPoint Fragment 4 "main" EntryPoint Fragment 4 "main"
......
Test/baseResults/spv.bufferhandle2.frag.out
...@@ -5,7 +5,7 @@ spv.bufferhandle2.frag ...@@ -5,7 +5,7 @@ spv.bufferhandle2.frag
Capability Shader Capability Shader
Capability PhysicalStorageBufferAddressesEXT Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_EXT_physical_storage_buffer" Extension "SPV_KHR_physical_storage_buffer"
Extension "SPV_KHR_storage_buffer_storage_class" Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450 MemoryModel PhysicalStorageBuffer64EXT GLSL450
......
Test/baseResults/spv.bufferhandle3.frag.out
...@@ -5,7 +5,7 @@ spv.bufferhandle3.frag ...@@ -5,7 +5,7 @@ spv.bufferhandle3.frag
Capability Shader Capability Shader
Capability PhysicalStorageBufferAddressesEXT Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_EXT_physical_storage_buffer" Extension "SPV_KHR_physical_storage_buffer"
Extension "SPV_KHR_storage_buffer_storage_class" Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450 MemoryModel PhysicalStorageBuffer64EXT GLSL450
......
Test/baseResults/spv.bufferhandle4.frag.out
...@@ -5,7 +5,7 @@ spv.bufferhandle4.frag ...@@ -5,7 +5,7 @@ spv.bufferhandle4.frag
Capability Shader Capability Shader
Capability PhysicalStorageBufferAddressesEXT Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_EXT_physical_storage_buffer" Extension "SPV_KHR_physical_storage_buffer"
Extension "SPV_KHR_storage_buffer_storage_class" Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450 MemoryModel PhysicalStorageBuffer64EXT GLSL450
......
Test/baseResults/spv.bufferhandle5.frag.out
...@@ -5,7 +5,7 @@ spv.bufferhandle5.frag ...@@ -5,7 +5,7 @@ spv.bufferhandle5.frag
Capability Shader Capability Shader
Capability PhysicalStorageBufferAddressesEXT Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_EXT_physical_storage_buffer" Extension "SPV_KHR_physical_storage_buffer"
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450 MemoryModel PhysicalStorageBuffer64EXT GLSL450
EntryPoint Fragment 4 "main" EntryPoint Fragment 4 "main"
......
Test/baseResults/spv.bufferhandle6.frag.out
...@@ -5,7 +5,7 @@ spv.bufferhandle6.frag ...@@ -5,7 +5,7 @@ spv.bufferhandle6.frag
Capability Shader Capability Shader
Capability PhysicalStorageBufferAddressesEXT Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_EXT_physical_storage_buffer" Extension "SPV_KHR_physical_storage_buffer"
Extension "SPV_KHR_storage_buffer_storage_class" Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450 MemoryModel PhysicalStorageBuffer64EXT GLSL450
......
Test/baseResults/spv.bufferhandle7.frag.out
...@@ -5,7 +5,7 @@ spv.bufferhandle7.frag ...@@ -5,7 +5,7 @@ spv.bufferhandle7.frag
Capability Shader Capability Shader
Capability PhysicalStorageBufferAddressesEXT Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_EXT_physical_storage_buffer" Extension "SPV_KHR_physical_storage_buffer"
Extension "SPV_KHR_storage_buffer_storage_class" Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450 MemoryModel PhysicalStorageBuffer64EXT GLSL450
......
Test/baseResults/spv.bufferhandle8.frag.out
...@@ -5,7 +5,7 @@ spv.bufferhandle8.frag ...@@ -5,7 +5,7 @@ spv.bufferhandle8.frag
Capability Shader Capability Shader
Capability PhysicalStorageBufferAddressesEXT Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_EXT_physical_storage_buffer" Extension "SPV_KHR_physical_storage_buffer"
Extension "SPV_KHR_storage_buffer_storage_class" Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450 MemoryModel PhysicalStorageBuffer64EXT GLSL450
......
Test/baseResults/spv.bufferhandle9.frag.out
...@@ -6,7 +6,7 @@ spv.bufferhandle9.frag ...@@ -6,7 +6,7 @@ spv.bufferhandle9.frag
Capability Shader Capability Shader
Capability Int64 Capability Int64
Capability PhysicalStorageBufferAddressesEXT Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_EXT_physical_storage_buffer" Extension "SPV_KHR_physical_storage_buffer"
Extension "SPV_KHR_storage_buffer_storage_class" Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450 MemoryModel PhysicalStorageBuffer64EXT GLSL450
......
Test/baseResults/spv.coopmat.comp.out
...@@ -9,8 +9,8 @@ spv.coopmat.comp ...@@ -9,8 +9,8 @@ spv.coopmat.comp
Capability VulkanMemoryModelKHR Capability VulkanMemoryModelKHR
Capability PhysicalStorageBufferAddressesEXT Capability PhysicalStorageBufferAddressesEXT
Capability CooperativeMatrixNV Capability CooperativeMatrixNV
Extension "SPV_EXT_physical_storage_buffer"
Extension "SPV_KHR_16bit_storage" Extension "SPV_KHR_16bit_storage"
Extension "SPV_KHR_physical_storage_buffer"
Extension "SPV_KHR_storage_buffer_storage_class" Extension "SPV_KHR_storage_buffer_storage_class"
Extension "SPV_KHR_vulkan_memory_model" Extension "SPV_KHR_vulkan_memory_model"
Extension "SPV_NV_cooperative_matrix" Extension "SPV_NV_cooperative_matrix"
......
Test/baseResults/spv.intcoopmat.comp.out
...@@ -10,8 +10,8 @@ spv.intcoopmat.comp ...@@ -10,8 +10,8 @@ spv.intcoopmat.comp
Capability VulkanMemoryModelKHR Capability VulkanMemoryModelKHR
Capability PhysicalStorageBufferAddressesEXT Capability PhysicalStorageBufferAddressesEXT
Capability CooperativeMatrixNV Capability CooperativeMatrixNV
Extension "SPV_EXT_physical_storage_buffer"
Extension "SPV_KHR_8bit_storage" Extension "SPV_KHR_8bit_storage"
Extension "SPV_KHR_physical_storage_buffer"
Extension "SPV_KHR_storage_buffer_storage_class" Extension "SPV_KHR_storage_buffer_storage_class"
Extension "SPV_KHR_vulkan_memory_model" Extension "SPV_KHR_vulkan_memory_model"
Extension "SPV_NV_cooperative_matrix" Extension "SPV_NV_cooperative_matrix"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment