diff options
| author | Zack Rusin <zackr@vmware.com> | 2010-07-07 00:54:33 -0400 |
|---|---|---|
| committer | Zack Rusin <zackr@vmware.com> | 2010-07-08 00:28:29 -0400 |
| commit | 7c42390453e611367cf1ba11446692ec04e0abfb (patch) | |
| tree | 379033d3f7659d4214c0808bbc276072685a504c /src/mesa/state_tracker/st_program.c | |
| parent | 6988f65e43297ae63bbce30bf882f870b370096c (diff) | |
gs: inject const int gl_VerticesIn at link time
Diffstat (limited to 'src/mesa/state_tracker/st_program.c')
| -rw-r--r-- | src/mesa/state_tracker/st_program.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 172d7dfe90..1d748965f8 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -490,10 +490,7 @@ st_translate_geometry_program(struct st_context *st, } /* which vertex output goes to the first geometry input */ - if (inputsRead & GEOM_BIT_VERTICES) - vslot = 0; - else - vslot = 1; + vslot = 0; /* * Convert Mesa program inputs to TGSI input register semantics. @@ -511,8 +508,7 @@ st_translate_geometry_program(struct st_context *st, stgp->index_to_input[vslot] = attr; ++vslot; - if (attr != GEOM_ATTRIB_VERTICES && - attr != GEOM_ATTRIB_PRIMITIVE_ID) { + if (attr != GEOM_ATTRIB_PRIMITIVE_ID) { gs_array_offset += 2; } else ++gs_builtin_inputs; @@ -523,9 +519,6 @@ st_translate_geometry_program(struct st_context *st, #endif switch (attr) { - case GEOM_ATTRIB_VERTICES: - debug_assert(0); - break; case GEOM_ATTRIB_PRIMITIVE_ID: stgp->input_semantic_name[slot] = TGSI_SEMANTIC_PRIMID; stgp->input_semantic_index[slot] = 0; |