fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vbo: make void vbo_exec_BeginVertices() static

Browse source 
Not called from any other file.  Rename and move before use.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Brian Paul 2015-10-12 14:16:37 -06:00
parent 84719ad9df
commit a7b6e6192a
2 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/vbo/vbo_exec.h
View file

@ -132,7 +132,7 @@ struct vbo_exec_context
GLboolean recalculate_inputs;
} array;
/* Which flags to set in vbo_exec_BeginVertices() */
/* Which flags to set in vbo_exec_begin_vertices() */
GLbitfield begin_vertices_flags;
#ifdef DEBUG
@ -148,8 +148,6 @@ void vbo_exec_init( struct gl_context *ctx );
void vbo_exec_destroy( struct gl_context *ctx );
void vbo_exec_invalidate_state( struct gl_context *ctx, GLuint new_state );
void vbo_exec_BeginVertices( struct gl_context *ctx );
/* Internal functions:
*/

37
src/mesa/vbo/vbo_exec_api.c
View file

@ -413,6 +413,23 @@ vbo_exec_fixup_vertex(struct gl_context *ctx, GLuint attr,
}
/**
* Called upon first glVertex, glColor, glTexCoord, etc.
*/
static void
vbo_exec_begin_vertices(struct gl_context *ctx)
{
struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
vbo_exec_vtx_map( exec );
assert((ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT) == 0);
assert(exec->begin_vertices_flags);
ctx->Driver.NeedFlush |= exec->begin_vertices_flags;
}
/**
* This macro is used to implement all the glVertex, glColor, glTexCoord,
* glVertexAttrib, etc functions.
@ -430,7 +447,7 @@ do { \
assert(sz == 1 || sz == 2); \
\
if (unlikely(!(ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT))) { \
vbo_exec_BeginVertices(ctx); \
vbo_exec_begin_vertices(ctx); \
} \
\
/* check if attribute size or type is changing */ \
@ -1164,22 +1181,6 @@ void vbo_exec_vtx_destroy( struct vbo_exec_context *exec )
}
/**
* Called upon first glVertex, glColor, glTexCoord, etc.
*/
void vbo_exec_BeginVertices( struct gl_context *ctx )
{
struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
vbo_exec_vtx_map( exec );
assert((ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT) == 0);
assert(exec->begin_vertices_flags);
ctx->Driver.NeedFlush |= exec->begin_vertices_flags;
}
/**
* If inside glBegin()/glEnd(), it should assert(0). Otherwise, if
* FLUSH_STORED_VERTICES bit in \p flags is set flushes any buffered
@ -1213,7 +1214,7 @@ void vbo_exec_FlushVertices( struct gl_context *ctx, GLuint flags )
/* Flush (draw), and make sure VBO is left unmapped when done */
vbo_exec_FlushVertices_internal(exec, GL_TRUE);
/* Need to do this to ensure vbo_exec_BeginVertices gets called again:
/* Need to do this to ensure vbo_exec_begin_vertices gets called again:
*/
ctx->Driver.NeedFlush &= ~(FLUSH_UPDATE_CURRENT | flags);