diff options
| author | Marek Olšák <maraeo@gmail.com> | 2010-07-12 23:03:34 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2010-07-13 01:34:21 +0200 |
| commit | 499022c282ae8ed913f1f9dd652cf39b74d9f286 (patch) | |
| tree | 862684789da1585f393caff58a10042bb130fb7a | |
| parent | f5804e64b41e167bd5578df86e05329dd06c35d6 (diff) | |
r300g/swtcl: do not emit texcoords if they are also stuffed in GA
| -rw-r--r-- | src/gallium/drivers/r300/r300_state_derived.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c index 3aa8deb63c8..3760ff2c641 100644 --- a/src/gallium/drivers/r300/r300_state_derived.c +++ b/src/gallium/drivers/r300/r300_state_derived.c @@ -102,7 +102,8 @@ static void r300_draw_emit_all_attribs(struct r300_context* r300) * they won't be rasterized. */ gen_count = 0; for (i = 0; i < ATTR_GENERIC_COUNT && gen_count < 8; i++) { - if (vs_outputs->generic[i] != ATTR_UNUSED) { + if (vs_outputs->generic[i] != ATTR_UNUSED && + !(r300->sprite_coord_enable & (1 << i))) { r300_draw_emit_attrib(r300, EMIT_4F, INTERP_PERSPECTIVE, vs_outputs->generic[i]); gen_count++; @@ -147,8 +148,10 @@ static void r300_swtcl_vertex_psc(struct r300_context *r300) vinfo->attrib[i].interp_mode, vinfo->attrib[i].emit, vs_output_tab[i]); - /* Make sure we have a proper destination for our attribute. */ - assert(vs_output_tab[i] != -1); + if (vs_output_tab[i] == -1) { + assert(0); + abort(); + } format = draw_translate_vinfo_format(vinfo->attrib[i].emit); |