commit a85f6f13c69e8873a27a1b8fa149a089d3bf1b71
author Jamie Madill <jmadill@transgaming.com> Fri Jul 19 16:36:59 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:08:16 2013 -0400
tree 77b0e43967c9c37af4010ddfb10ea6b0cab2beff
parent f898990d682b639d7093dc837c6da3e70242d02b

Use the currently bound sampler object combined with the internal texture state to determine the
current filtering and address modes at draw time.

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 b6072f7..3525e89 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -2244,6 +2244,12 @@
             SamplerState samplerState;
             texture->getSamplerState(&samplerState);
 
+            if (mState.samplers[textureUnit] != 0)
+            {
+                Sampler *samplerObject = getSampler(mState.samplers[textureUnit]);
+                samplerObject->getState(&samplerState);
+            }
+
             if (texture->isSamplerComplete(samplerState))
             {
                 mRenderer->setSamplerState(type, samplerIndex, samplerState);