r300g: Examine vertex attribute type on HW TCL too.
authorCorbin Simpson <MostAwesomeDude@gmail.com>
Wed, 21 Oct 2009 12:45:05 +0000 (05:45 -0700)
committerCorbin Simpson <MostAwesomeDude@gmail.com>
Wed, 21 Oct 2009 13:52:23 +0000 (06:52 -0700)
src/gallium/drivers/r300/r300_state_derived.c

index 5df1a0cd635f269d78251e7609eb43e31ebc8feb..7297f9c653cc456e1ba1bf1042da86b0479e6127 100644 (file)
@@ -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;