summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-05-22 13:19:42 -0600
committerBrian Paul <brianp@vmware.com>2009-06-17 11:30:03 -0600
commit072411b5e5c0a251b81bcdc29f12b1044a220a54 (patch)
treeb8b2ad27173488f6cb9d6734a540693a6330c415 /src
parentb9c356a43e3883ae6fff20916d04e24760169fa6 (diff)
vbo: fix crash in vbo_exec_bind_arrays()
When a vertex shader uses generic vertex attribute 0, but not gl_Vertex, we need to set attribute[16] to point to attribute[0]. We were setting the attribute size, but not the pointer. Fixes crash in glsl/multitex.c when using the VertCoord attribute instead of gl_Vertex. (cherry picked from commit c3538969e1ae3e626a618934aa8f35a7a22ddb39)
Diffstat (limited to 'src')
-rw-r--r--src/mesa/vbo/vbo_exec_draw.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
index 2c8183da564..8af5853852b 100644
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@ -185,6 +185,7 @@ static void vbo_exec_bind_arrays( GLcontext *ctx )
(ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_GENERIC0)) {
exec->vtx.inputs[16] = exec->vtx.inputs[0];
exec->vtx.attrsz[16] = exec->vtx.attrsz[0];
+ exec->vtx.attrptr[16] = exec->vtx.attrptr[0];
exec->vtx.attrsz[0] = 0;
}
break;