Move VertexAttribute to its own header file.

src/build_angle.gypi

@@ -377,6 +377,7 @@
             'libGLESv2/Texture.h',
             'libGLESv2/Uniform.cpp',
             'libGLESv2/Uniform.h',
+            'libGLESv2/VertexAttribute.h',
           ],
           # TODO(jschuh): http://crbug.com/167187 size_t -> int
           'msvs_disabled_warnings': [ 4267 ],

src/libGLESv2/Context.h

@@ -33,6 +33,7 @@
 #include "libGLESv2/HandleAllocator.h"
 #include "libGLESv2/angletypes.h"
 #include "libGLESv2/Constants.h"
+#include "libGLESv2/VertexAttribute.h"
 
 namespace rx
 {
@@ -75,76 +76,6 @@ enum QueryType
     QUERY_TYPE_COUNT
 };
 
-// Helper structure describing a single vertex attribute
-class VertexAttribute
-{
-  public:
-    VertexAttribute() : mType(GL_FLOAT), mSize(0), mNormalized(false), mPureInteger(false),
-                        mStride(0), mPointer(NULL), mArrayEnabled(false), mDivisor(0)
-    {
-        mCurrentValue.FloatValues[0] = 0.0f;
-        mCurrentValue.FloatValues[1] = 0.0f;
-        mCurrentValue.FloatValues[2] = 0.0f;
-        mCurrentValue.FloatValues[3] = 1.0f;
-        mCurrentValue.Type = GL_FLOAT;
-    }
-
-    int typeSize() const
-    {
-        switch (mType)
-        {
-          case GL_BYTE:                        return mSize * sizeof(GLbyte);
-          case GL_UNSIGNED_BYTE:               return mSize * sizeof(GLubyte);
-          case GL_SHORT:                       return mSize * sizeof(GLshort);
-          case GL_UNSIGNED_SHORT:              return mSize * sizeof(GLushort);
-          case GL_INT:                         return mSize * sizeof(GLint);
-          case GL_UNSIGNED_INT:                return mSize * sizeof(GLuint);
-          case GL_INT_2_10_10_10_REV:          return 4;
-          case GL_UNSIGNED_INT_2_10_10_10_REV: return 4;
-          case GL_FIXED:                       return mSize * sizeof(GLfixed);
-          case GL_HALF_FLOAT:                  return mSize * sizeof(GLhalf);
-          case GL_FLOAT:                       return mSize * sizeof(GLfloat);
-          default: UNREACHABLE();              return mSize * sizeof(GLfloat);
-        }
-    }
-
-    GLsizei stride() const
-    {
-        return mStride ? mStride : typeSize();
-    }
-
-    // From glVertexAttribPointer
-    GLenum mType;
-    GLint mSize;
-    bool mNormalized;
-    bool mPureInteger;
-    GLsizei mStride;   // 0 means natural stride
-
-    union
-    {
-        const void *mPointer;
-        intptr_t mOffset;
-    };
-
-    BindingPointer<Buffer> mBoundBuffer;   // Captured when glVertexAttribPointer is called.
-
-    bool mArrayEnabled;   // From glEnable/DisableVertexAttribArray
-
-    struct CurrentValueData
-    {
-        union
-        {
-            GLfloat FloatValues[4];
-            GLint IntValues[4];
-            GLuint UnsignedIntValues[4];
-        };
-        GLenum Type;
-    };
-    CurrentValueData mCurrentValue; // From glVertexAttrib
-
-    unsigned int mDivisor;
-};
-
 // Helper structure to store all raw state
 struct State
 {

src/libGLESv2/ProgramBinary.cpp

@@ -21,7 +21,6 @@
 #include "libGLESv2/Program.h"
 #include "libGLESv2/renderer/Renderer.h"
 #include "libGLESv2/renderer/VertexDataManager.h"
-#include "libGLESv2/Context.h"
 #include "libGLESv2/Buffer.h"
 
 #undef near

src/libGLESv2/VertexAttribute.h

+//
+// Copyright (c) 2013 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.
+//
+// Helper structure describing a single vertex attribute
+//
+
+#ifndef LIBGLESV2_VERTEXATTRIBUTE_H_
+#define LIBGLESV2_VERTEXATTRIBUTE_H_
+
+#include "common/RefCountObject.h"
+
+namespace gl
+{
+class Buffer;
+
+class VertexAttribute
+{
+  public:
+    VertexAttribute() : mType(GL_FLOAT), mSize(0), mNormalized(false), mPureInteger(false),
+                        mStride(0), mPointer(NULL), mArrayEnabled(false), mDivisor(0)
+    {
+        mCurrentValue.FloatValues[0] = 0.0f;
+        mCurrentValue.FloatValues[1] = 0.0f;
+        mCurrentValue.FloatValues[2] = 0.0f;
+        mCurrentValue.FloatValues[3] = 1.0f;
+        mCurrentValue.Type = GL_FLOAT;
+    }
+
+    int typeSize() const
+    {
+        switch (mType)
+        {
+          case GL_BYTE:                        return mSize * sizeof(GLbyte);
+          case GL_UNSIGNED_BYTE:               return mSize * sizeof(GLubyte);
+          case GL_SHORT:                       return mSize * sizeof(GLshort);
+          case GL_UNSIGNED_SHORT:              return mSize * sizeof(GLushort);
+          case GL_INT:                         return mSize * sizeof(GLint);
+          case GL_UNSIGNED_INT:                return mSize * sizeof(GLuint);
+          case GL_INT_2_10_10_10_REV:          return 4;
+          case GL_UNSIGNED_INT_2_10_10_10_REV: return 4;
+          case GL_FIXED:                       return mSize * sizeof(GLfixed);
+          case GL_HALF_FLOAT:                  return mSize * sizeof(GLhalf);
+          case GL_FLOAT:                       return mSize * sizeof(GLfloat);
+          default: UNREACHABLE();              return mSize * sizeof(GLfloat);
+        }
+    }
+
+    GLsizei stride() const
+    {
+        return mStride ? mStride : typeSize();
+    }
+
+    // From glVertexAttribPointer
+    GLenum mType;
+    GLint mSize;
+    bool mNormalized;
+    bool mPureInteger;
+    GLsizei mStride;   // 0 means natural stride
+
+    union
+    {
+        const void *mPointer;
+        intptr_t mOffset;
+    };
+
+    BindingPointer<Buffer> mBoundBuffer;   // Captured when glVertexAttribPointer is called.
+    bool mArrayEnabled;   // From glEnable/DisableVertexAttribArray
+
+    struct CurrentValueData
+    {
+        union
+        {
+            GLfloat FloatValues[4];
+            GLint IntValues[4];
+            GLuint UnsignedIntValues[4];
+        };
+        GLenum Type;
+    };
+    CurrentValueData mCurrentValue; // From glVertexAttrib
+
+    unsigned int mDivisor;
+};
+
+}
+
+#endif // LIBGLESV2_VERTEXATTRIBUTE_H_

src/libGLESv2/libGLESv2.vcxproj

@@ -438,6 +438,7 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
     <ClInclude Include="Texture.h" />
     <ClInclude Include="Uniform.h" />
     <ClInclude Include="..\common\version.h" />
+    <ClInclude Include="VertexAttribute.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="libGLESv2.def" />

src/libGLESv2/libGLESv2.vcxproj.filters

@@ -616,6 +616,9 @@
     <ClInclude Include="renderer\shaders\compiled\passthroughdepth2d11ps.h">
       <Filter>Shaders\Compiled</Filter>
     </ClInclude>
+    <ClInclude Include="VertexAttribute.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="renderer\shaders\Blit.ps">

src/libGLESv2/renderer/InputLayoutCache.cpp

@@ -13,7 +13,7 @@
 #include "libGLESv2/renderer/BufferStorage11.h"
 #include "libGLESv2/renderer/ShaderExecutable11.h"
 #include "libGLESv2/ProgramBinary.h"
-#include "libGLESv2/Context.h"
+#include "libGLESv2/VertexAttribute.h"
 #include "libGLESv2/renderer/VertexDataManager.h"
 
 #include "third_party/murmurhash/MurmurHash3.h"

src/libGLESv2/renderer/VertexBuffer.cpp

@@ -10,7 +10,7 @@
 
 #include "libGLESv2/renderer/VertexBuffer.h"
 #include "libGLESv2/renderer/Renderer.h"
-#include "libGLESv2/Context.h"
+#include "libGLESv2/VertexAttribute.h"
 
 namespace rx
 {

src/libGLESv2/renderer/VertexBuffer11.cpp

@@ -12,7 +12,7 @@
 
 #include "libGLESv2/Buffer.h"
 #include "libGLESv2/renderer/Renderer11.h"
-#include "libGLESv2/Context.h"
+#include "libGLESv2/VertexAttribute.h"
 
 namespace rx
 {

src/libGLESv2/renderer/VertexBuffer9.cpp

@@ -10,7 +10,7 @@
 #include "libGLESv2/renderer/VertexBuffer9.h"
 #include "libGLESv2/renderer/vertexconversion.h"
 #include "libGLESv2/renderer/BufferStorage.h"
-#include "libGLESv2/Context.h"
+#include "libGLESv2/VertexAttribute.h"
 #include "libGLESv2/renderer/Renderer9.h"
 
 #include "libGLESv2/Buffer.h"

src/libGLESv2/renderer/VertexDataManager.cpp

@@ -13,7 +13,7 @@
 
 #include "libGLESv2/Buffer.h"
 #include "libGLESv2/ProgramBinary.h"
-#include "libGLESv2/Context.h"
+#include "libGLESv2/VertexAttribute.h"
 #include "libGLESv2/renderer/VertexBuffer.h"
 
 namespace

src/libGLESv2/renderer/VertexDataManager.h

@@ -11,7 +11,7 @@
 #define LIBGLESV2_RENDERER_VERTEXDATAMANAGER_H_
 
 #include "libGLESv2/Constants.h"
-#include "libGLESv2/Context.h"
+#include "libGLESv2/VertexAttribute.h"
 #include "common/angleutils.h"
 
 namespace gl

src/libGLESv2/renderer/VertexDeclarationCache.cpp

@@ -8,7 +8,7 @@
 // VertexDeclarationCache.cpp: Implements a helper class to construct and cache vertex declarations.
 
 #include "libGLESv2/ProgramBinary.h"
-#include "libGLESv2/Context.h"
+#include "libGLESv2/VertexAttribute.h"
 #include "libGLESv2/renderer/VertexBuffer9.h"
 #include "libGLESv2/renderer/VertexDeclarationCache.h"