summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/r300
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@vmware.com>2009-12-02 14:56:56 +0100
committerJakob Bornecrantz <jakob@vmware.com>2009-12-02 14:56:56 +0100
commitcc8a537c57a62a196106b592e510e4c93bd1826e (patch)
tree626155e23277d9660c0a1787a94b63d969e93c6d /src/mesa/drivers/dri/r300
parent7fc75ef7d43038385b5fba73a67f1e4783b045d6 (diff)
parent0c75854cc1650dc870e042aa66a053e70b3d4556 (diff)
Merge branch 'mesa_7_7_branch'
Diffstat (limited to 'src/mesa/drivers/dri/r300')
-rw-r--r--src/mesa/drivers/dri/r300/r300_state.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 1fd32d497b..ac20c08e20 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1741,8 +1741,7 @@ static void r300Enable(GLcontext * ctx, GLenum cap, GLboolean state)
r300SetPolygonOffsetState(ctx, state);
break;
case GL_SCISSOR_TEST:
- if (!rmesa->radeon.radeonScreen->kernel_mm)
- radeon_firevertices(&rmesa->radeon);
+ radeon_firevertices(&rmesa->radeon);
rmesa->radeon.state.scissor.enabled = state;
radeonUpdateScissor( ctx );
break;