diff options
| author | Chris Craik <ccraik@google.com> | 2015-02-05 00:25:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-05 00:25:04 +0000 |
| commit | ecad24b49d20f7fb4b75950e9444787967acd347 (patch) | |
| tree | 74c55efb6736b3b142a299f2c1feae32abf06b7a /libs/hwui/renderstate/RenderState.cpp | |
| parent | e8d05b5bab49f2becb1762b70275d3914de23be2 (diff) | |
| parent | 031888744e24b5c7243ac99ec98b78aff5db1c78 (diff) | |
| download | frameworks_base-ecad24b49d20f7fb4b75950e9444787967acd347.zip frameworks_base-ecad24b49d20f7fb4b75950e9444787967acd347.tar.gz frameworks_base-ecad24b49d20f7fb4b75950e9444787967acd347.tar.bz2 | |
Merge "GlopBuilder, and test app refactor"
Diffstat (limited to 'libs/hwui/renderstate/RenderState.cpp')
| -rw-r--r-- | libs/hwui/renderstate/RenderState.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libs/hwui/renderstate/RenderState.cpp b/libs/hwui/renderstate/RenderState.cpp index 5e02844..0cb3ddb 100644 --- a/libs/hwui/renderstate/RenderState.cpp +++ b/libs/hwui/renderstate/RenderState.cpp @@ -219,7 +219,7 @@ void RenderState::render(const Glop& glop) { mCaches->setProgram(shader.program); Glop::Fill::Color color = shader.color; - shader.program->setColor(color.a, color.r, color.g, color.b); + shader.program->setColor(color.r, color.g, color.b, color.a); shader.program->set(glop.transform.ortho, glop.transform.modelView, @@ -261,14 +261,13 @@ void RenderState::render(const Glop& glop) { meshState().bindIndicesBufferInternal(mesh.indexBufferObject); // ---------- GL state setup ---------- + blend().setFactors(glop.blend.src, glop.blend.dst); - if (glop.blend.mode != Glop::Blend::kDisable) { - blend().enable(glop.blend.mode, glop.blend.swapSrcDst); + if (mesh.indexBufferObject) { + glDrawElements(glop.mesh.primitiveMode, glop.mesh.vertexCount, GL_UNSIGNED_BYTE, nullptr); } else { - blend().disable(); + glDrawArrays(GL_TRIANGLE_STRIP, 0, glop.mesh.vertexCount); } - - glDrawElements(glop.mesh.primitiveMode, glop.mesh.vertexCount, GL_UNSIGNED_BYTE, nullptr); } } /* namespace uirenderer */ |