diff options
Diffstat (limited to 'src/gallium/drivers/r600/r600_state.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_state.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index 567835f9c98..1cff200d34e 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -1550,6 +1550,8 @@ static void r600_set_framebuffer_state(struct pipe_context *ctx, rctx->alphatest_state.atom.dirty = true; } + r600_update_db_shader_control(rctx); + /* Calculate the CS size. */ rctx->framebuffer.atom.num_dw = 10 /*COLOR_INFO*/ + 4 /*SCISSOR*/ + 3 /*SHADER_CONTROL*/ + 8 /*MSAA*/; @@ -1857,6 +1859,7 @@ static void r600_emit_db_misc_state(struct r600_context *rctx, struct r600_atom r600_write_context_reg_seq(cs, R_028D0C_DB_RENDER_CONTROL, 2); r600_write_value(cs, db_render_control); /* R_028D0C_DB_RENDER_CONTROL */ r600_write_value(cs, db_render_override); /* R_028D10_DB_RENDER_OVERRIDE */ + r600_write_context_reg(cs, R_02880C_DB_SHADER_CONTROL, a->db_shader_control); } static void r600_emit_vertex_buffers(struct r600_context *rctx, struct r600_atom *atom) @@ -2160,7 +2163,7 @@ void r600_init_state_functions(struct r600_context *rctx) r600_init_atom(rctx, &rctx->cb_misc_state.atom, id++, r600_emit_cb_misc_state, 7); r600_init_atom(rctx, &rctx->clip_misc_state.atom, id++, r600_emit_clip_misc_state, 6); r600_init_atom(rctx, &rctx->clip_state.atom, id++, r600_emit_clip_state, 26); - r600_init_atom(rctx, &rctx->db_misc_state.atom, id++, r600_emit_db_misc_state, 4); + r600_init_atom(rctx, &rctx->db_misc_state.atom, id++, r600_emit_db_misc_state, 7); r600_init_atom(rctx, &rctx->dsa_state.atom, id++, r600_emit_cso_state, 0); r600_init_atom(rctx, &rctx->poly_offset_state.atom, id++, r600_emit_polygon_offset, 6); r600_init_atom(rctx, &rctx->rasterizer_state.atom, id++, r600_emit_cso_state, 0); @@ -2826,7 +2829,7 @@ void *r600_create_db_flush_dsa(struct r600_context *rctx) return rctx->context.create_depth_stencil_alpha_state(&rctx->context, &dsa); } -void r600_update_dual_export_state(struct r600_context * rctx) +void r600_update_db_shader_control(struct r600_context * rctx) { bool dual_export = rctx->framebuffer.export_16bpc && !rctx->ps_shader->current->ps_depth_export; @@ -2834,12 +2837,8 @@ void r600_update_dual_export_state(struct r600_context * rctx) unsigned db_shader_control = rctx->ps_shader->current->db_shader_control | S_02880C_DUAL_EXPORT_ENABLE(dual_export); - if (db_shader_control != rctx->db_shader_control) { - struct r600_pipe_state rstate; - - rctx->db_shader_control = db_shader_control; - rstate.nregs = 0; - r600_pipe_state_add_reg(&rstate, R_02880C_DB_SHADER_CONTROL, db_shader_control); - r600_context_pipe_state_set(rctx, &rstate); + if (db_shader_control != rctx->db_misc_state.db_shader_control) { + rctx->db_misc_state.db_shader_control = db_shader_control; + rctx->db_misc_state.atom.dirty = true; } } |