summaryrefslogtreecommitdiffstats
path: root/src/mesa/shader/arbprogparse.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2006-04-25 00:21:32 +0000
committerBrian Paul <[email protected]>2006-04-25 00:21:32 +0000
commit095c6699f449ed4803f23e844cc0227743a9c3e1 (patch)
tree2446935d4cdb2ab45834a94e8780d90ddd66292e /src/mesa/shader/arbprogparse.c
parentf12ea2d402e8f6d29dfd40c731351ff210887b58 (diff)
No longer alias generic vertex attribs with conventional attribs for GL_ARB_vertex_program.
Diffstat (limited to 'src/mesa/shader/arbprogparse.c')
-rw-r--r--src/mesa/shader/arbprogparse.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index f8809c576f9..de63c50b36a 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -1537,7 +1537,12 @@ parse_attrib_binding(GLcontext * ctx, GLubyte ** inst,
GLuint attrib;
if (!parse_generic_attrib_num(ctx, inst, Program, &attrib)) {
*is_generic = 1;
- *inputReg = attrib;
+ /* Add VERT_ATTRIB_GENERIC0 here because ARB_vertex_program's
+ * attributes do not alias the conventional vertex
+ * attributes.
+ */
+ if (attrib > 0)
+ *inputReg = attrib + VERT_ATTRIB_GENERIC0;
}
}
break;