Merge pull request #806 from amdrexu/bugfix2

Don't emit NV-specific interface members if NV extensions are disabled.

Merge pull request #806 from amdrexu/bugfix2
3feac2eb · John Kessenich · GitHub · aa3c64c2 · bcf291a7 · 3feac2eb
Commit 3feac2eb authored Mar 29, 2017 by John Kessenich Committed by GitHub Mar 29, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

GlslangToSpv.cpp SPIRV/GlslangToSpv.cpp +9 -0

No files found.
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -2272,12 +2272,21 @@ bool TGlslangToSpvTraverser::filterMember(const glslang::TType& member)
 {
    auto& extensions = glslangIntermediate->getRequestedExtensions();

+    if (member.getFieldName() == "gl_ViewportMask" &&
+        extensions.find("GL_NV_viewport_array2") == extensions.end())
+        return true;
+    if (member.getFieldName() == "gl_SecondaryViewportMaskNV" &&
+        extensions.find("GL_NV_stereo_view_rendering") == extensions.end())
+        return true;
    if (member.getFieldName() == "gl_SecondaryPositionNV" &&
        extensions.find("GL_NV_stereo_view_rendering") == extensions.end())
        return true;
    if (member.getFieldName() == "gl_PositionPerViewNV" &&
        extensions.find("GL_NVX_multiview_per_view_attributes") == extensions.end())
        return true;
+    if (member.getFieldName() == "gl_ViewportMaskPerViewNV" &&
+        extensions.find("GL_NVX_multiview_per_view_attributes") == extensions.end())
+        return true;

    return false;
 };