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

r600g: remove the dual_src_blend flag from the shader key

Browse Source 
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
This commit is contained in:
Marek Olšák
2012-10-05 03:00:38 +02:00
parent faaba52aed
commit 8bf7044ec6
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -268,7 +268,6 @@ struct r600_pipe_shader_selector {
struct r600_shader_key {
unsigned color_two_side:1;
unsigned alpha_to_one:1;
unsigned dual_src_blend:1;
unsigned nr_cbufs:4;
};

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

@@ -1612,7 +1612,7 @@ static int r600_shader_from_tgsi(struct r600_screen *rscreen,
case TGSI_PROCESSOR_FRAGMENT:
if (shader->output[i].name == TGSI_SEMANTIC_COLOR) {
/* never export more colors than the number of CBs */
if (next_pixel_base && next_pixel_base >= key.nr_cbufs + key.dual_src_blend) {
if (next_pixel_base && next_pixel_base >= key.nr_cbufs) {
/* skip export */
j--;
continue;

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

@@ -747,8 +747,10 @@ static INLINE struct r600_shader_key r600_shader_selector_key(struct pipe_contex
key.alpha_to_one = rctx->alpha_to_one &&
rctx->multisample_enable &&
!rctx->framebuffer.cb0_is_integer;
key.dual_src_blend = rctx->dual_src_blend;
key.nr_cbufs = rctx->framebuffer.state.nr_cbufs;
/* Dual-source blending only makes sense with nr_cbufs == 1. */
if (key.nr_cbufs == 1 && rctx->dual_src_blend)
key.nr_cbufs = 2;
}
return key;
}