Mesa (master): radeon: fix scissors harder.

[Dave Airlie]

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

Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Aug 28 11:01:38 2009 +1000

radeon: fix scissors harder.

this makes gnome-shell work on r300 for me

---

 src/mesa/drivers/dri/r200/r200_state.c     |    4 ++--
 src/mesa/drivers/dri/r300/r300_cmdbuf.c    |    4 ++--
 src/mesa/drivers/dri/radeon/radeon_ioctl.c |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c
index 250b435..f56da90 100644
--- a/src/mesa/drivers/dri/r200/r200_state.c
+++ b/src/mesa/drivers/dri/r200/r200_state.c
@@ -1661,8 +1661,8 @@ void r200_vtbl_update_scissor( GLcontext *ctx )
    if (r200->radeon.state.scissor.enabled) {
       x1 = r200->radeon.state.scissor.rect.x1;
       y1 = r200->radeon.state.scissor.rect.y1;
-      x2 = r200->radeon.state.scissor.rect.x2 - 1;
-      y2 = r200->radeon.state.scissor.rect.y2 - 1;
+      x2 = r200->radeon.state.scissor.rect.x2;
+      y2 = r200->radeon.state.scissor.rect.y2;
    } else {
       rrb = radeon_get_colorbuffer(&r200->radeon);
       x1 = 0;
diff --git a/src/mesa/drivers/dri/r300/r300_cmdbuf.c b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
index 40e5e0b..e1047be 100644
--- a/src/mesa/drivers/dri/r300/r300_cmdbuf.c
+++ b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
@@ -226,8 +226,8 @@ void r300_emit_scissor(GLcontext *ctx)
     if (r300->radeon.state.scissor.enabled) {
         x1 = r300->radeon.state.scissor.rect.x1;
         y1 = r300->radeon.state.scissor.rect.y1;
-        x2 = r300->radeon.state.scissor.rect.x2 - 1;
-        y2 = r300->radeon.state.scissor.rect.y2 - 1;
+        x2 = r300->radeon.state.scissor.rect.x2;
+        y2 = r300->radeon.state.scissor.rect.y2;
     } else {
         x1 = 0;
         y1 = 0;
diff --git a/src/mesa/drivers/dri/radeon/radeon_ioctl.c b/src/mesa/drivers/dri/radeon/radeon_ioctl.c
index 1bda9cb..9ced624 100644
--- a/src/mesa/drivers/dri/radeon/radeon_ioctl.c
+++ b/src/mesa/drivers/dri/radeon/radeon_ioctl.c
@@ -127,8 +127,8 @@ static void radeonEmitScissor(r100ContextPtr rmesa)
         OUT_BATCH((rmesa->radeon.state.scissor.rect.y1 << 16) |
                   rmesa->radeon.state.scissor.rect.x1);
         OUT_BATCH(CP_PACKET0(RADEON_RE_WIDTH_HEIGHT, 0));
-        OUT_BATCH(((rmesa->radeon.state.scissor.rect.y2 - 1) << 16) |
-                  (rmesa->radeon.state.scissor.rect.x2 - 1));
+        OUT_BATCH(((rmesa->radeon.state.scissor.rect.y2) << 16) |
+                  (rmesa->radeon.state.scissor.rect.x2));
         END_BATCH();
     } else {
         BEGIN_BATCH(2);