summaryrefslogtreecommitdiffstats
path: root/libs/hwui/OpenGLRenderer.cpp
diff options
context:
space:
mode:
authorTom Hudson <tomhudson@google.com>2015-07-10 12:35:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-10 12:35:12 +0000
commit9613e9b76410b15b7f2700080a17476bf9f3461c (patch)
tree35f0b8e04e59ffe2b2463d41f5b9f8d1146a91f6 /libs/hwui/OpenGLRenderer.cpp
parent0236e6b2d614abd11678de4cec4ed67b582541ff (diff)
parentac7b6d33d23cb0baaf61c723346198d41f012035 (diff)
downloadframeworks_base-9613e9b76410b15b7f2700080a17476bf9f3461c.zip
frameworks_base-9613e9b76410b15b7f2700080a17476bf9f3461c.tar.gz
frameworks_base-9613e9b76410b15b7f2700080a17476bf9f3461c.tar.bz2
Merge "New setLocalMatrix() operation for HWUI" into mnc-dev
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
-rw-r--r--libs/hwui/OpenGLRenderer.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index ed2a4db..2292ef4 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -2148,6 +2148,7 @@ void OpenGLRenderer::restoreToCount(int saveCount) {
mState.restoreToCount(saveCount);
}
+
void OpenGLRenderer::translate(float dx, float dy, float dz) {
mState.translate(dx, dy, dz);
}
@@ -2168,6 +2169,11 @@ void OpenGLRenderer::setMatrix(const Matrix4& matrix) {
mState.setMatrix(matrix);
}
+void OpenGLRenderer::setLocalMatrix(const SkMatrix& matrix) {
+ mState.setMatrix(mBaseTransform);
+ mState.concatMatrix(matrix);
+}
+
void OpenGLRenderer::concatMatrix(const Matrix4& matrix) {
mState.concatMatrix(matrix);
}