diff options
author | Corbin Simpson <[email protected]> | 2010-01-10 22:32:58 -0800 |
---|---|---|
committer | Corbin Simpson <[email protected]> | 2010-01-10 23:15:05 -0800 |
commit | 8ca491386d0fb9e675e7dfbdd05bc09af74d75d3 (patch) | |
tree | 8a1149b71c2ca4e359435e4c38f6151ff9554a32 /src/gallium/drivers/r300/r300_state.c | |
parent | 47f59cfc8eba6574c9ca0ae8799e8fbd9b393fb7 (diff) |
r300g: Move TCL bypass switch to main context.
Diffstat (limited to 'src/gallium/drivers/r300/r300_state.c')
-rw-r--r-- | src/gallium/drivers/r300/r300_state.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c index 4c0b307ea88..da1f40c8ef6 100644 --- a/src/gallium/drivers/r300/r300_state.c +++ b/src/gallium/drivers/r300/r300_state.c @@ -605,8 +605,6 @@ static void* r300_create_rs_state(struct pipe_context* pipe, /* Copy rasterizer state for Draw. */ rs->rs = *state; - rs->enable_vte = !state->bypass_vs_clip_and_viewport; - #ifdef PIPE_ARCH_LITTLE_ENDIAN rs->vap_control_status = R300_VC_NO_SWAP; #else @@ -722,9 +720,12 @@ static void r300_bind_rs_state(struct pipe_context* pipe, void* state) draw_set_rasterizer_state(r300->draw, &rs->rs); } + r300->tcl_bypass = rs->rs.bypass_vs_clip_and_viewport; + r300->rs_state.state = rs; r300->rs_state.dirty = TRUE; - r300->viewport_state.dirty = TRUE; /* XXX */ + /* XXX Why is this still needed, dammit!? */ + r300->viewport_state.dirty = TRUE; /* XXX Clean these up when we move to atom emits */ r300->dirty_state |= R300_NEW_RS_BLOCK; |