Skip to content

G
glslang
Commit 7a9db71f by John Kessenich
Options

SPV: Don't emit StorageImageMultisample capability for subpass images.

parent 6cfeced8
Showing with 4 additions and 5 deletions
SPIRV/SpvBuilder.cpp
...@@ -469,7 +469,10 @@ Id Builder::makeImageType(Id sampledType, Dim dim, bool depth, bool arrayed, boo ...@@ -469,7 +469,10 @@ Id Builder::makeImageType(Id sampledType, Dim dim, bool depth, bool arrayed, boo
if (ms) { if (ms) {
if (sampled == 2) { if (sampled == 2) {
addCapability(CapabilityStorageImageMultisample); // Images used with subpass data are not storage
// images, so don't require the capability for them.
if (dim != Dim::DimSubpassData)
addCapability(CapabilityStorageImageMultisample);
if (arrayed) if (arrayed)
addCapability(CapabilityImageMSArray); addCapability(CapabilityImageMSArray);
} }
......
Test/baseResults/hlsl.subpass.frag.out
...@@ -434,7 +434,6 @@ gl_FragCoord origin is upper left ...@@ -434,7 +434,6 @@ gl_FragCoord origin is upper left
// Id's are bound by 204 // Id's are bound by 204
Capability Shader Capability Shader
Capability StorageImageMultisample
Capability InputAttachment Capability InputAttachment
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
......
Test/baseResults/spv.register.subpass.frag.out
...@@ -4,7 +4,6 @@ spv.register.subpass.frag ...@@ -4,7 +4,6 @@ spv.register.subpass.frag
// Id's are bound by 40 // Id's are bound by 40
Capability Shader Capability Shader
Capability StorageImageMultisample
Capability InputAttachment Capability InputAttachment
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
......
Test/baseResults/spv.shaderFragMaskAMD.frag.out
...@@ -4,7 +4,6 @@ spv.shaderFragMaskAMD.frag ...@@ -4,7 +4,6 @@ spv.shaderFragMaskAMD.frag
// Id's are bound by 80 // Id's are bound by 80
Capability Shader Capability Shader
Capability StorageImageMultisample
Capability InputAttachment Capability InputAttachment
Capability FragmentMaskAMD Capability FragmentMaskAMD
Extension "SPV_AMD_shader_fragment_mask" Extension "SPV_AMD_shader_fragment_mask"
......
Test/baseResults/spv.subpass.frag.out
...@@ -4,7 +4,6 @@ spv.subpass.frag ...@@ -4,7 +4,6 @@ spv.subpass.frag
// Id's are bound by 67 // Id's are bound by 67
Capability Shader Capability Shader
Capability StorageImageMultisample
Capability InputAttachment Capability InputAttachment
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
......
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