commit 9082b982b9c377384563d85dafa24ad717cd58c5
author Jamie Madill <jmadill@chromium.org> Wed Apr 27 15:21:51 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Fri Apr 29 01:47:03 2016 +0000
tree 673dc11ad14319016b1a8064c3f90e45d89fdd95
parent 9b8b359fa3615be7c7492239a48f61103b2e4fcc

Rename gl::Data to gl::ContextState.

Part of the new world order of renaming the Obj::Data classes to ObjState.

BUG=angleproject:1363

Change-Id: I15cf002b8b093d687f540b9e86f045874af24a7e
Reviewed-on: https://chromium-review.googlesource.com/340740
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/Program.cpp

diff --git a/src/libANGLE/Program.cpp b/src/libANGLE/Program.cpp
index b1f7abf..f3d569b 100644
--- a/src/libANGLE/Program.cpp
+++ b/src/libANGLE/Program.cpp
@@ -17,7 +17,7 @@
 #include "common/utilities.h"
 #include "common/version.h"
 #include "compiler/translator/blocklayout.h"
-#include "libANGLE/Data.h"
+#include "libANGLE/ContextState.h"
 #include "libANGLE/ResourceManager.h"
 #include "libANGLE/features.h"
 #include "libANGLE/renderer/Renderer.h"
@@ -442,7 +442,7 @@
 // Links the HLSL code of the vertex and pixel shader by matching up their varyings,
 // compiling them into binaries, determining the attribute mappings, and collecting
 // a list of uniforms
-Error Program::link(const gl::Data &data)
+Error Program::link(const ContextState &data)
 {
     unlink(false);
 
@@ -1814,7 +1814,7 @@
 }
 
 // Determines the mapping between GL attributes and Direct3D 9 vertex stream usage indices
-bool Program::linkAttributes(const gl::Data &data,
+bool Program::linkAttributes(const ContextState &data,
                              InfoLog &infoLog,
                              const Bindings &attributeBindings,
                              const Shader *vertexShader)