gallium: fix typos in hardwired fetch path
authorKeith Whitwell <keith@tungstengraphics.com>
Mon, 28 Jan 2008 20:57:16 +0000 (20:57 +0000)
committerBen Skeggs <skeggsb@gmail.com>
Fri, 15 Feb 2008 02:50:23 +0000 (13:50 +1100)
src/mesa/pipe/draw/draw_vertex_fetch.c

index afdf1971d2400985addb906a9cd37c5fb28d128c..89e4c256a7de39b909f2431c0b99782cf5f4b58a 100644 (file)
@@ -396,7 +396,7 @@ static void fetch_xyz_rgb_st( struct draw_context *draw,
 
       {
         const float *in = (const float *)(src[2] + elts[i] * pitch[2]);
-        float *out = &machine->Inputs[1].xyzw[0].f[i];
+        float *out = &machine->Inputs[2].xyzw[0].f[i];
         out[0] = in[0];
         out[4] = in[1];
         out[8] = 0.0f;
@@ -500,7 +500,7 @@ void draw_update_vertex_fetch( struct draw_context *draw )
    case 3:
       if (draw->vertex_element[0].src_format == PIPE_FORMAT_R32G32B32_FLOAT &&
          draw->vertex_element[1].src_format == PIPE_FORMAT_R32G32B32_FLOAT &&
-         draw->vertex_element[1].src_format == PIPE_FORMAT_R32G32_FLOAT)
+         draw->vertex_element[2].src_format == PIPE_FORMAT_R32G32_FLOAT)
         draw->vertex_fetch.fetch_func = fetch_xyz_rgb_st;
       break;
    default: