diff options
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/svga/svga_tgsi_decl_sm30.c | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_tgsi_emit.h | 5 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_tgsi_insn.c | 8 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/gallium/drivers/svga/svga_tgsi_decl_sm30.c b/src/gallium/drivers/svga/svga_tgsi_decl_sm30.c index 7faa275f33e..e0a30a5248e 100644 --- a/src/gallium/drivers/svga/svga_tgsi_decl_sm30.c +++ b/src/gallium/drivers/svga/svga_tgsi_decl_sm30.c @@ -332,9 +332,9 @@ ps30_output(struct svga_shader_emitter *emit, emit->output_map[idx] = dst_register( SVGA3DREG_TEMP, emit->nr_hw_temp++ ); - emit->temp_col[idx] = emit->output_map[idx]; - emit->true_col[idx] = dst_register( SVGA3DREG_COLOROUT, - semantic.Index ); + emit->temp_color_output[idx] = emit->output_map[idx]; + emit->true_color_output[idx] = dst_register(SVGA3DREG_COLOROUT, + semantic.Index); } else { emit->output_map[idx] = dst_register( SVGA3DREG_COLOROUT, diff --git a/src/gallium/drivers/svga/svga_tgsi_emit.h b/src/gallium/drivers/svga/svga_tgsi_emit.h index e36a9559ed8..28b8e694ddf 100644 --- a/src/gallium/drivers/svga/svga_tgsi_emit.h +++ b/src/gallium/drivers/svga/svga_tgsi_emit.h @@ -119,8 +119,9 @@ struct svga_shader_emitter /* shared output for depth and fog */ SVGA3dShaderDestToken vs_depth_fog; - SVGA3dShaderDestToken temp_col[PIPE_MAX_COLOR_BUFS]; - SVGA3dShaderDestToken true_col[PIPE_MAX_COLOR_BUFS]; + /* PS output colors */ + SVGA3dShaderDestToken temp_color_output[PIPE_MAX_COLOR_BUFS]; + SVGA3dShaderDestToken true_color_output[PIPE_MAX_COLOR_BUFS]; SVGA3dShaderDestToken temp_psiz; SVGA3dShaderDestToken true_psiz; diff --git a/src/gallium/drivers/svga/svga_tgsi_insn.c b/src/gallium/drivers/svga/svga_tgsi_insn.c index 086509566fe..21435462293 100644 --- a/src/gallium/drivers/svga/svga_tgsi_insn.c +++ b/src/gallium/drivers/svga/svga_tgsi_insn.c @@ -3059,7 +3059,7 @@ emit_ps_postamble(struct svga_shader_emitter *emit) } for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++) { - if (SVGA3dShaderGetRegType(emit->true_col[i].value) != 0) { + if (SVGA3dShaderGetRegType(emit->true_color_output[i].value) != 0) { /* Potentially override output colors with white for XOR * logicop workaround. */ @@ -3070,15 +3070,15 @@ emit_ps_postamble(struct svga_shader_emitter *emit) if (!submit_op1( emit, inst_token(SVGA3DOP_MOV), - emit->true_col[i], + emit->true_color_output[i], one )) return FALSE; } else { if (!submit_op1( emit, inst_token(SVGA3DOP_MOV), - emit->true_col[i], - src(emit->temp_col[i]) )) + emit->true_color_output[i], + src(emit->temp_color_output[i]) )) return FALSE; } } |