Require SPIR-V 1.3 when using GL_EXT_buffer_reference.
Migrate tests to SPIR-V 1.3 fixture as necessary.
Fix extension table key.
Fix whitespace.
spv.bufferhandle1.frag
-// Module Version 10000
+// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 52
Capability VulkanMemoryModelKHR
Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_KHR_physical_storage_buffer"
- Extension "SPV_KHR_storage_buffer_storage_class"
Extension "SPV_KHR_vulkan_memory_model"
1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT VulkanKHR
spv.bufferhandle10.frag
-// Module Version 10000
+// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 40
Capability VulkanMemoryModelKHR
Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_KHR_physical_storage_buffer"
- Extension "SPV_KHR_storage_buffer_storage_class"
Extension "SPV_KHR_vulkan_memory_model"
1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT VulkanKHR
WARNING: 0:6: '' : all default precisions are highp; use precision statements to quiet warning, e.g.:
"precision mediump int; precision highp float;"
-// Module Version 10000
+// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 61
Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_KHR_8bit_storage"
Extension "SPV_KHR_physical_storage_buffer"
- Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450
EntryPoint Fragment 4 "main"
WARNING: 0:6: '' : all default precisions are highp; use precision statements to quiet warning, e.g.:
"precision mediump int; precision highp float;"
-// Module Version 10000
+// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 183
Capability Shader
Capability StorageUniformBufferBlock16
Capability PhysicalStorageBufferAddressesEXT
- Extension "SPV_KHR_16bit_storage"
Extension "SPV_KHR_physical_storage_buffer"
- Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450
EntryPoint Fragment 4 "main"
spv.bufferhandle13.frag
-// Module Version 10000
+// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 58
Capability Shader
Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_KHR_physical_storage_buffer"
- Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450
EntryPoint Fragment 4 "main"
spv.bufferhandle14.frag
-// Module Version 10000
+// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 46
WARNING: 0:16: '' : all default precisions are highp; use precision statements to quiet warning, e.g.:
"precision mediump int; precision highp float;"
-// Module Version 10000
+// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 60
Capability Shader
Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_KHR_physical_storage_buffer"
- Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450
EntryPoint Fragment 4 "main" 37
spv.bufferhandle16.frag
-// Module Version 10000
+// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 48
spv.bufferhandle18.frag
-// Module Version 10000
+// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 196
spv.bufferhandle2.frag
-// Module Version 10000
+// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 45
Capability Shader
Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_KHR_physical_storage_buffer"
- Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450
EntryPoint Fragment 4 "main"
spv.bufferhandle3.frag
-// Module Version 10000
+// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 50
Capability Shader
Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_KHR_physical_storage_buffer"
- Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450
EntryPoint Fragment 4 "main" 42
spv.bufferhandle4.frag
-// Module Version 10000
+// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 61
Capability Shader
Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_KHR_physical_storage_buffer"
- Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450
EntryPoint Fragment 4 "main"
spv.bufferhandle5.frag
-// Module Version 10000
+// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 22
spv.bufferhandle6.frag
-// Module Version 10000
+// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 165
Capability Shader
Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_KHR_physical_storage_buffer"
- Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450
EntryPoint Fragment 4 "main" 154
spv.bufferhandle7.frag
-// Module Version 10000
+// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 24
Capability Shader
Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_KHR_physical_storage_buffer"
- Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450
EntryPoint Fragment 4 "main"
spv.bufferhandle8.frag
-// Module Version 10000
+// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 27
Capability Shader
Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_KHR_physical_storage_buffer"
- Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450
EntryPoint Fragment 4 "main"
spv.bufferhandle9.frag
-// Module Version 10000
+// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 56
Capability Int64
Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_KHR_physical_storage_buffer"
- Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450
EntryPoint Fragment 4 "main" 16 19
spv.bufferhandleUvec2.frag
-// Module Version 10000
+// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 71
Capability Shader
Capability PhysicalStorageBufferAddressesEXT
Extension "SPV_KHR_physical_storage_buffer"
- Extension "SPV_KHR_storage_buffer_storage_class"
1: ExtInstImport "GLSL.std.450"
MemoryModel PhysicalStorageBuffer64EXT GLSL450
EntryPoint Fragment 4 "main" 16 19
spv.coopmat.comp
-// Module Version 10000
+// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 228
Capability VulkanMemoryModelKHR
Capability PhysicalStorageBufferAddressesEXT
Capability CooperativeMatrixNV
- Extension "SPV_KHR_16bit_storage"
Extension "SPV_KHR_physical_storage_buffer"
- Extension "SPV_KHR_storage_buffer_storage_class"
Extension "SPV_KHR_vulkan_memory_model"
Extension "SPV_NV_cooperative_matrix"
1: ExtInstImport "GLSL.std.450"
spv.intcoopmat.comp
-// Module Version 10000
+// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 262
Capability CooperativeMatrixNV
Extension "SPV_KHR_8bit_storage"
Extension "SPV_KHR_physical_storage_buffer"
- Extension "SPV_KHR_storage_buffer_storage_class"
Extension "SPV_KHR_vulkan_memory_model"
Extension "SPV_NV_cooperative_matrix"
1: ExtInstImport "GLSL.std.450"
EShTargetLanguageVersion minSpvVersion;
} extensionData;
- const extensionData exts[] = { {E_GL_EXT_ray_tracing, EShTargetSpv_1_4} };
+ const extensionData exts[] = { {E_GL_EXT_ray_tracing, EShTargetSpv_1_4},
+ {E_GL_EXT_buffer_reference, EShTargetSpv_1_3} };
for (size_t ii = 0; ii < sizeof(exts) / sizeof(exts[0]); ii++) {
// Add only extensions which require > spv1.0 to save space in map
if (exts[ii].minSpvVersion > EShTargetSpv_1_0) {
- extensionMinSpv[E_GL_EXT_ray_tracing] = exts[ii].minSpvVersion;
+ extensionMinSpv[exts[ii].extensionName] = exts[ii].minSpvVersion;
}
}
checkExtensionStage(getCurrentLoc(), extension);
// check if extension has additional requirements
- extensionRequires(getCurrentLoc(), extension ,behaviorString);
+ extensionRequires(getCurrentLoc(), extension, behaviorString);
// update the requested extension
updateExtensionBehavior(extension, behavior);
"spv.bool.vert",
"spv.boolInBlock.frag",
"spv.branch-return.vert",
- "spv.bufferhandle1.frag",
- "spv.bufferhandle10.frag",
- "spv.bufferhandle11.frag",
- "spv.bufferhandle12.frag",
- "spv.bufferhandle13.frag",
- "spv.bufferhandle14.frag",
- "spv.bufferhandle15.frag",
- "spv.bufferhandle16.frag",
- "spv.bufferhandle17_Errors.frag",
- "spv.bufferhandle18.frag",
- "spv.bufferhandle19_Errors.frag",
- "spv.bufferhandle2.frag",
- "spv.bufferhandle3.frag",
- "spv.bufferhandle4.frag",
- "spv.bufferhandle5.frag",
- "spv.bufferhandle6.frag",
- "spv.bufferhandle7.frag",
- "spv.bufferhandle8.frag",
- "spv.bufferhandle9.frag",
- "spv.bufferhandleUvec2.frag",
- "spv.bufferhandle_Error.frag",
"spv.builtInXFB.vert",
"spv.conditionalDemote.frag",
"spv.conditionalDiscard.frag",
"spv.constConstruct.vert",
"spv.controlFlowAttributes.frag",
"spv.conversion.frag",
- "spv.coopmat.comp",
"spv.coopmat_Error.comp",
"spv.dataOut.frag",
"spv.dataOutIndirect.frag",
"spv.GeometryShaderPassthrough.geom",
"spv.interpOps.frag",
"spv.int64.frag",
- "spv.intcoopmat.comp",
"spv.intOps.vert",
"spv.layer.tese",
"spv.layoutNested.vert",
"spv.1.3.8bitstorage-ubo.vert",
"spv.1.3.8bitstorage-ssbo.vert",
"spv.1.3.coopmat.comp",
+ "spv.bufferhandle1.frag",
+ "spv.bufferhandle10.frag",
+ "spv.bufferhandle11.frag",
+ "spv.bufferhandle12.frag",
+ "spv.bufferhandle13.frag",
+ "spv.bufferhandle14.frag",
+ "spv.bufferhandle15.frag",
+ "spv.bufferhandle16.frag",
+ "spv.bufferhandle17_Errors.frag",
+ "spv.bufferhandle18.frag",
+ "spv.bufferhandle19_Errors.frag",
+ "spv.bufferhandle2.frag",
+ "spv.bufferhandle3.frag",
+ "spv.bufferhandle4.frag",
+ "spv.bufferhandle5.frag",
+ "spv.bufferhandle6.frag",
+ "spv.bufferhandle7.frag",
+ "spv.bufferhandle8.frag",
+ "spv.bufferhandle9.frag",
+ "spv.bufferhandleUvec2.frag",
+ "spv.bufferhandle_Error.frag",
+ "spv.coopmat.comp",
"spv.deviceGroup.frag",
"spv.drawParams.vert",
"spv.int8.frag",
"spv.explicittypes.frag",
"spv.float32.frag",
"spv.float64.frag",
+ "spv.intcoopmat.comp",
"spv.memoryScopeSemantics.comp",
"spv.memoryScopeSemantics_Error.comp",
"spv.multiView.frag",