commit 922d3a7f6f8c1c05a996ee3e91e8cbadfff560c9
author Chris Craik <ccraik@google.com> Fri Feb 13 17:47:21 2015 -0800
committer Chris Craik <ccraik@google.com> Tue Feb 17 15:45:46 2015 -0800
tree 9b8acab9755321ae0e7564d2250f2106117412cb
parent 91d415d863de73430af100ebd1b4f5b3b795e8d1

Glop SkiaShader support

Change-Id: I894a0b62701bd02367ab970813e4c332147351a2

libs/hwui/renderstate/RenderState.cpp

diff --git a/libs/hwui/renderstate/RenderState.cpp b/libs/hwui/renderstate/RenderState.cpp
index e35327b..b64dbdc 100644
--- a/libs/hwui/renderstate/RenderState.cpp
+++ b/libs/hwui/renderstate/RenderState.cpp
@@ -266,7 +266,7 @@
     meshState().bindIndicesBufferInternal(mesh.indexBufferObject);
 
     if (mesh.vertexFlags & kTextureCoord_Attrib) {
-        // TODO: to support shaders, increment texture unit
+        // glop.fill.texture always takes slot 0, shader samplers increment from there
         mCaches->textureState().activateTexture(0);
 
         if (glop.fill.textureClamp != GL_INVALID_ENUM) {
@@ -294,6 +294,9 @@
         glVertexAttribPointer(alphaSlot, 1, GL_FLOAT, GL_FALSE, kAlphaVertexStride, alphaCoords);
     }
 
+    // Shader uniforms
+    SkiaShader::apply(*mCaches, glop.fill.skiaShaderData);
+
     // ------------------------------------
     // ---------- GL state setup ----------
     // ------------------------------------