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