diff options
| author | Dave Airlie <airlied@itt42.(none)> | 2009-11-20 11:48:10 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@itt42.(none)> | 2009-11-20 11:48:10 +1000 |
| commit | 3f2c77659ca552c43f544228f3a5a5fe6365513a (patch) | |
| tree | f98f22ac8a1dbcaa9c457d8f64731c6d4a374cdb /src/mesa/drivers/dri/r300/r300_state.c | |
| parent | b09e74901a4f92299fe3f52f57d27fd5ca5bdd2d (diff) | |
| parent | f8ea5318200c1ed839fc387b16a57c8d9969974b (diff) | |
Merge remote branch 'origin/mesa_7_7_branch'
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_state.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index ac20c08e20..1fd32d497b 100644 --- a/src/mesa/drivers/dri/r300/r300_state.c +++ b/src/mesa/drivers/dri/r300/r300_state.c @@ -1741,7 +1741,8 @@ static void r300Enable(GLcontext * ctx, GLenum cap, GLboolean state) r300SetPolygonOffsetState(ctx, state); break; case GL_SCISSOR_TEST: - radeon_firevertices(&rmesa->radeon); + if (!rmesa->radeon.radeonScreen->kernel_mm) + radeon_firevertices(&rmesa->radeon); rmesa->radeon.state.scissor.enabled = state; radeonUpdateScissor( ctx ); break; |