summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r600/evergreen_state.c
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2012-01-29 05:22:00 +0100
committerMarek Olšák <[email protected]>2012-01-31 02:17:56 +0100
commit2000086fcd5174f121f61dd6df5948c67101e148 (patch)
tree704c1de4d96fbd113498e8b110ca52a32fcbd7b9 /src/gallium/drivers/r600/evergreen_state.c
parent84b4b2a8aacf6655d3f2a9f03dec3913a00aabdb (diff)
r600g: don't add PA_SC_LINE_STIPPLE to rasterizer_state
It's always emitted in draw_vbo. Reviewed-by: Dave Airlie <[email protected]> Reviewed-by: Alex Deucher <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/evergreen_state.c')
-rw-r--r--src/gallium/drivers/r600/evergreen_state.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 9f9a6a13130..a5a443c2b1c 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -889,6 +889,9 @@ static void *evergreen_create_rs_state(struct pipe_context *ctx,
rs->sprite_coord_enable = state->sprite_coord_enable;
rs->two_side = state->light_twoside;
rs->clip_plane_enable = state->clip_plane_enable;
+ rs->pa_sc_line_stipple = state->line_stipple_enable ?
+ S_028A0C_LINE_PATTERN(state->line_stipple_pattern) |
+ S_028A0C_REPEAT_COUNT(state->line_stipple_factor) : 0;
clip_rule = state->scissor ? 0xAAAA : 0xFFFF;
@@ -946,14 +949,6 @@ static void *evergreen_create_rs_state(struct pipe_context *ctx,
tmp = (unsigned)state->line_width * 8;
r600_pipe_state_add_reg(rstate, R_028A08_PA_SU_LINE_CNTL, S_028A08_WIDTH(tmp), 0xFFFFFFFF, NULL, 0);
-
- if (state->line_stipple_enable) {
- r600_pipe_state_add_reg(rstate, R_028A0C_PA_SC_LINE_STIPPLE,
- S_028A0C_LINE_PATTERN(state->line_stipple_pattern) |
- S_028A0C_REPEAT_COUNT(state->line_stipple_factor),
- 0x9FFFFFFF, NULL, 0);
- }
-
r600_pipe_state_add_reg(rstate, R_028A48_PA_SC_MODE_CNTL_0,
S_028A48_LINE_STIPPLE_ENABLE(state->line_stipple_enable),
0xFFFFFFFF, NULL, 0);