Merge branch 'mesa_7_6_branch'

diff --git a/src/mesa/drivers/dri/r600/r700_state.c b/src/mesa/drivers/dri/r600/r700_state.c
index 1043eabb149132de031d875ce28cab471ea79d61..fbff109455dda17dd1f12e705c6586431bad4868 100644 (file)
--- a/src/mesa/drivers/dri/r600/r700_state.c
+++ b/src/mesa/drivers/dri/r600/r700_state.c
@@ -1295,10 +1295,11 @@ void r700SetScissor(context_t *context) //---------------
                return;
        }
        if (context->radeon.state.scissor.enabled) {
+               /* r600 has exclusive scissors */
                x1 = context->radeon.state.scissor.rect.x1;
                y1 = context->radeon.state.scissor.rect.y1;
-               x2 = context->radeon.state.scissor.rect.x2;
-               y2 = context->radeon.state.scissor.rect.y2;
+               x2 = context->radeon.state.scissor.rect.x2 + 1;
+               y2 = context->radeon.state.scissor.rect.y2 + 1;
        } else {
                if (context->radeon.radeonScreen->driScreen->dri2.enabled) {
                        x1 = 0;

diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c
index 264392b3270acbe1e4c9a293b03e86cc383fe6f0..f8a4cdb4954f1f5a4b9f56370c422597423e8cd2 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_common.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common.c
@@ -232,13 +232,13 @@ void radeonUpdateScissor( GLcontext *ctx )
 
           __DRIdrawablePrivate *dPriv = radeon_get_drawable(rmesa);
           x1 += dPriv->x;
-          x2 += dPriv->x + 1;
+          x2 += dPriv->x;
           min_x += dPriv->x;
-          max_x += dPriv->x + 1;
+          max_x += dPriv->x;
           y1 += dPriv->y;
-          y2 += dPriv->y + 1;
+          y2 += dPriv->y;
           min_y += dPriv->y;
-          max_y += dPriv->y + 1;
+          max_y += dPriv->y;
        }
 
        rmesa->state.scissor.rect.x1 = CLAMP(x1,  min_x, max_x);