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

vbo: move vbo_sizeof_ib_type() into vbo_exec_array.c

Browse Source 
It's only used in this one file.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
This commit is contained in:
Brian Paul
2018-01-18 13:28:10 -07:00
parent a152cb7492
commit 3bbf8d9042
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/vbo/vbo.h
-16
View File
@@ -162,22 +162,6 @@ void vbo_rebase_prims( struct gl_context *ctx,
GLuint max_index,
vbo_draw_func draw );
static inline int
vbo_sizeof_ib_type(GLenum type)
{
switch (type) {
case GL_UNSIGNED_INT:
return sizeof(GLuint);
case GL_UNSIGNED_SHORT:
return sizeof(GLushort);
case GL_UNSIGNED_BYTE:
return sizeof(GLubyte);
default:
assert(!"unsupported index data type");
/* In case assert is turned off */
return 0;
}
}
void
vbo_delete_minmax_cache(struct gl_buffer_object *bufferObj);
src/mesa/vbo/vbo_exec_array.c
+24 -7
View File
@@ -113,6 +113,23 @@ unmap_array_buffer(struct gl_context *ctx, struct gl_vertex_array_object *vao,
}
static inline int
sizeof_ib_type(GLenum type)
{
switch (type) {
case GL_UNSIGNED_INT:
return sizeof(GLuint);
case GL_UNSIGNED_SHORT:
return sizeof(GLushort);
case GL_UNSIGNED_BYTE:
return sizeof(GLubyte);
default:
assert(!"unsupported index data type");
/* In case assert is turned off */
return 0;
}
}
/**
* Examine the array's data for NaNs, etc.
* For debug purposes; not normally used.
@@ -873,7 +890,7 @@ vbo_validated_drawrangeelements(struct gl_context *ctx, GLenum mode,
vbo_bind_arrays(ctx);
ib.count = count;
ib.index_size = vbo_sizeof_ib_type(type);
ib.index_size = sizeof_ib_type(type);
ib.obj = ctx->Array.VAO->IndexBufferObj;
ib.ptr = indices;
@@ -1262,7 +1279,7 @@ vbo_validated_multidrawelements(struct gl_context *ctx, GLenum mode,
struct vbo_context *vbo = vbo_context(ctx);
struct _mesa_index_buffer ib;
struct _mesa_prim *prim;
unsigned int index_type_size = vbo_sizeof_ib_type(type);
unsigned int index_type_size = sizeof_ib_type(type);
uintptr_t min_index_ptr, max_index_ptr;
GLboolean fallback = GL_FALSE;
int i;
@@ -1321,7 +1338,7 @@ vbo_validated_multidrawelements(struct gl_context *ctx, GLenum mode,
if (!fallback) {
ib.count = (max_index_ptr - min_index_ptr) / index_type_size;
ib.index_size = vbo_sizeof_ib_type(type);
ib.index_size = sizeof_ib_type(type);
ib.obj = ctx->Array.VAO->IndexBufferObj;
ib.ptr = (void *) min_index_ptr;
@@ -1354,7 +1371,7 @@ vbo_validated_multidrawelements(struct gl_context *ctx, GLenum mode,
if (count[i] == 0)
continue;
ib.count = count[i];
ib.index_size = vbo_sizeof_ib_type(type);
ib.index_size = sizeof_ib_type(type);
ib.obj = ctx->Array.VAO->IndexBufferObj;
ib.ptr = indices[i];
@@ -1612,7 +1629,7 @@ vbo_validated_drawelementsindirect(struct gl_context *ctx,
vbo_bind_arrays(ctx);
ib.count = 0; /* unknown */
ib.index_size = vbo_sizeof_ib_type(type);
ib.index_size = sizeof_ib_type(type);
ib.obj = ctx->Array.VAO->IndexBufferObj;
ib.ptr = NULL;
@@ -1644,7 +1661,7 @@ vbo_validated_multidrawelementsindirect(struct gl_context *ctx,
/* NOTE: IndexBufferObj is guaranteed to be a VBO. */
ib.count = 0; /* unknown */
ib.index_size = vbo_sizeof_ib_type(type);
ib.index_size = sizeof_ib_type(type);
ib.obj = ctx->Array.VAO->IndexBufferObj;
ib.ptr = NULL;
@@ -1828,7 +1845,7 @@ vbo_validated_multidrawelementsindirectcount(struct gl_context *ctx,
/* NOTE: IndexBufferObj is guaranteed to be a VBO. */
ib.count = 0; /* unknown */
ib.index_size = vbo_sizeof_ib_type(type);
ib.index_size = sizeof_ib_type(type);
ib.obj = ctx->Array.VAO->IndexBufferObj;
ib.ptr = NULL;