summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2008-05-30 08:53:42 -0600
committerBrian Paul <[email protected]>2008-05-30 10:08:04 -0600
commitdf7d1ee2a5270be2d329fd0614a608357917bb74 (patch)
treeece3a0a2a4934274852907b4f3e360b2f7a44af1 /src/mesa
parentb12a31f59d80a1d5703181b00b42df3fa712497b (diff)
Fix segfault in _save_OBE_DrawElements() when using VBO and display list (bug 16156)
This was previously fixed in master by commit 982dcb74fd19b88208d127b8019e2a2af979cac2 by Haihao Xiang.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/vbo/vbo_save_api.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index aded7381436..f62be5c14cf 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -864,6 +864,9 @@ static void GLAPIENTRY _save_OBE_DrawElements(GLenum mode, GLsizei count, GLenum
_ae_map_vbos( ctx );
+ if (ctx->Array.ElementArrayBufferObj->Name)
+ indices = ADD_POINTERS(ctx->Array.ElementArrayBufferObj->Pointer, indices);
+
vbo_save_NotifyBegin( ctx, mode | VBO_SAVE_PRIM_WEAK );
switch (type) {