Merge pull request #192 from Qining/enable-adding-multiviewport-capability

SPV: Declare MultiViewport capability.

Merge pull request #192 from Qining/enable-adding-multiviewport-capability
2107c76a · John Kessenich · 3c5b1e6b · be4f52a4 · 2107c76a · 2107c76a
Commit 2107c76a authored Mar 07, 2016 by John Kessenich
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

GlslangToSpv.cpp SPIRV/GlslangToSpv.cpp +1 -1

spv.420.geom.out Test/baseResults/spv.420.geom.out +1 -0

No files found.
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -381,7 +381,7 @@ spv::BuiltIn TGlslangToSpvTraverser::TranslateBuiltInDecoration(glslang::TBuiltI
        return spv::BuiltInCullDistance;

    case glslang::EbvViewportIndex:
-        // TODO: builder.addCapability(spv::CapabilityMultiViewport);
+        builder.addCapability(spv::CapabilityMultiViewport);
        return spv::BuiltInViewportIndex;

    case glslang::EbvSampleId:

--- a/Test/baseResults/spv.420.geom.out
+++ b/Test/baseResults/spv.420.geom.out
@@ -12,6 +12,7 @@ Linked geometry stage:
                              Capability Geometry
                              Capability GeometryPointSize
                              Capability GeometryStreams
+                              Capability MultiViewport
               1:             ExtInstImport  "GLSL.std.450"
                              MemoryModel Logical GLSL450
                              EntryPoint Geometry 4  "main" 14 23 28 33 46