diff options
| author | José Fonseca <jfonseca@vmware.com> | 2012-01-11 20:54:13 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2012-01-12 12:05:31 +0000 |
| commit | ce2929dde021e5754a3926b77b86b4de3208f4b0 (patch) | |
| tree | 7ab137dc799d671110aa8d9e8d5b1e21a5e4900f | |
| parent | 16b5fda0328abb65f0bf245e28e85b753984e0c3 (diff) | |
svga: Fix user clip planes.
Dirty flags also need to be updated in face of recent interface change.
Fixes regression in compiz.
Reviewed-by: Brian Paul <brianp@vmware.com>
| -rw-r--r-- | src/gallium/drivers/svga/svga_state_framebuffer.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_state_rss.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/gallium/drivers/svga/svga_state_framebuffer.c b/src/gallium/drivers/svga/svga_state_framebuffer.c index f3625e0de30..3244023f3ad 100644 --- a/src/gallium/drivers/svga/svga_state_framebuffer.c +++ b/src/gallium/drivers/svga/svga_state_framebuffer.c @@ -477,7 +477,7 @@ emit_clip_planes( struct svga_context *svga, /* TODO: just emit directly from svga_set_clip_state()? */ - for (i = 0; i < 6; i++) { + for (i = 0; i < SVGA3D_MAX_CLIP_PLANES; i++) { /* need to express the plane in D3D-style coordinate space. * GL coords get converted to D3D coords with the matrix: * [ 1 0 0 0 ] diff --git a/src/gallium/drivers/svga/svga_state_rss.c b/src/gallium/drivers/svga/svga_state_rss.c index d94ac35c644..af68d9cde3d 100644 --- a/src/gallium/drivers/svga/svga_state_rss.c +++ b/src/gallium/drivers/svga/svga_state_rss.c @@ -244,8 +244,8 @@ static int emit_rss( struct svga_context *svga, EMIT_RS_FLOAT( svga, bias, DEPTHBIAS, fail ); } - if (dirty & SVGA_NEW_CLIP) { - /* the number of clip planes is how many planes to enable */ + if (dirty & SVGA_NEW_RAST) { + /* bitmask of the enabled clip planes */ unsigned enabled = svga->curr.rast->templ.clip_plane_enable; EMIT_RS( svga, enabled, CLIPPLANEENABLE, fail ); } @@ -285,7 +285,6 @@ struct svga_tracked_state svga_hw_rss = (SVGA_NEW_BLEND | SVGA_NEW_BLEND_COLOR | - SVGA_NEW_CLIP | SVGA_NEW_DEPTH_STENCIL | SVGA_NEW_STENCIL_REF | SVGA_NEW_RAST | |