diff options
author | 2014-07-29 12:50:14 -0700 | |
---|---|---|
committer | 2014-07-30 17:15:50 +0000 | |
commit | af4d04cab6d48ae0d6a5e79bd30f679af87abaad (patch) | |
tree | b1fe9d83f5ccc32b1e0db8f002d2d3035368dfac /libs/hwui/OpenGLRenderer.cpp | |
parent | 3d1856f4449f02a9a3bda06738c3eb83df96f88b (diff) |
Use RoundRect clipping for circle reveal animation
bug:16630975
Also, remove inverse clipping feature from reveal animator.
Change-Id: I770a4eb48cd123b0ca0f39d16a0f3eefd1be3653
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
-rwxr-xr-x | libs/hwui/OpenGLRenderer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index de777f0f538d..5e6ae3fb6031 100755 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -1742,12 +1742,12 @@ void OpenGLRenderer::setupDrawProgram() { if (mDescription.hasRoundRectClip) { // TODO: avoid doing this repeatedly, stashing state pointer in program const RoundRectClipState* state = mSnapshot->roundRectClipState; - const Rect& innerRect = state->outlineInnerRect; + const Rect& innerRect = state->innerRect; glUniform4f(mCaches.currentProgram->getUniform("roundRectInnerRectLTRB"), - innerRect.left, innerRect.top, - innerRect.right, innerRect.bottom); + innerRect.left, innerRect.top, + innerRect.right, innerRect.bottom); glUniform1f(mCaches.currentProgram->getUniform("roundRectRadius"), - state->outlineRadius); + state->radius); glUniformMatrix4fv(mCaches.currentProgram->getUniform("roundRectInvTransform"), 1, GL_FALSE, &state->matrix.data[0]); } |