diff options
| author | Brian <brian@yutani.localnet.net> | 2007-03-26 10:13:02 -0600 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-03-26 10:13:02 -0600 |
| commit | d619cceea47dc3070ebb7f7ea4f8b6b31a672d38 (patch) | |
| tree | f8b8a9f3fdc3f17a43436af270b22754b1749d31 /src/mesa/tnl_dd/t_dd_vb.c | |
| parent | 76f3b66e0489526694d6a39b4a6ac3b1c2bee100 (diff) | |
| parent | e71c34aaa173ca451fa02e526ead77758f7eeb74 (diff) | |
merge of glsl-compiler-1 branch
Diffstat (limited to 'src/mesa/tnl_dd/t_dd_vb.c')
| -rw-r--r-- | src/mesa/tnl_dd/t_dd_vb.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/mesa/tnl_dd/t_dd_vb.c b/src/mesa/tnl_dd/t_dd_vb.c index edd78f7acf..629f328a4d 100644 --- a/src/mesa/tnl_dd/t_dd_vb.c +++ b/src/mesa/tnl_dd/t_dd_vb.c @@ -141,45 +141,45 @@ void TAG(translate_vertex)(GLcontext *ctx, ((HAVE_TEX2_VERTICES && format == PROJ_TEX3_VERTEX_FORMAT) || (format == PROJ_TEX1_VERTEX_FORMAT))) { - dst->texcoord[0][0] = src->pv.u0; - dst->texcoord[0][1] = src->pv.v0; - dst->texcoord[0][3] = src->pv.q0; + dst->attrib[FRAG_ATTRIB_TEX0][0] = src->pv.u0; + dst->attrib[FRAG_ATTRIB_TEX0][1] = src->pv.v0; + dst->attrib[FRAG_ATTRIB_TEX0][3] = src->pv.q0; - dst->texcoord[1][0] = src->pv.u1; - dst->texcoord[1][1] = src->pv.v1; - dst->texcoord[1][3] = src->pv.q1; + dst->attrib[FRAG_ATTRIB_TEX1][0] = src->pv.u1; + dst->attrib[FRAG_ATTRIB_TEX1][1] = src->pv.v1; + dst->attrib[FRAG_ATTRIB_TEX1][3] = src->pv.q1; if (HAVE_TEX2_VERTICES) { - dst->texcoord[2][0] = src->pv.u2; - dst->texcoord[2][1] = src->pv.v2; - dst->texcoord[2][3] = src->pv.q2; + dst->attrib[FRAG_ATTRIB_TEX2][0] = src->pv.u2; + dst->attrib[FRAG_ATTRIB_TEX2][1] = src->pv.v2; + dst->attrib[FRAG_ATTRIB_TEX2][3] = src->pv.q2; } if (HAVE_TEX3_VERTICES) { - dst->texcoord[3][0] = src->pv.u3; - dst->texcoord[3][1] = src->pv.v3; - dst->texcoord[3][3] = src->pv.q3; + dst->attrib[FRAG_ATTRIB_TEX3][0] = src->pv.u3; + dst->attrib[FRAG_ATTRIB_TEX3][1] = src->pv.v3; + dst->attrib[FRAG_ATTRIB_TEX3][3] = src->pv.q3; } } else { - dst->texcoord[0][0] = src->v.u0; - dst->texcoord[0][1] = src->v.v0; - dst->texcoord[0][3] = 1.0; + dst->attrib[FRAG_ATTRIB_TEX0][0] = src->v.u0; + dst->attrib[FRAG_ATTRIB_TEX0][1] = src->v.v0; + dst->attrib[FRAG_ATTRIB_TEX0][3] = 1.0; - dst->texcoord[1][0] = src->v.u1; - dst->texcoord[1][1] = src->v.v1; - dst->texcoord[1][3] = 1.0; + dst->attrib[FRAG_ATTRIB_TEX1][0] = src->v.u1; + dst->attrib[FRAG_ATTRIB_TEX1][1] = src->v.v1; + dst->attrib[FRAG_ATTRIB_TEX1][3] = 1.0; if (HAVE_TEX2_VERTICES) { - dst->texcoord[2][0] = src->v.u2; - dst->texcoord[2][1] = src->v.v2; - dst->texcoord[2][3] = 1.0; + dst->attrib[FRAG_ATTRIB_TEX2][0] = src->v.u2; + dst->attrib[FRAG_ATTRIB_TEX2][1] = src->v.v2; + dst->attrib[FRAG_ATTRIB_TEX2][3] = 1.0; } if (HAVE_TEX3_VERTICES) { - dst->texcoord[3][0] = src->v.u3; - dst->texcoord[3][1] = src->v.v3; - dst->texcoord[3][3] = 1.0; + dst->attrib[FRAG_ATTRIB_TEX3][0] = src->v.u3; + dst->attrib[FRAG_ATTRIB_TEX3][1] = src->v.v3; + dst->attrib[FRAG_ATTRIB_TEX3][3] = 1.0; } } } |