commit defb674aade4162d900a6f64abdebbb4f2256db1
author Jamie Madill <jmadill@transgaming.com> Thu Jun 20 11:55:51 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:05:04 2013 -0400
tree cde1d9c11f16db8a6b5098ac1771e08ed2dab03f
parent bb22e508f367b742b8c8ff48c43237b908255fa3

Add a new path for querying active attributes from the shader translator, for use with layout qualifier support.

TRAC #23269

Signed-off-by: Geoff Lang
Signed-off-by: Nicolas Capens
Author: Jamie Madill

src/compiler/OutputHLSL.cpp

diff --git a/src/compiler/OutputHLSL.cpp b/src/compiler/OutputHLSL.cpp
index b36d456..d117a30 100644
--- a/src/compiler/OutputHLSL.cpp
+++ b/src/compiler/OutputHLSL.cpp
@@ -161,6 +161,11 @@
     return mActiveOutputVariables;
 }
 
+const ActiveShaderVariables &OutputHLSL::getAttributes() const
+{
+    return mActiveAttributes;
+}
+
 int OutputHLSL::vectorSize(const TType &type) const
 {
     int elementSize = type.isMatrix() ? type.getCols() : 1;
@@ -389,6 +394,10 @@
         const TString &name = attribute->second->getSymbol();
 
         attributes += "static " + typeString(type) + " " + decorate(name) + arrayString(type) + " = " + initializer(type) + ";\n";
+
+        ShaderVariable shaderVar(glVariableType(type), glVariablePrecision(type), name.c_str(),
+                                 (unsigned int)type.getArraySize(), type.getLayoutQualifier().location);
+        mActiveAttributes.push_back(shaderVar);
     }
 
     if (shaderType == SH_FRAGMENT_SHADER)

src/compiler/OutputHLSL.h

diff --git a/src/compiler/OutputHLSL.h b/src/compiler/OutputHLSL.h
index c22ad4f..6a409b4 100644
--- a/src/compiler/OutputHLSL.h
+++ b/src/compiler/OutputHLSL.h
@@ -35,6 +35,7 @@
     const ActiveUniforms &getUniforms();
     const ActiveInterfaceBlocks &getInterfaceBlocks() const;
     const ActiveShaderVariables &getOutputVariables() const;
+    const ActiveShaderVariables &getAttributes() const;
 
     TString typeString(const TType &type);
     TString textureString(const TType &type);
@@ -195,6 +196,7 @@
     ActiveUniforms mActiveUniforms;
     ActiveInterfaceBlocks mActiveInterfaceBlocks;
     ActiveShaderVariables mActiveOutputVariables;
+    ActiveShaderVariables mActiveAttributes;
 };
 }
 

src/compiler/ShaderLang.cpp

diff --git a/src/compiler/ShaderLang.cpp b/src/compiler/ShaderLang.cpp
index 07313dd..efdcb67 100644
--- a/src/compiler/ShaderLang.cpp
+++ b/src/compiler/ShaderLang.cpp
@@ -382,6 +382,9 @@
     case SH_ACTIVE_OUTPUT_VARIABLES_ARRAY:
         *params = (void*)&translator->getOutputVariables();
         break;
+    case SH_ACTIVE_ATTRIBUTES_ARRAY:
+        *params = (void*)&translator->getAttributes();
+        break;
     default: UNREACHABLE();
     }
 }

src/compiler/TranslatorHLSL.cpp

diff --git a/src/compiler/TranslatorHLSL.cpp b/src/compiler/TranslatorHLSL.cpp
index 6ef91f4..83468d4 100644
--- a/src/compiler/TranslatorHLSL.cpp
+++ b/src/compiler/TranslatorHLSL.cpp
@@ -23,4 +23,5 @@
     mActiveUniforms = outputHLSL.getUniforms();
     mActiveInterfaceBlocks = outputHLSL.getInterfaceBlocks();
     mActiveOutputVariables = outputHLSL.getOutputVariables();
+    mActiveAttributes = outputHLSL.getAttributes();
 }

src/compiler/TranslatorHLSL.h

diff --git a/src/compiler/TranslatorHLSL.h b/src/compiler/TranslatorHLSL.h
index c031446..e53e831 100644
--- a/src/compiler/TranslatorHLSL.h
+++ b/src/compiler/TranslatorHLSL.h
@@ -18,6 +18,7 @@
     const sh::ActiveUniforms &getUniforms() { return mActiveUniforms; }
     const sh::ActiveInterfaceBlocks &getInterfaceBlocks() const { return mActiveInterfaceBlocks; }
     const sh::ActiveShaderVariables &getOutputVariables() { return mActiveOutputVariables; }
+    const sh::ActiveShaderVariables &getAttributes() { return mActiveAttributes; }
 
 protected:
     virtual void translate(TIntermNode* root);
@@ -25,6 +26,7 @@
     sh::ActiveUniforms mActiveUniforms;
     sh::ActiveInterfaceBlocks mActiveInterfaceBlocks;
     sh::ActiveShaderVariables mActiveOutputVariables;
+    sh::ActiveShaderVariables mActiveAttributes;
     ShShaderOutput mOutputType;
 };
 

src/compiler/Uniform.cpp

diff --git a/src/compiler/Uniform.cpp b/src/compiler/Uniform.cpp
index 602eed5..3cd3599 100644
--- a/src/compiler/Uniform.cpp
+++ b/src/compiler/Uniform.cpp
@@ -11,6 +11,14 @@
 namespace sh
 {
 
+ShaderVariable::ShaderVariable()
+    : type(GL_NONE),
+      precision(GL_NONE),
+      arraySize(0),
+      location(-1)
+{
+}
+
 ShaderVariable::ShaderVariable(GLenum type, GLenum precision, const char *name, unsigned int arraySize, int location)
     : type(type),
       precision(precision),

src/compiler/Uniform.h

diff --git a/src/compiler/Uniform.h b/src/compiler/Uniform.h
index e43533a..ac0fdfd 100644
--- a/src/compiler/Uniform.h
+++ b/src/compiler/Uniform.h
@@ -19,6 +19,7 @@
 
 struct ShaderVariable
 {
+    ShaderVariable();
     ShaderVariable(GLenum type, GLenum precision, const char *name, unsigned int arraySize, int location);
 
     GLenum type;