summaryrefslogtreecommitdiff
path: root/libs/hwui/FontRenderer.cpp
diff options
context:
space:
mode:
author Chris Craik <ccraik@google.com> 2013-11-15 16:06:56 -0800
committer Chris Craik <ccraik@google.com> 2013-11-18 12:51:08 -0800
commit4063a0e03ba2e354cc6d19c0ffc073fd5b8aa2ca (patch)
tree03565a41497ef69a96765fa7e8e192db4c674952 /libs/hwui/FontRenderer.cpp
parent431b4359e4be6426aaa30ae7b6552f4310d4d9d6 (diff)
Clean up modelView matrix logic
bug:11359533 Also changes shader matrix to correctly account for modelView and currentTransform() Change-Id: I6ce18857dc6d08ea08ca7535385c2ad351ec3caa
Diffstat (limited to 'libs/hwui/FontRenderer.cpp')
-rw-r--r--libs/hwui/FontRenderer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp
index 67835a476a15..48613fe95706 100644
--- a/libs/hwui/FontRenderer.cpp
+++ b/libs/hwui/FontRenderer.cpp
@@ -76,7 +76,8 @@ status_t TextSetupFunctor::operator ()(int what, void* data) {
renderer->setupDrawShader();
renderer->setupDrawBlending(true, mode);
renderer->setupDrawProgram();
- renderer->setupDrawModelView(x, y, x, y, pureTranslate, true);
+ renderer->setupDrawModelView(kModelViewMode_Translate, false,
+ 0.0f, 0.0f, 0.0f, 0.0f, pureTranslate);
// Calling setupDrawTexture with the name 0 will enable the
// uv attributes and increase the texture unit count
// texture binding will be performed by the font renderer as