summaryrefslogtreecommitdiff
path: root/src/gallium/auxiliary/draw/draw_vs_varient.c
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2008-05-27 14:42:15 +0100
committerKeith Whitwell <keith@tungstengraphics.com>2008-05-27 14:45:52 +0100
commitf8762ba5234fd1b44e11e76bb5f58d2305c90572 (patch)
tree993d78827d7b6157a8c8f4b8dc369316ec1ff04e /src/gallium/auxiliary/draw/draw_vs_varient.c
parentf64c44ad3e55467ce964871502445cf5a0fb46d6 (diff)
draw: explicitly list nr_inputs, outputs in varient key
Diffstat (limited to 'src/gallium/auxiliary/draw/draw_vs_varient.c')
-rw-r--r--src/gallium/auxiliary/draw/draw_vs_varient.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/auxiliary/draw/draw_vs_varient.c b/src/gallium/auxiliary/draw/draw_vs_varient.c
index d4deabfff3..dab46e8eed 100644
--- a/src/gallium/auxiliary/draw/draw_vs_varient.c
+++ b/src/gallium/auxiliary/draw/draw_vs_varient.c
@@ -276,11 +276,11 @@ struct draw_vs_varient *draw_vs_varient_generic( struct draw_vertex_shader *vs,
- /* OK, have to build a new one:
+ /* Build free-standing fetch and emit functions:
*/
- fetch.nr_elements = vs->info.num_inputs;
+ fetch.nr_elements = key->nr_inputs;
fetch.output_stride = 0;
- for (i = 0; i < vs->info.num_inputs; i++) {
+ for (i = 0; i < key->nr_inputs; i++) {
fetch.element[i].input_format = key->element[i].in.format;
fetch.element[i].input_buffer = key->element[i].in.buffer;
fetch.element[i].input_offset = key->element[i].in.offset;
@@ -290,9 +290,9 @@ struct draw_vs_varient *draw_vs_varient_generic( struct draw_vertex_shader *vs,
}
- emit.nr_elements = vs->info.num_outputs;
+ emit.nr_elements = key->nr_outputs;
emit.output_stride = key->output_stride;
- for (i = 0; i < vs->info.num_outputs; i++) {
+ for (i = 0; i < key->nr_outputs; i++) {
emit.element[i].input_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
emit.element[i].input_buffer = 0;
emit.element[i].input_offset = i * 4 * sizeof(float);