commit 30036092b40badecbe64d9c2bff4850132147f78
author Chris Craik <ccraik@google.com> Thu Feb 12 10:41:39 2015 -0800
committer Chris Craik <ccraik@google.com> Thu Feb 12 16:16:57 2015 -0800
tree ea5a86b5bd90dd3c2fd0c16ce7676cdf2fcd678a
parent 5b14d9893aced2b3ba46f1d90a0752c1a9a43f2f

Glop path texture support

Change-Id: I505eb05991ca4c9b2e01e49988b8f962fad51462

libs/hwui/renderstate/RenderState.cpp

diff --git a/libs/hwui/renderstate/RenderState.cpp b/libs/hwui/renderstate/RenderState.cpp
index 3953ecd..e35327b 100644
--- a/libs/hwui/renderstate/RenderState.cpp
+++ b/libs/hwui/renderstate/RenderState.cpp
@@ -269,8 +269,12 @@
         // TODO: to support shaders, increment texture unit
         mCaches->textureState().activateTexture(0);
 
-        glop.fill.texture->setWrap(GL_CLAMP_TO_EDGE, true);
-        glop.fill.texture->setFilter(glop.fill.textureFilter, true);
+        if (glop.fill.textureClamp != GL_INVALID_ENUM) {
+            glop.fill.texture->setWrap(glop.fill.textureClamp, true);
+        }
+        if (glop.fill.textureFilter != GL_INVALID_ENUM) {
+            glop.fill.texture->setFilter(glop.fill.textureFilter, true);
+        }
 
         mCaches->textureState().bindTexture(fill.texture->id);
         meshState().enableTexCoordsVertexArray();