commit 2ec386bbec5918114a11e6fa574a353c954c1017
author Geoff Lang <geofflang@chromium.org> Wed Dec 03 14:44:38 2014 -0500
committer Geoff Lang <geofflang@chromium.org> Wed Dec 03 20:15:00 2014 +0000
tree 36b25f2cce9a2dc8e271bb75343f11ff3121a7d0
parent 597235416e1ab2196eb166ad1db6e9d71d8bb615

Rename IsSampler to IsSamplerType.

BUG=angle:733

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

src/libANGLE/renderer/d3d/ProgramD3D.cpp

diff --git a/src/libANGLE/renderer/d3d/ProgramD3D.cpp b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
index 6b94b7a..844aa16 100644
--- a/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+++ b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
@@ -277,7 +277,7 @@
 
         if (targetUniform->dirty)
         {
-            if (gl::IsSampler(targetUniform->type))
+            if (gl::IsSamplerType(targetUniform->type))
             {
                 int count = targetUniform->elementCount();
                 GLint (*v)[4] = reinterpret_cast<GLint(*)[4]>(targetUniform->data);
@@ -1052,7 +1052,7 @@
     {
         const gl::LinkedUniform &uniform = *mUniforms[uniformIndex];
 
-        if (!gl::IsSampler(uniform.type))
+        if (!gl::IsSamplerType(uniform.type))
         {
             if (uniform.isReferencedByVertexShader())
             {
@@ -1498,7 +1498,7 @@
             }
         }
     }
-    else if (gl::IsSampler(targetUniform->type))
+    else if (gl::IsSamplerType(targetUniform->type))
     {
         ASSERT(targetUniformType == GL_INT);
 
@@ -1834,7 +1834,7 @@
 
 bool ProgramD3D::indexSamplerUniform(const gl::LinkedUniform &uniform, gl::InfoLog &infoLog, const gl::Caps &caps)
 {
-    ASSERT(gl::IsSampler(uniform.type));
+    ASSERT(gl::IsSamplerType(uniform.type));
     ASSERT(uniform.vsRegisterIndex != GL_INVALID_INDEX || uniform.psRegisterIndex != GL_INVALID_INDEX);
 
     if (uniform.vsRegisterIndex != GL_INVALID_INDEX)
@@ -1884,7 +1884,7 @@
     {
         const gl::LinkedUniform &uniform = *mUniforms[uniformIndex];
 
-        if (gl::IsSampler(uniform.type))
+        if (gl::IsSamplerType(uniform.type))
         {
             if (!indexSamplerUniform(uniform, infoLog, caps))
             {