minor changes to fix accum and scissor test failures

1 files changed, 4 insertions, 3 deletions

diff --git a/xc/lib/GL/mesa/src/drv/radeon/radeon_state.c b/xc/lib/GL/mesa/src/drv/radeon/radeon_state.c
index 44506628f..27cbbe5bb 100644
--- a/xc/lib/GL/mesa/src/drv/radeon/radeon_state.c
+++ b/xc/lib/GL/mesa/src/drv/radeon/radeon_state.c
@@ -383,8 +383,8 @@ static void radeonUpdateClipping( GLcontext *ctx )
 
       rmesa->scissor_rect.x1 = x + rmesa->driDrawable->x;
       rmesa->scissor_rect.y1 = y + rmesa->driDrawable->y;
-      rmesa->scissor_rect.x2 = w + rmesa->driDrawable->x;
-      rmesa->scissor_rect.y2 = h + rmesa->driDrawable->y;
+      rmesa->scissor_rect.x2 = w + rmesa->driDrawable->x + 1;
+      rmesa->scissor_rect.y2 = h + rmesa->driDrawable->y + 1;
 
       rmesa->dirty |= RADEON_UPLOAD_CLIPRECTS;
    }
@@ -488,7 +488,8 @@ static GLboolean radeonDDColorMask( GLcontext *ctx,
    FLUSH_BATCH( rmesa );
    rmesa->new_state |= RADEON_NEW_MASKS;
 
-   return GL_TRUE;
+   return GL_FALSE; /* This forces the software paths to do colormasking. */
+                    /* This function will return void when we use Mesa 3.5 */
 }