projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fce8409
)
SWvertex no longer has texcoord field, use attrib field instead
author
Brian
<brian@yutani.localnet.net>
Fri, 23 Feb 2007 18:45:15 +0000
(11:45 -0700)
committer
Brian
<brian@yutani.localnet.net>
Fri, 23 Feb 2007 18:45:15 +0000
(11:45 -0700)
src/mesa/tnl_dd/t_dd_vb.c
patch
|
blob
|
history
diff --git
a/src/mesa/tnl_dd/t_dd_vb.c
b/src/mesa/tnl_dd/t_dd_vb.c
index edd78f7acfc75d7d9a7103ab3ac04c36d9cf6592..629f328a4d17b42952da9d77b2d0710c14735a4a 100644
(file)
--- 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))) {
((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_TEX
0][0] = src->pv.u0;
+ dst->
attrib[FRAG_ATTRIB_TEX
0][1] = src->pv.v0;
+ dst->
attrib[FRAG_ATTRIB_TEX
0][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_TEX
1][0] = src->pv.u1;
+ dst->
attrib[FRAG_ATTRIB_TEX
1][1] = src->pv.v1;
+ dst->
attrib[FRAG_ATTRIB_TEX
1][3] = src->pv.q1;
if (HAVE_TEX2_VERTICES) {
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_TEX
2][0] = src->pv.u2;
+ dst->
attrib[FRAG_ATTRIB_TEX
2][1] = src->pv.v2;
+ dst->
attrib[FRAG_ATTRIB_TEX
2][3] = src->pv.q2;
}
if (HAVE_TEX3_VERTICES) {
}
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_TEX
3][0] = src->pv.u3;
+ dst->
attrib[FRAG_ATTRIB_TEX
3][1] = src->pv.v3;
+ dst->
attrib[FRAG_ATTRIB_TEX
3][3] = src->pv.q3;
}
}
else {
}
}
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_TEX
0][0] = src->v.u0;
+ dst->
attrib[FRAG_ATTRIB_TEX
0][1] = src->v.v0;
+ dst->
attrib[FRAG_ATTRIB_TEX
0][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_TEX
1][0] = src->v.u1;
+ dst->
attrib[FRAG_ATTRIB_TEX
1][1] = src->v.v1;
+ dst->
attrib[FRAG_ATTRIB_TEX
1][3] = 1.0;
if (HAVE_TEX2_VERTICES) {
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_TEX
2][0] = src->v.u2;
+ dst->
attrib[FRAG_ATTRIB_TEX
2][1] = src->v.v2;
+ dst->
attrib[FRAG_ATTRIB_TEX
2][3] = 1.0;
}
if (HAVE_TEX3_VERTICES) {
}
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_TEX
3][0] = src->v.u3;
+ dst->
attrib[FRAG_ATTRIB_TEX
3][1] = src->v.v3;
+ dst->
attrib[FRAG_ATTRIB_TEX
3][3] = 1.0;
}
}
}
}
}
}