commit 63cbace6730b4191bbb9da488481c2df6ddd82eb
author Geoff Lang <geofflang@chromium.org> Thu Feb 26 10:03:12 2015 -0500
committer Geoff Lang <geofflang@chromium.org> Thu Feb 26 15:18:57 2015 +0000
tree d3511f8ed81241525baa4a02a6a986424398c5ce
parent ab249d18d8b473bf0d118ce66c50aace49dec547

Rename StateManagerGL::setProgram to useProgram.

BUG=angle:882

Change-Id: I4046e23bf720690869558fa6a5528d40c4b3bfa3
Reviewed-on: https://chromium-review.googlesource.com/254070
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/renderer/gl/ProgramGL.cpp

diff --git a/src/libANGLE/renderer/gl/ProgramGL.cpp b/src/libANGLE/renderer/gl/ProgramGL.cpp
index 7cd78f4..c27e17a 100644
--- a/src/libANGLE/renderer/gl/ProgramGL.cpp
+++ b/src/libANGLE/renderer/gl/ProgramGL.cpp
@@ -172,127 +172,127 @@
 
 void ProgramGL::setUniform1fv(GLint location, GLsizei count, const GLfloat *v)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniform1fv(location, count, v);
 }
 
 void ProgramGL::setUniform2fv(GLint location, GLsizei count, const GLfloat *v)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniform2fv(location, count, v);
 }
 
 void ProgramGL::setUniform3fv(GLint location, GLsizei count, const GLfloat *v)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniform3fv(location, count, v);
 }
 
 void ProgramGL::setUniform4fv(GLint location, GLsizei count, const GLfloat *v)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniform4fv(location, count, v);
 }
 
 void ProgramGL::setUniform1iv(GLint location, GLsizei count, const GLint *v)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniform1iv(location, count, v);
 }
 
 void ProgramGL::setUniform2iv(GLint location, GLsizei count, const GLint *v)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniform2iv(location, count, v);
 }
 
 void ProgramGL::setUniform3iv(GLint location, GLsizei count, const GLint *v)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniform3iv(location, count, v);
 }
 
 void ProgramGL::setUniform4iv(GLint location, GLsizei count, const GLint *v)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniform4iv(location, count, v);
 }
 
 void ProgramGL::setUniform1uiv(GLint location, GLsizei count, const GLuint *v)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniform1uiv(location, count, v);
 }
 
 void ProgramGL::setUniform2uiv(GLint location, GLsizei count, const GLuint *v)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniform2uiv(location, count, v);
 }
 
 void ProgramGL::setUniform3uiv(GLint location, GLsizei count, const GLuint *v)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniform3uiv(location, count, v);
 }
 
 void ProgramGL::setUniform4uiv(GLint location, GLsizei count, const GLuint *v)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniform4uiv(location, count, v);
 }
 
 void ProgramGL::setUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniformMatrix2fv(location, count, transpose, value);
 }
 
 void ProgramGL::setUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniformMatrix3fv(location, count, transpose, value);
 }
 
 void ProgramGL::setUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniformMatrix4fv(location, count, transpose, value);
 }
 
 void ProgramGL::setUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniformMatrix2x3fv(location, count, transpose, value);
 }
 
 void ProgramGL::setUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniformMatrix3x2fv(location, count, transpose, value);
 }
 
 void ProgramGL::setUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniformMatrix2x4fv(location, count, transpose, value);
 }
 
 void ProgramGL::setUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniformMatrix4x2fv(location, count, transpose, value);
 }
 
 void ProgramGL::setUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniformMatrix3x4fv(location, count, transpose, value);
 }
 
 void ProgramGL::setUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    mStateManager->setProgram(mProgramID);
+    mStateManager->useProgram(mProgramID);
     mFunctions->uniformMatrix4x3fv(location, count, transpose, value);
 }
 

src/libANGLE/renderer/gl/StateManagerGL.cpp

diff --git a/src/libANGLE/renderer/gl/StateManagerGL.cpp b/src/libANGLE/renderer/gl/StateManagerGL.cpp
index d2af0cc..4b70697 100644
--- a/src/libANGLE/renderer/gl/StateManagerGL.cpp
+++ b/src/libANGLE/renderer/gl/StateManagerGL.cpp
@@ -20,7 +20,7 @@
     ASSERT(mFunctions);
 }
 
-void StateManagerGL::setProgram(GLuint program)
+void StateManagerGL::useProgram(GLuint program)
 {
     if (mProgram != program)
     {

src/libANGLE/renderer/gl/StateManagerGL.h

diff --git a/src/libANGLE/renderer/gl/StateManagerGL.h b/src/libANGLE/renderer/gl/StateManagerGL.h
index 5b27f93..d143438 100644
--- a/src/libANGLE/renderer/gl/StateManagerGL.h
+++ b/src/libANGLE/renderer/gl/StateManagerGL.h
@@ -22,7 +22,7 @@
   public:
     StateManagerGL(const FunctionsGL *functions);
 
-    void setProgram(GLuint program);
+    void useProgram(GLuint program);
 
   private:
     DISALLOW_COPY_AND_ASSIGN(StateManagerGL);