summaryrefslogtreecommitdiff
path: root/libs/hwui/OpenGLRenderer.cpp
diff options
context:
space:
mode:
author Tom Hudson <tomhudson@google.com> 2015-07-10 13:22:39 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-10 13:22:39 +0000
commita5e2946f5ab7618997fb317ad9f5f56c160ebee5 (patch)
tree88dfd248392e0ac914706ba1893e1ca518276a9c /libs/hwui/OpenGLRenderer.cpp
parentcc72e69ec07e02157d0d946995a1fd1ec48c9279 (diff)
parentb9d7bba5c5453f894608971fed44aed023dcd6ba (diff)
am b9d7bba5: am 434b577f: am 8ac76504: am 9613e9b7: Merge "New setLocalMatrix() operation for HWUI" into mnc-dev
* commit 'b9d7bba5c5453f894608971fed44aed023dcd6ba': New setLocalMatrix() operation for HWUI
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 ed2a4db9ea05..2292ef415cfc 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);
}