diff options
| author | Brian Paul <brianp@vmware.com> | 2009-10-10 09:25:34 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-10-10 09:25:34 -0600 |
| commit | 57e3eb1b178e861dee7695c9a5e1c71a4333192d (patch) | |
| tree | 9e4e6fc113820d1754f0955ce3f768d8d1ca1eec /src/mesa/drivers/dri/r600 | |
| parent | 39daa763b59cc80d862709e99ee3619bd0f7a14d (diff) | |
| parent | 768481ed40cb7530fdbadbf4d6dc00b74209adf1 (diff) | |
Merge branch 'mesa_7_6_branch'
Diffstat (limited to 'src/mesa/drivers/dri/r600')
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_state.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r600/r700_state.c b/src/mesa/drivers/dri/r600/r700_state.c index 7e8b48f91e..3d3c8b958f 100644 --- a/src/mesa/drivers/dri/r600/r700_state.c +++ b/src/mesa/drivers/dri/r600/r700_state.c @@ -1295,11 +1295,15 @@ 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 + 1; - y2 = context->radeon.state.scissor.rect.y2 + 1; + x2 = context->radeon.state.scissor.rect.x2; + y2 = context->radeon.state.scissor.rect.y2; + /* r600 has exclusive BR scissors */ + if (context->radeon.radeonScreen->kernel_mm) { + x2++; + y2++; + } } else { if (context->radeon.radeonScreen->driScreen->dri2.enabled) { x1 = 0; |