commit 1e6d566c5f8500e3639a8f8ceebf0226c07efc13
author Chris Craik <ccraik@google.com> Wed May 27 19:22:42 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 27 19:22:44 2015 +0000
tree fa7b1732dad9f013f02a5a8f2a86a63cdd0ce655
parent 06c88b60efd12d3e81c7a9c53d8b995e23d04c5a
parent 5f1356c80a3f0daf436aa4250dcfa8fce3029828

Merge "Fix GL texture binding for TextureViews" into mnc-dev

libs/hwui/renderstate/RenderState.cpp

diff --git a/libs/hwui/renderstate/RenderState.cpp b/libs/hwui/renderstate/RenderState.cpp
index d7c8316..df12e63 100644
--- a/libs/hwui/renderstate/RenderState.cpp
+++ b/libs/hwui/renderstate/RenderState.cpp
@@ -266,10 +266,10 @@
         mCaches->textureState().activateTexture(0);
 
         if (texture.clamp != GL_INVALID_ENUM) {
-            texture.texture->setWrap(texture.clamp, true);
+            texture.texture->setWrap(texture.clamp, true, false, texture.target);
         }
         if (texture.filter != GL_INVALID_ENUM) {
-            texture.texture->setFilter(texture.filter, true);
+            texture.texture->setFilter(texture.filter, true, false, texture.target);
         }
 
         mCaches->textureState().bindTexture(texture.target, texture.texture->id);