KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r600g: make framebuffer atom rely on dual src blend state. 

In order to make ARB_shader_image_load_store, we have to share
the CB space with RATs, so we should only steal the dual src
space if we have dual src enabled.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2016-01-26 13:35:08 +10:00
parent d142c7436c
commit cf2af021b9
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/r600/evergreen_state.c
View File

@ -1584,7 +1584,7 @@ static void evergreen_emit_framebuffer_state(struct r600_context *rctx, struct r
radeon_emit(cs, reloc);
}
/* set CB_COLOR1_INFO for possible dual-src blending */
if (i == 1 && state->cbufs[0]) {
if (rctx->framebuffer.dual_src_blend && i == 1 && state->cbufs[0]) {
radeon_set_context_reg(cs, R_028C70_CB_COLOR0_INFO + 1 * 0x3C,
cb->cb_color_info | tex->cb_color_info);
i++;

1
src/gallium/drivers/r600/r600_pipe.h
View File

@ -187,6 +187,7 @@ struct r600_framebuffer {
bool export_16bpc;
bool cb0_is_integer;
bool is_msaa_resolve;
bool dual_src_blend;
};
struct r600_sample_mask {

2
src/gallium/drivers/r600/r600_state.c
View File

@ -1337,7 +1337,7 @@ static void r600_emit_framebuffer_state(struct r600_context *rctx, struct r600_a
radeon_emit(cs, cb[i] ? cb[i]->cb_color_info : 0);
}
/* set CB_COLOR1_INFO for possible dual-src blending */
if (i == 1 && cb[0]) {
if (rctx->framebuffer.dual_src_blend && i == 1 && cb[0]) {
radeon_emit(cs, cb[0]->cb_color_info);
i++;
}

4
src/gallium/drivers/r600/r600_state_common.c
View File

@ -187,6 +187,10 @@ static void r600_bind_blend_state_internal(struct r600_context *rctx,
if (update_cb) {
r600_mark_atom_dirty(rctx, &rctx->cb_misc_state.atom);
}
if (rctx->framebuffer.dual_src_blend != blend->dual_src_blend) {
rctx->framebuffer.dual_src_blend = blend->dual_src_blend;
r600_mark_atom_dirty(rctx, &rctx->framebuffer.atom);
}
}
static void r600_bind_blend_state(struct pipe_context *ctx, void *state)