Move Uniform to separate files.

src/build_angle.gypi

@@ -305,6 +305,8 @@
             'libGLESv2/Shader.h',
             'libGLESv2/Texture.cpp',
             'libGLESv2/Texture.h',
+            'libGLESv2/Uniform.cpp',
+            'libGLESv2/Uniform.h',
             'libGLESv2/utilities.cpp',
             'libGLESv2/utilities.h',
           ],

src/libGLESv2/ProgramBinary.h

@@ -21,6 +21,7 @@
 #include "libGLESv2/Context.h"
 #include "libGLESv2/mathutil.h"
 #include "libGLESv2/Shader.h"
+#include "libGLESv2/Uniform.h"
 
 #include "libGLESv2/renderer/ShaderExecutable.h"
 
@@ -29,60 +30,6 @@ namespace gl
 class FragmentShader;
 class VertexShader;
 
-// Helper struct representing a single shader uniform
-struct Uniform
-{
-    Uniform(GLenum type, const std::string &_name, unsigned int arraySize);
-
-    ~Uniform();
-
-    bool isArray();
-
-    const GLenum type;
-    const std::string _name;   // Decorated name
-    const std::string name;    // Undecorated name
-    const unsigned int arraySize;
-
-    unsigned char *data;
-    bool dirty;
-
-    struct RegisterInfo
-    {
-        RegisterInfo()
-        {
-            float4Index = -1;
-            samplerIndex = -1;
-            boolIndex = -1;
-            registerCount = 0;
-        }
-
-        void set(const rx::D3DConstant *constant)
-        {
-            switch(constant->registerSet)
-            {
-              case rx::D3DConstant::RS_BOOL:    boolIndex = constant->registerIndex;    break;
-              case rx::D3DConstant::RS_FLOAT4:  float4Index = constant->registerIndex;  break;
-              case rx::D3DConstant::RS_SAMPLER: samplerIndex = constant->registerIndex; break;
-              default: UNREACHABLE();
-            }
-            
-            ASSERT(registerCount == 0 || registerCount == (int)constant->registerCount);
-            registerCount = constant->registerCount;
-        }
-
-        int float4Index;
-        int samplerIndex;
-        int boolIndex;
-
-        int registerCount;
-    };
-
-    RegisterInfo ps;
-    RegisterInfo vs;
-};
-
-typedef std::vector<Uniform*> UniformArray;
-
 // Struct used for correlating uniforms/elements of uniform arrays to handles
 struct UniformLocation
 {
@@ -161,7 +108,6 @@ class ProgramBinary : public RefCountObject
     unsigned int getSerial() const;
 
     static std::string decorateAttribute(const std::string &name);    // Prepend an underscore
-    static std::string undecorateUniform(const std::string &_name);   // Remove leading underscore
 
   private:
     DISALLOW_COPY_AND_ASSIGN(ProgramBinary);

src/libGLESv2/Uniform.cpp

+//
+// Copyright (c) 2010-2012 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+
+#include "libGLESv2/Uniform.h"
+
+#include "libGLESv2/utilities.h"
+
+namespace gl
+{
+
+Uniform::Uniform(GLenum type, const std::string &_name, unsigned int arraySize)
+    : type(type), _name(_name), name(undecorate(_name)), arraySize(arraySize)
+{
+    int bytes = gl::UniformInternalSize(type) * arraySize;
+    data = new unsigned char[bytes];
+    memset(data, 0, bytes);
+    dirty = true;
+}
+
+Uniform::~Uniform()
+{
+    delete[] data;
+}
+
+bool Uniform::isArray()
+{
+    size_t dot = _name.find_last_of('.');
+    if (dot == std::string::npos) dot = -1;
+
+    return _name.compare(dot + 1, dot + 4, "ar_") == 0;
+}
+
+std::string Uniform::undecorate(const std::string &_name)
+{
+    std::string name = _name;
+    
+    // Remove any structure field decoration
+    size_t pos = 0;
+    while ((pos = name.find("._", pos)) != std::string::npos)
+    {
+        name.replace(pos, 2, ".");
+    }
+
+    // Remove the leading decoration
+    if (name[0] == '_')
+    {
+        return name.substr(1);
+    }
+    else if (name.compare(0, 3, "ar_") == 0)
+    {
+        return name.substr(3);
+    }
+    
+    return name;
+}
+
+}

src/libGLESv2/Uniform.h

+//
+// Copyright (c) 2010-2012 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+
+#ifndef LIBGLESV2_UNIFORM_H_
+#define LIBGLESV2_UNIFORM_H_
+
+#include <string>
+
+#define GL_APICALL
+#include <GLES2/gl2.h>
+
+#include "common/debug.h"
+#include "libGLESv2/renderer/D3DConstantTable.h"
+
+namespace gl
+{
+
+// Helper struct representing a single shader uniform
+struct Uniform
+{
+    Uniform(GLenum type, const std::string &_name, unsigned int arraySize);
+
+    ~Uniform();
+
+    bool isArray();
+    static std::string Uniform::undecorate(const std::string &_name);
+
+    const GLenum type;
+    const std::string _name;   // Decorated name
+    const std::string name;    // Undecorated name
+    const unsigned int arraySize;
+
+    unsigned char *data;
+    bool dirty;
+
+    struct RegisterInfo
+    {
+        RegisterInfo()
+        {
+            float4Index = -1;
+            samplerIndex = -1;
+            boolIndex = -1;
+            registerCount = 0;
+        }
+
+        void set(const rx::D3DConstant *constant)
+        {
+            switch(constant->registerSet)
+            {
+              case rx::D3DConstant::RS_BOOL:    boolIndex = constant->registerIndex;    break;
+              case rx::D3DConstant::RS_FLOAT4:  float4Index = constant->registerIndex;  break;
+              case rx::D3DConstant::RS_SAMPLER: samplerIndex = constant->registerIndex; break;
+              default: UNREACHABLE();
+            }
+            
+            ASSERT(registerCount == 0 || registerCount == (int)constant->registerCount);
+            registerCount = constant->registerCount;
+        }
+
+        int float4Index;
+        int samplerIndex;
+        int boolIndex;
+
+        int registerCount;
+    };
+
+    RegisterInfo ps;
+    RegisterInfo vs;
+};
+
+typedef std::vector<Uniform*> UniformArray;
+
+}
+
+#endif   // LIBGLESV2_UNIFORM_H_

src/libGLESv2/libGLESv2.vcxproj

@@ -270,6 +270,7 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
     <ClCompile Include="ResourceManager.cpp" />
     <ClCompile Include="Shader.cpp" />
     <ClCompile Include="Texture.cpp" />
+    <ClCompile Include="Uniform.cpp" />
     <ClCompile Include="utilities.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -324,6 +325,7 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
     <ClInclude Include="ResourceManager.h" />
     <ClInclude Include="Shader.h" />
     <ClInclude Include="Texture.h" />
+    <ClInclude Include="Uniform.h" />
     <ClInclude Include="utilities.h" />
     <ClInclude Include="..\common\version.h" />
   </ItemGroup>

src/libGLESv2/libGLESv2.vcxproj.filters

@@ -152,6 +152,9 @@
     <ClCompile Include="renderer\Image11.cpp">
       <Filter>Renderer</Filter>
     </ClCompile>
+    <ClCompile Include="Uniform.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="BinaryStream.h">
@@ -313,6 +316,9 @@
     <ClInclude Include="renderer\Image11.h">
       <Filter>Renderer</Filter>
     </ClInclude>
+    <ClInclude Include="Uniform.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="libGLESv2.def">
@@ -322,4 +328,4 @@
   <ItemGroup>
     <ResourceCompile Include="libGLESv2.rc" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file