summaryrefslogtreecommitdiffstats
path: root/libs/hwui/renderstate/RenderState.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libs/hwui/renderstate/RenderState.cpp')
-rw-r--r--libs/hwui/renderstate/RenderState.cpp5
1 files changed, 4 insertions, 1 deletions
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 @@ void RenderState::render(const Glop& glop) {
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 @@ void RenderState::render(const Glop& glop) {
glVertexAttribPointer(alphaSlot, 1, GL_FLOAT, GL_FALSE, kAlphaVertexStride, alphaCoords);
}
+ // Shader uniforms
+ SkiaShader::apply(*mCaches, glop.fill.skiaShaderData);
+
// ------------------------------------
// ---------- GL state setup ----------
// ------------------------------------