summaryrefslogtreecommitdiff
path: root/libs/hwui/OpenGLRenderer.cpp
diff options
context:
space:
mode:
author Chris Craik <ccraik@google.com> 2015-08-19 22:38:03 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-08-19 22:38:03 +0000
commitc725313a77ebb6f9f40e4c57f7e43beeaed60443 (patch)
treebcb95027a1dd8f2cfa00b46dd1dffbb288c7c168 /libs/hwui/OpenGLRenderer.cpp
parent920d8eb505ff8e7646583b516db07eafb1bc86de (diff)
parent7c85c54499994c687a833644f7f213e747fadb98 (diff)
Merge "Remove Matrix4::load(Matrix4&)"
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
-rw-r--r--libs/hwui/OpenGLRenderer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 7a56d42b65e2..e63a579fe2b4 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -1141,7 +1141,7 @@ bool OpenGLRenderer::storeDisplayState(DeferredDisplayState& state, int stateDef
// Transform and alpha always deferred, since they are used by state operations
// (Note: saveLayer/restore use colorFilter and alpha, so we just save restore everything)
- state.mMatrix.load(*currentMatrix);
+ state.mMatrix = *currentMatrix;
state.mAlpha = currentSnapshot()->alpha;
// always store/restore, since these are just pointers