svga: rename color output variables

Just to be bit more readable.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
This commit is contained in:
Brian Paul
2014-01-16 18:05:00 -08:00
parent f6bc7d6586
commit 384fd64ab1
3 changed files with 10 additions and 9 deletions

View File

@@ -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,

View File

@@ -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;

View File

@@ -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;
}
}