Skip to content

G
glslang
Unverified Commit 186e66c1 by Greg Fischer Committed by GitHub
Options

Revert "Update minimum SPIR-V requirement for GL_EXT_buffer_reference"

parent 14813995
Showing with 64 additions and 47 deletions
Test/baseResults/spv.bufferhandle1.frag.out
spv.bufferhandle1.frag
// Module Version 10300
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 52
......@@ -7,6 +7,7 @@ spv.bufferhandle1.frag
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
......
Test/baseResults/spv.bufferhandle10.frag.out
spv.bufferhandle10.frag
// Module Version 10300
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 40
......@@ -7,6 +7,7 @@ spv.bufferhandle10.frag
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
......
Test/baseResults/spv.bufferhandle11.frag.out
......@@ -2,7 +2,7 @@ spv.bufferhandle11.frag
WARNING: 0:6: '' : all default precisions are highp; use precision statements to quiet warning, e.g.:
"precision mediump int; precision highp float;"
// Module Version 10300
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 61
......@@ -11,6 +11,7 @@ WARNING: 0:6: '' : all default precisions are highp; use precision statements to
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"
......
Test/baseResults/spv.bufferhandle12.frag.out
......@@ -2,14 +2,16 @@ spv.bufferhandle12.frag
WARNING: 0:6: '' : all default precisions are highp; use precision statements to quiet warning, e.g.:
"precision mediump int; precision highp float;"
// Module Version 10300
// Module Version 10000
// 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"
......
Test/baseResults/spv.bufferhandle13.frag.out
spv.bufferhandle13.frag
// Module Version 10300
// Module Version 10000
// 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"
......
Test/baseResults/spv.bufferhandle14.frag.out
spv.bufferhandle14.frag
// Module Version 10300
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 46
......
Test/baseResults/spv.bufferhandle15.frag.out
......@@ -2,13 +2,14 @@ spv.bufferhandle15.frag
WARNING: 0:16: '' : all default precisions are highp; use precision statements to quiet warning, e.g.:
"precision mediump int; precision highp float;"
// Module Version 10300
// Module Version 10000
// 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
......
Test/baseResults/spv.bufferhandle16.frag.out
spv.bufferhandle16.frag
// Module Version 10300
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 48
......
Test/baseResults/spv.bufferhandle18.frag.out
spv.bufferhandle18.frag
// Module Version 10300
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 196
......
Test/baseResults/spv.bufferhandle2.frag.out
spv.bufferhandle2.frag
// Module Version 10300
// Module Version 10000
// 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"
......
Test/baseResults/spv.bufferhandle3.frag.out
spv.bufferhandle3.frag
// Module Version 10300
// Module Version 10000
// 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
......
Test/baseResults/spv.bufferhandle4.frag.out
spv.bufferhandle4.frag
// Module Version 10300
// Module Version 10000
// 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"
......
Test/baseResults/spv.bufferhandle5.frag.out
spv.bufferhandle5.frag
// Module Version 10300
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 22
......
Test/baseResults/spv.bufferhandle6.frag.out
spv.bufferhandle6.frag
// Module Version 10300
// Module Version 10000
// 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
......
Test/baseResults/spv.bufferhandle7.frag.out
spv.bufferhandle7.frag
// Module Version 10300
// Module Version 10000
// 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"
......
Test/baseResults/spv.bufferhandle8.frag.out
spv.bufferhandle8.frag
// Module Version 10300
// Module Version 10000
// 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"
......
Test/baseResults/spv.bufferhandle9.frag.out
spv.bufferhandle9.frag
// Module Version 10300
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 56
......@@ -7,6 +7,7 @@ spv.bufferhandle9.frag
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
......
Test/baseResults/spv.bufferhandleUvec2.frag.out
spv.bufferhandleUvec2.frag
// Module Version 10300
// Module Version 10000
// 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
......
Test/baseResults/spv.coopmat.comp.out
spv.coopmat.comp
// Module Version 10300
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 228
......@@ -9,7 +9,9 @@ spv.coopmat.comp
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"
......
Test/baseResults/spv.intcoopmat.comp.out
spv.intcoopmat.comp
// Module Version 10300
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 262
......@@ -12,6 +12,7 @@ spv.intcoopmat.comp
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"
......
glslang/MachineIndependent/Versions.cpp
......@@ -165,13 +165,12 @@ void TParseVersions::initializeExtensionBehavior()
EShTargetLanguageVersion minSpvVersion;
} extensionData;
const extensionData exts[] = { {E_GL_EXT_ray_tracing, EShTargetSpv_1_4},
{E_GL_EXT_buffer_reference, EShTargetSpv_1_3} };
const extensionData exts[] = { {E_GL_EXT_ray_tracing, EShTargetSpv_1_4} };
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[exts[ii].extensionName] = exts[ii].minSpvVersion;
extensionMinSpv[E_GL_EXT_ray_tracing] = exts[ii].minSpvVersion;
}
}
......@@ -876,7 +875,7 @@ void TParseVersions::updateExtensionBehavior(int line, const char* extension, co
checkExtensionStage(getCurrentLoc(), extension);
// check if extension has additional requirements
extensionRequires(getCurrentLoc(), extension, behaviorString);
extensionRequires(getCurrentLoc(), extension ,behaviorString);
// update the requested extension
updateExtensionBehavior(extension, behavior);
......
gtests/Spv.FromFile.cpp
......@@ -289,6 +289,27 @@ INSTANTIATE_TEST_SUITE_P(
"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",
......@@ -297,6 +318,7 @@ INSTANTIATE_TEST_SUITE_P(
"spv.constConstruct.vert",
"spv.controlFlowAttributes.frag",
"spv.conversion.frag",
"spv.coopmat.comp",
"spv.coopmat_Error.comp",
"spv.dataOut.frag",
"spv.dataOutIndirect.frag",
......@@ -331,6 +353,7 @@ INSTANTIATE_TEST_SUITE_P(
"spv.GeometryShaderPassthrough.geom",
"spv.interpOps.frag",
"spv.int64.frag",
"spv.intcoopmat.comp",
"spv.intOps.vert",
"spv.layer.tese",
"spv.layoutNested.vert",
......@@ -470,28 +493,6 @@ INSTANTIATE_TEST_SUITE_P(
"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",
......@@ -500,7 +501,6 @@ INSTANTIATE_TEST_SUITE_P(
"spv.explicittypes.frag",
"spv.float32.frag",
"spv.float64.frag",
"spv.intcoopmat.comp",
"spv.memoryScopeSemantics.comp",
"spv.memoryScopeSemantics_Error.comp",
"spv.multiView.frag",
......
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