AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix missing ADD_POINTERS, fixes crashes if the index elements are in a vbo.

Browse Source
This commit is contained in:
Roland Scheidegger
2007-02-01 20:59:45 +01:00
parent 5368ae5ec3
commit 8ebda479d9
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesa/vbo/vbo_split_copy.c
View File

@@ -360,6 +360,7 @@ static void replay_init( struct copy_context *copy )
GLcontext *ctx = copy->ctx;
GLuint i;
GLuint offset;
const GLvoid *srcptr;
/* Make a list of varying attributes and their vbo's. Also
* calculate vertex size.
@@ -402,13 +403,15 @@ static void replay_init( struct copy_context *copy )
GL_WRITE_ONLY, /* XXX */
copy->ib->obj);
srcptr = (const GLubyte *)ADD_POINTERS(copy->ib->obj->Pointer, copy->ib->ptr);
switch (copy->ib->type) {
case GL_UNSIGNED_BYTE:
copy->translated_elt_buf = _mesa_malloc(sizeof(GLuint) * copy->ib->count);
copy->srcelt = copy->translated_elt_buf;
for (i = 0; i < copy->ib->count; i++)
copy->translated_elt_buf[i] = ((const GLubyte *)copy->ib->ptr)[i];
copy->translated_elt_buf[i] = ((const GLubyte *)srcptr)[i];
break;
case GL_UNSIGNED_SHORT:
@@ -416,13 +419,12 @@ static void replay_init( struct copy_context *copy )
copy->srcelt = copy->translated_elt_buf;
for (i = 0; i < copy->ib->count; i++)
copy->translated_elt_buf[i] = ((const GLushort *)copy->ib->ptr)[i];
copy->translated_elt_buf[i] = ((const GLushort *)srcptr)[i];
break;
case GL_UNSIGNED_INT:
copy->translated_elt_buf = NULL;
copy->srcelt = (const GLuint *)ADD_POINTERS(copy->ib->obj->Pointer,
copy->ib->ptr);
copy->srcelt = (const GLuint *)srcptr;
break;
}