diff options
author | Chris Craik <ccraik@google.com> | 2015-09-28 15:52:12 -0700 |
---|---|---|
committer | Chris Craik <ccraik@google.com> | 2015-09-28 15:52:14 -0700 |
commit | 12efe649d3f5df8e81f4b78179939c1d488673a0 (patch) | |
tree | 00f0987c020b6ebef7e9016c624e216b60d8460e /libs/hwui/renderstate/RenderState.cpp | |
parent | a5940f8dca13152ffc091f4318705c8f071bac2c (diff) |
Move ortho matrix out of glop
It's fbo-global, so don't bother stashing/restoring it repeatedly.
Change-Id: Icb32e3eda5d2086aaae07140f8ff40e038dad5fe
Diffstat (limited to 'libs/hwui/renderstate/RenderState.cpp')
-rw-r--r-- | libs/hwui/renderstate/RenderState.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/renderstate/RenderState.cpp b/libs/hwui/renderstate/RenderState.cpp index c5126def683c..dfa70ace2f44 100644 --- a/libs/hwui/renderstate/RenderState.cpp +++ b/libs/hwui/renderstate/RenderState.cpp @@ -208,7 +208,7 @@ void RenderState::postDecStrong(VirtualLightRefBase* object) { // Render /////////////////////////////////////////////////////////////////////////////// -void RenderState::render(const Glop& glop) { +void RenderState::render(const Glop& glop, const Matrix4& orthoMatrix) { const Glop::Mesh& mesh = glop.mesh; const Glop::Mesh::Vertices& vertices = mesh.vertices; const Glop::Mesh::Indices& indices = mesh.indices; @@ -223,7 +223,7 @@ void RenderState::render(const Glop& glop) { fill.program->setColor(fill.color); } - fill.program->set(glop.transform.ortho, + fill.program->set(orthoMatrix, glop.transform.modelView, glop.transform.meshTransform(), glop.transform.transformFlags & TransformFlags::OffsetByFudgeFactor); |