Mesa (master): r300g: fix zero-area scissor

Corbin Simpson csimpson at kemper.freedesktop.org
Mon Jan 25 07:04:14 UTC 2010


Module: Mesa
Branch: master
Commit: 9f8ec533123f07f29b084e8a46fc35c498b3a670
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9f8ec533123f07f29b084e8a46fc35c498b3a670

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Jan 17 23:13:51 2010 +0100

r300g: fix zero-area scissor

---

 src/gallium/drivers/r300/r300_emit.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c
index e07185b..36d2c64 100644
--- a/src/gallium/drivers/r300/r300_emit.c
+++ b/src/gallium/drivers/r300/r300_emit.c
@@ -686,6 +686,22 @@ void r300_emit_scissor_state(struct r300_context* r300, void* state)
         maxy = MIN2(maxy, scissor->maxy);
     }
 
+    /* Special case for zero-area scissor.
+     *
+     * We can't allow the variables maxx and maxy to be zero because they are
+     * subtracted from later in the code, which would cause emitting ~0 and
+     * making the kernel checker angry.
+     *
+     * Let's consider we change maxx and maxy to 1, which is effectively
+     * a one-pixel area. We must then change minx and miny to a number which is
+     * greater than 1 to get the zero area back. */
+    if (!maxx || !maxy) {
+        minx = 2;
+        miny = 2;
+        maxx = 1;
+        maxy = 1;
+    }
+
     if (r300screen->caps->is_r500) {
         top_left =
             (minx << R300_SCISSORS_X_SHIFT) |




More information about the mesa-commit mailing list