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);

src/libGLESv2/Sampler.cpp

diff --git a/src/libGLESv2/Sampler.cpp b/src/libGLESv2/Sampler.cpp
index 65a113e..4e3f231 100644
--- a/src/libGLESv2/Sampler.cpp
+++ b/src/libGLESv2/Sampler.cpp
@@ -9,6 +9,7 @@
 // sampler object. Sampler objects store some state needed to sample textures.
 
 #include "libGLESv2/Sampler.h"
+#include "libGLESv2/angletypes.h"
 
 namespace gl
 {
@@ -27,4 +28,15 @@
 {
 }
 
+void Sampler::getState(SamplerState *samplerState) const
+{
+    samplerState->minFilter = mMinFilter;
+    samplerState->magFilter = mMagFilter;
+    samplerState->wrapS     = mWrapS;
+    samplerState->wrapT     = mWrapT;
+    samplerState->wrapR     = mWrapR;
+
+    // TODO: comparison mode/func, min/max LOD
+}
+
 }

src/libGLESv2/Sampler.h

diff --git a/src/libGLESv2/Sampler.h b/src/libGLESv2/Sampler.h
index 5d1b4c1..6be5a1e 100644
--- a/src/libGLESv2/Sampler.h
+++ b/src/libGLESv2/Sampler.h
@@ -14,6 +14,7 @@
 
 namespace gl
 {
+struct SamplerState;
 
 class Sampler : public RefCountObject
 {
@@ -30,6 +31,8 @@
     void setComparisonMode(GLenum comparisonMode) { mComparisonMode = comparisonMode; }
     void setComparisonFunc(GLenum comparisonFunc) { mComparisonFunc = comparisonFunc; }
 
+    void getState(SamplerState *samplerState) const;
+
   private:
     GLenum mMinFilter;
     GLenum mMagFilter;