OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vbo: fix void * arithmetic compilation error on MSVC

Browse Source 
Also, call vbo_sizeof_ib_type() once and fix argument cast in
MapBufferRange() call.
This commit is contained in:
Brian Paul
2012-01-11 20:03:32 -07:00
parent 4c0d88c145
commit bbc74ffad6
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mesa/vbo/vbo_exec_array.c
View File

@@ -108,13 +108,14 @@ vbo_get_minmax_index(struct gl_context *ctx,
{ {
const GLboolean restart = ctx->Array.PrimitiveRestart; const GLboolean restart = ctx->Array.PrimitiveRestart;
const GLuint restartIndex = ctx->Array.RestartIndex; const GLuint restartIndex = ctx->Array.RestartIndex;
const void *indices; const int index_size = vbo_sizeof_ib_type(ib->type);
const char *indices;
GLuint i; GLuint i;
indices = (void *)ib->ptr + prim->start * vbo_sizeof_ib_type(ib->type); indices = (char *) ib->ptr + prim->start * index_size;
if (_mesa_is_bufferobj(ib->obj)) { if (_mesa_is_bufferobj(ib->obj)) {
GLsizeiptr size = MIN2(count * vbo_sizeof_ib_type(ib->type), ib->obj->Size); GLsizeiptr size = MIN2(count * ib_size, index->obj->Size);
indices = ctx->Driver.MapBufferRange(ctx, (GLsizeiptr) indices, size, indices = ctx->Driver.MapBufferRange(ctx, (GLintptr) indices, size,
GL_MAP_READ_BIT, ib->obj); GL_MAP_READ_BIT, ib->obj);
} }