diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-06 08:19:53 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-06 08:19:53 +0100 |
| commit | ada3d2c30b5a7a1a79e128b7326d50c3bab77a8a (patch) | |
| tree | 30539a1a7c6b011c3a5d8028d7428a1ad2b07546 /mesalib/src/mesa/vbo | |
| parent | 58ff764d4111bfaa7360c57bc62dd620fbdce06f (diff) | |
| download | vcxsrv-ada3d2c30b5a7a1a79e128b7326d50c3bab77a8a.tar.gz vcxsrv-ada3d2c30b5a7a1a79e128b7326d50c3bab77a8a.tar.bz2 vcxsrv-ada3d2c30b5a7a1a79e128b7326d50c3bab77a8a.zip | |
mesa git update 6 feb 2012
Diffstat (limited to 'mesalib/src/mesa/vbo')
| -rw-r--r-- | mesalib/src/mesa/vbo/vbo_exec_array.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/vbo/vbo_save_draw.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/src/mesa/vbo/vbo_exec_array.c b/mesalib/src/mesa/vbo/vbo_exec_array.c index 9861b21c9..d6b4d615c 100644 --- a/mesalib/src/mesa/vbo/vbo_exec_array.c +++ b/mesalib/src/mesa/vbo/vbo_exec_array.c @@ -1337,7 +1337,9 @@ vbo_exec_array_init( struct vbo_exec_context *exec ) exec->vtxfmt.DrawArraysInstanced = vbo_exec_DrawArraysInstanced; exec->vtxfmt.DrawElementsInstanced = vbo_exec_DrawElementsInstanced; exec->vtxfmt.DrawElementsInstancedBaseVertex = vbo_exec_DrawElementsInstancedBaseVertex; +#if FEATURE_EXT_transform_feedback exec->vtxfmt.DrawTransformFeedback = vbo_exec_DrawTransformFeedback; +#endif } diff --git a/mesalib/src/mesa/vbo/vbo_save_draw.c b/mesalib/src/mesa/vbo/vbo_save_draw.c index 9f0290561..b903757c0 100644 --- a/mesalib/src/mesa/vbo/vbo_save_draw.c +++ b/mesalib/src/mesa/vbo/vbo_save_draw.c @@ -191,7 +191,7 @@ static void vbo_bind_vertex_list(struct gl_context *ctx, save->inputs[attr] = &arrays[attr]; arrays[attr].Ptr = (const GLubyte *) NULL + buffer_offset; - arrays[attr].Size = node->attrsz[src]; + arrays[attr].Size = node_attrsz[src]; arrays[attr].StrideB = node->vertex_size * sizeof(GLfloat); arrays[attr].Stride = node->vertex_size * sizeof(GLfloat); arrays[attr].Type = GL_FLOAT; @@ -205,7 +205,7 @@ static void vbo_bind_vertex_list(struct gl_context *ctx, assert(arrays[attr].BufferObj->Name); - buffer_offset += node->attrsz[src] * sizeof(GLfloat); + buffer_offset += node_attrsz[src] * sizeof(GLfloat); varying_inputs |= VERT_BIT(attr); ctx->NewState |= _NEW_ARRAY; } |