Merge "Correctly adjust clip regions that lie offscreen" into jb-mr1-dev

2012-10-17 07:51:45 -07:00
parent 91ffeddb8b aa42c9af6e
commit be29d82f74
1 changed files with 14 additions and 3 deletions
--- a/libs/hwui/Caches.cpp
+++ b/libs/hwui/Caches.cpp
@@ -399,9 +399,20 @@ bool Caches::setScissor(GLint x, GLint y, GLint width, GLint height) {
    if (scissorEnabled && (x != mScissorX || y != mScissorY ||
            width != mScissorWidth || height != mScissorHeight)) {

-        if (x < 0) x = 0;
-        if (y < 0) y = 0;
-
+        if (x < 0) {
+            width += x;
+            x = 0;
+        }
+        if (y < 0) {
+            height += y;
+            y = 0;
+        }
+        if (width < 0) {
+            width = 0;
+        }
+        if (height < 0) {
+            height = 0;
+        }
        glScissor(x, y, width, height);

        mScissorX = x;