summaryrefslogtreecommitdiff
path: root/libs/hwui/Program.cpp
diff options
context:
space:
mode:
author Chris Craik <ccraik@google.com> 2013-09-17 18:53:14 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-09-17 18:53:14 -0700
commitd97303a73babf8f820a78f72d558be8e4ad09f47 (patch)
tree74cd813f8328e38d1a2ca4961dbc93ed9d2a42f6 /libs/hwui/Program.cpp
parent7cb404dda770da24aaf1b484d6575d5480cf080f (diff)
parentce9ee16d654a42f31d211c60708d7b23f17c1d8e (diff)
am ce9ee16d: Merge "Conservatively estimate geometry bounds" into klp-dev
* commit 'ce9ee16d654a42f31d211c60708d7b23f17c1d8e': Conservatively estimate geometry bounds
Diffstat (limited to 'libs/hwui/Program.cpp')
-rw-r--r--libs/hwui/Program.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/hwui/Program.cpp b/libs/hwui/Program.cpp
index 9e4670e62dcd..7814a01ad929 100644
--- a/libs/hwui/Program.cpp
+++ b/libs/hwui/Program.cpp
@@ -20,6 +20,7 @@
#include <utils/Trace.h>
#include "Program.h"
+#include "Vertex.h"
namespace android {
namespace uirenderer {
@@ -172,7 +173,7 @@ void Program::set(const mat4& projectionMatrix, const mat4& modelViewMatrix,
// up and to the left.
// This offset value is based on an assumption that some hardware may use as
// little as 12.4 precision, so we offset by slightly more than 1/16.
- p.translate(.065, .065);
+ p.translate(Vertex::gGeometryFudgeFactor, Vertex::gGeometryFudgeFactor);
glUniformMatrix4fv(projection, 1, GL_FALSE, &p.data[0]);
}
mProjection = projectionMatrix;