summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-12-18 15:59:54 -0700
committerBrian <brian.paul@tungstengraphics.com>2007-12-18 16:01:53 -0700
commitfb4eb8c91b7e76bf66d92da91c1e6d994b6e7e3e (patch)
treeb4f878a1535de6b26d9cded5bb27517dad503770
parentc31416971e4eac148f8e82d6c4392bd6f9cbc05d (diff)
fix some semantic info mix-ups in calculate_vertex_layout()
-rw-r--r--src/mesa/pipe/softpipe/sp_state_derived.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/mesa/pipe/softpipe/sp_state_derived.c b/src/mesa/pipe/softpipe/sp_state_derived.c
index 94072a2d30..a5e766781f 100644
--- a/src/mesa/pipe/softpipe/sp_state_derived.c
+++ b/src/mesa/pipe/softpipe/sp_state_derived.c
@@ -81,21 +81,21 @@ static void calculate_vertex_layout( struct softpipe_context *softpipe )
break;
case TGSI_SEMANTIC_COLOR:
- if (fs->input_semantic_index[i] == 0) {
+ if (vs->output_semantic_index[i] == 0) {
front0 = draw_emit_vertex_attr(vinfo, FORMAT_4F, colorInterp);
}
else {
- assert(fs->input_semantic_index[i] == 1);
+ assert(vs->output_semantic_index[i] == 1);
front1 = draw_emit_vertex_attr(vinfo, FORMAT_4F, colorInterp);
}
break;
case TGSI_SEMANTIC_BCOLOR:
- if (fs->input_semantic_index[i] == 0) {
+ if (vs->output_semantic_index[i] == 0) {
emitBack0 = TRUE;
}
else {
- assert(fs->input_semantic_index[i] == 1);
+ assert(vs->output_semantic_index[i] == 1);
emitBack1 = TRUE;
}
break;
@@ -121,11 +121,7 @@ static void calculate_vertex_layout( struct softpipe_context *softpipe )
}
}
-#if 00
- softpipe->nr_frag_attrs = vinfo->num_attribs;
-#else
softpipe->nr_frag_attrs = fs->num_inputs;
-#endif
/* We want these after all other attribs since they won't get passed
* to the fragment shader. All prior vertex output attribs should match