From: Corbin Simpson <MostAwesomeDude@gmail.com>
Date: Wed, 21 Oct 2009 12:45:05 +0000 (-0700)
Subject: r300g: Examine vertex attribute type on HW TCL too.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b589e39809fa9d0b24a708d792b70ae5b120ffb8;p=mesa.git

r300g: Examine vertex attribute type on HW TCL too.
---

diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c
index 5df1a0cd635..7297f9c653c 100644
--- a/src/gallium/drivers/r300/r300_state_derived.c
+++ b/src/gallium/drivers/r300/r300_state_derived.c
@@ -244,10 +244,8 @@ static void r300_vertex_psc(struct r300_context* r300,
         assert(tab[i] != -1);
 
         /* Add the attribute to the PSC table. */
-        temp = r300screen->caps->has_tcl ?
-            R300_DATA_TYPE_FLOAT_4 :
-            translate_vertex_data_type(vinfo->attrib[i].emit);
-        temp |= tab[i] << R300_DST_VEC_LOC_SHIFT;
+        temp = translate_vertex_data_type(vinfo->attrib[i].emit) |
+            tab[i] << R300_DST_VEC_LOC_SHIFT;
 
         if (i & 1) {
             vformat->vap_prog_stream_cntl[i >> 1] &= 0x0000ffff;