diff options
| author | PFO <pfolinux@rdi-linux> | 2011-06-17 16:07:53 +0200 |
|---|---|---|
| committer | PFO <pfolinux@rdi-linux> | 2011-06-17 16:07:53 +0200 |
| commit | df7dcb58b58c58ac79aa14f17e92d744b8b13dd9 (patch) | |
| tree | b439ba04547b3fd5c1b81c2a82269210b1c4523e /src/mesa/vbo | |
| parent | d58e3fa353c5df8028413837a366a16ff6054015 (diff) | |
| parent | 5607823fe4ff35e11086efa6302d8fbacd315b06 (diff) | |
Merge branch 'r300' into hhienvsa_r300
Diffstat (limited to 'src/mesa/vbo')
| -rw-r--r-- | src/mesa/vbo/vbo_exec_api.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index 3c430b9a05..d9656b3caf 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -432,7 +432,7 @@ do { \ * Flush (draw) vertices. * \param unmap - leave VBO unmapped after flushing? */ -/*static void +static void vbo_exec_FlushVertices_internal(struct vbo_exec_context *exec, GLboolean unmap) { if (exec->vtx.vert_count || unmap) { @@ -444,7 +444,6 @@ vbo_exec_FlushVertices_internal(struct vbo_exec_context *exec, GLboolean unmap) reset_attrfv( exec ); } } -*/ #if FEATURE_beginend @@ -549,24 +548,6 @@ static void GLAPIENTRY vbo_exec_EvalPoint2( GLint i, GLint j ) /** - * Flush (draw) vertices. - * \param unmap - leave VBO unmapped after flushing? - */ -static void -vbo_exec_FlushVertices_internal(struct vbo_exec_context *exec, GLboolean unmap) -{ - if (exec->vtx.vert_count || unmap) { - vbo_exec_vtx_flush( exec, unmap ); - } - - if (exec->vtx.vertex_size) { - vbo_exec_copy_to_current( exec ); - reset_attrfv( exec ); - } -} - - -/** * Called via glBegin. */ static void GLAPIENTRY vbo_exec_Begin( GLenum mode ) |