commit 46131a3832c3478c1e0b48dbf6284799f3f86f04
author Jamie Madill <jmadill@transgaming.com> Thu Jun 20 11:55:50 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:05:03 2013 -0400
tree 46405a23cb9ee6dad56cffb21451699cc11ecf1a
parent 05a80cebc3ce8ca07ae10e2970863e3cc603c756

Proper support for fragment output variables for GLSL ES shader version 300.

TRAC #22704

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

src/libGLESv2/ProgramBinary.h

diff --git a/src/libGLESv2/ProgramBinary.h b/src/libGLESv2/ProgramBinary.h
index b5c4eb6..33fd9c3 100644
--- a/src/libGLESv2/ProgramBinary.h
+++ b/src/libGLESv2/ProgramBinary.h
@@ -164,7 +164,8 @@
     void defineUniformBlockMembers(const sh::ActiveUniforms &uniforms, const std::string &prefix, int blockIndex, BlockInfoItr *blockInfoItr, std::vector<unsigned int> *blockUniformIndexes);
     bool defineUniformBlock(InfoLog &infoLog, GLenum shader, const sh::InterfaceBlock &interfaceBlock);
     bool assignUniformBlockRegister(InfoLog &infoLog, UniformBlock *uniformBlock, GLenum shader, unsigned int registerIndex);
-    
+    void defineOutputVariables(FragmentShader *fragmentShader);
+
     std::string generateGeometryShaderHLSL(int registers, const Varying *packing[][4], FragmentShader *fragmentShader, VertexShader *vertexShader) const;
     std::string generatePointSpriteHLSL(int registers, const Varying *packing[][4], FragmentShader *fragmentShader, VertexShader *vertexShader) const;
 
@@ -206,6 +207,8 @@
     UniformBlockArray mUniformBlocks;
     typedef std::vector<VariableLocation> UniformIndex;
     UniformIndex mUniformIndex;
+    typedef std::map<int, VariableLocation> ShaderVariableIndex;
+    ShaderVariableIndex mOutputVariables;
 
     bool mValidated;