diff options
| author | Dave Airlie <[email protected]> | 2009-08-28 11:01:38 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2009-08-28 11:02:32 +1000 |
| commit | d0cb1036aa98d35ae5233d326fbb0ba592a26e26 (patch) | |
| tree | 621bf0766ef5e3c5ea26d2e2caebbc2a4fb70dc1 /src | |
| parent | 60b072d49fd2a1b2bf59442ae7209379152b1500 (diff) | |
radeon: fix scissors harder.
this makes gnome-shell work on r300 for me
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_state.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_cmdbuf.c | 4 | ||||
| -rw-r--r-- | 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 250b4358c9c..f56da9082a5 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 40e5e0ba2f7..e1047beb6e4 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 1bda9cbe09c..9ced62418bd 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); |