commit c6a2dcf807551c27ea6df61dc4e4d1d36fa76b8c
author Jamie Madill <jmadill@chromium.org> Thu Oct 31 13:54:01 2013 -0400
committer Jamie Madill <jmadill@chromium.org> Thu Oct 31 13:54:01 2013 -0400
tree fa6ff8f1dc33673fc23d3e54e0259a6676cf13fb
parent f07558ac8c3b30950cbd899d72da56692d2725f1

Fix improper getSamplerState in Context::applyTextures.

Introduced in cdf22f94acaf86.

R=geofflang@chromium.org
BUG=

Review URL: https://codereview.appspot.com/20320043

src/libGLESv2/Context.cpp

diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index 0260110..d50595d 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -2392,8 +2392,8 @@
             SamplerState samplerState;
             texture->getSamplerState(&samplerState);
 
-            if (texture->isSamplerComplete(samplerState) &&
-                boundFramebufferTextures.find(texture->getTextureSerial()) == boundFramebufferTextures.end())
+            if ((mState.samplers[textureUnit] != 0) &&
+                (boundFramebufferTextures.find(texture->getTextureSerial()) == boundFramebufferTextures.end()))
             {
                 Sampler *samplerObject = getSampler(mState.samplers[textureUnit]);
                 samplerObject->getState(&samplerState);