commit f898990d682b639d7093dc837c6da3e70242d02b
author Jamie Madill <jmadill@transgaming.com> Fri Jul 19 16:36:58 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:08:16 2013 -0400
tree 452930f0b84f22ebbac01911b3299e8b5a1e83a7
parent 07edd4486cd890393fe5cd4b4644f23e2fd2da7d

Pass a SamplerState as a parameter to Texture::isSamplerComplete, instead of using the internal SamplerState.

TRAC #23453

Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods
Authored-by: Jamie Madill

src/libGLESv2/Context.cpp

diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index b1e51e0..b6072f7 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -2241,10 +2241,11 @@
             TextureType textureType = programBinary->getSamplerTextureType(type, samplerIndex);
             Texture *texture = getSamplerTexture(textureUnit, textureType);
 
-            if (texture->isSamplerComplete())
+            SamplerState samplerState;
+            texture->getSamplerState(&samplerState);
+
+            if (texture->isSamplerComplete(samplerState))
             {
-                SamplerState samplerState;
-                texture->getSamplerState(&samplerState);
                 mRenderer->setSamplerState(type, samplerIndex, samplerState);
 
                 mRenderer->setTexture(type, samplerIndex, texture);