diff options
| author | Romain Guy <romainguy@google.com> | 2013-02-04 14:00:44 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-04 14:00:44 -0800 |
| commit | 43c6eda4d3535e7601e586a75206b20e42209ae2 (patch) | |
| tree | d4600cfd2a934d27419561430dc7369d5f3057b0 /libs | |
| parent | d4cf7df151c68e621fbc3e1552e5f33020bc7b6d (diff) | |
| parent | b377853123ff53974bb06ffc30e09db41a767c3a (diff) | |
| download | frameworks_base-43c6eda4d3535e7601e586a75206b20e42209ae2.zip frameworks_base-43c6eda4d3535e7601e586a75206b20e42209ae2.tar.gz frameworks_base-43c6eda4d3535e7601e586a75206b20e42209ae2.tar.bz2 | |
am b3778531: Merge "Set the scissor from OpenGLRenderer::drawColorRects Bug #8131254"
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit 'b377853123ff53974bb06ffc30e09db41a767c3a':
Set the scissor from OpenGLRenderer::drawColorRects Bug #8131254
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 6a05789..45569ac 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -3241,7 +3241,9 @@ status_t OpenGLRenderer::drawColorRects(const float* rects, int count, int color } } - if (count == 0) return DrawGlInfo::kStatusDone; + if (count == 0 || quickReject(left, top, right, bottom)) { + return DrawGlInfo::kStatusDone; + } setupDraw(); setupDrawNoTexture(); |