Fix the reported shader gl_MaxDrawBuffers to be compliant with the new EXT_draw_buffers spec.

From the extension spec: "8) What value should gl_MaxDrawBuffers in the shading language report?" "RESOLVE: It should match MAX_DRAW_BUFFERS_EXT from the API. None of the API or GLSL specifications explicitly state the linkage between API and SL constants, but it seems logical that one would expect them to match, regardless of whether or not an extension directive is used in the shading language." TRAC #23509 Signed-off-by: Shannon Woods Signed-off-by: Nicolas Capens Authored-by: Jamie Madill

Fix the reported shader gl_MaxDrawBuffers to be compliant with the new EXT_draw_buffers spec.
d5c6abc4 · Jamie Madill · Shannon Woods · 1bc1b6a3 · d5c6abc4 · d5c6abc4
Commit d5c6abc4 authored Jul 12, 2013 by Jamie Madill Committed by Shannon Woods Jul 19, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 10 deletions

Compiler.cpp src/compiler/Compiler.cpp +1 -1

Initialize.cpp src/compiler/Initialize.cpp +2 -7

Initialize.h src/compiler/Initialize.h +1 -2

No files found.
--- a/src/compiler/Compiler.cpp
+++ b/src/compiler/Compiler.cpp
@@ -237,7 +237,7 @@ bool TCompiler::InitBuiltInSymbolTable(const ShBuiltInResources &resources)
      default: assert(false && "Language not supported");
    }

-    InsertBuiltInFunctions(shaderType, shaderSpec, resources, extensionBehavior, symbolTable);
+    InsertBuiltInFunctions(shaderType, shaderSpec, resources, symbolTable);

    IdentifyBuiltIns(shaderType, shaderSpec, resources, symbolTable);


--- a/src/compiler/Initialize.cpp
+++ b/src/compiler/Initialize.cpp
@@ -14,8 +14,7 @@

 #include "compiler/intermediate.h"

-void InsertBuiltInFunctions(ShShaderType type, ShShaderSpec spec, const ShBuiltInResources &resources,
-                            const TExtensionBehavior &extensionBehavior, TSymbolTable &symbolTable)
+void InsertBuiltInFunctions(ShShaderType type, ShShaderSpec spec, const ShBuiltInResources &resources, TSymbolTable &symbolTable)
 {
    TType *float1 = new TType(EbtFloat, EbpUndefined, EvqGlobal, 1);
    TType *float2 = new TType(EbtFloat, EbpUndefined, EvqGlobal, 2);
@@ -415,11 +414,7 @@ void InsertBuiltInFunctions(ShShaderType type, ShShaderSpec spec, const ShBuiltI

    if (spec != SH_CSS_SHADERS_SPEC)
    {
-        TExtensionBehavior::const_iterator iter = extensionBehavior.find("GL_EXT_draw_buffers");
-        const bool usingMRTExtension = (iter != extensionBehavior.end() && (iter->second == EBhEnable || iter->second == EBhRequire));
-        const int maxDrawBuffers = (usingMRTExtension ? resources.MaxDrawBuffers : 1);
-
-        symbolTable.insertConstInt("gl_MaxDrawBuffers", maxDrawBuffers);
+        symbolTable.insertConstInt("gl_MaxDrawBuffers", resources.MaxDrawBuffers);
    }
 }


--- a/src/compiler/Initialize.h
+++ b/src/compiler/Initialize.h
@@ -11,8 +11,7 @@
 #include "compiler/ShHandle.h"
 #include "compiler/SymbolTable.h"

-void InsertBuiltInFunctions(ShShaderType type, ShShaderSpec spec, const ShBuiltInResources &resources,
-                            const TExtensionBehavior &extensionBehavior, TSymbolTable &table);
+void InsertBuiltInFunctions(ShShaderType type, ShShaderSpec spec, const ShBuiltInResources &resources, TSymbolTable &table);

 void IdentifyBuiltIns(ShShaderType type, ShShaderSpec spec,
                      const ShBuiltInResources& resources,