summaryrefslogtreecommitdiff
path: root/libs/hwui/FontRenderer.cpp
diff options
context:
space:
mode:
author Chris Craik <ccraik@google.com> 2015-02-03 00:00:57 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-02-03 00:00:58 +0000
commit9dfd7bd520ee598b3033a0c47b8b649bd3988c7c (patch)
tree73de6cf28c9296701cb202addfbf51cea6833d62 /libs/hwui/FontRenderer.cpp
parentd8f32ea2dffd3f6a080b4eb55a11c0f1c6d7a3a6 (diff)
parent6c15ffa196fc9b7724c189d833c3435d8db12266 (diff)
Merge "Refactoring of Program ownership/lifecycle, and WIP Glop rendering path"
Diffstat (limited to 'libs/hwui/FontRenderer.cpp')
-rw-r--r--libs/hwui/FontRenderer.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp
index 6dcd3e1433ce..55b2d196b604 100644
--- a/libs/hwui/FontRenderer.cpp
+++ b/libs/hwui/FontRenderer.cpp
@@ -516,9 +516,8 @@ void FontRenderer::issueDrawCommand(Vector<CacheTexture*>& cacheTextures) {
TextureVertex* mesh = texture->mesh();
MeshState& meshState = renderState.meshState();
- Program* program = caches.currentProgram;
- meshState.bindPositionVertexPointer(program, forceRebind, &mesh[0].x);
- meshState.bindTexCoordsVertexPointer(program, forceRebind, &mesh[0].u);
+ meshState.bindPositionVertexPointer(forceRebind, &mesh[0].x);
+ meshState.bindTexCoordsVertexPointer(forceRebind, &mesh[0].u);
glDrawElements(GL_TRIANGLES, texture->meshElementCount(),
GL_UNSIGNED_SHORT, texture->indices());