summaryrefslogtreecommitdiffstats
path: root/src/mesa/vbo/vbo_exec.h
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2012-04-23 18:11:38 +0200
committerMarek Olšák <maraeo@gmail.com>2012-05-08 15:57:51 +0200
commita7ac9c9c7dc7401ca6143d1e7476df5e3c2758b7 (patch)
treebae7f2e88f0223705f2c2ec4b77394762597c69a /src/mesa/vbo/vbo_exec.h
parentd6aa7cd7f82a3695243e1ecb1c73cdb796b12523 (diff)
downloadexternal_mesa3d-a7ac9c9c7dc7401ca6143d1e7476df5e3c2758b7.zip
external_mesa3d-a7ac9c9c7dc7401ca6143d1e7476df5e3c2758b7.tar.gz
external_mesa3d-a7ac9c9c7dc7401ca6143d1e7476df5e3c2758b7.tar.bz2
vbo: move vbo_draw_method into vbo_context.h
I'll need vbo_context in that function soon. Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/vbo/vbo_exec.h')
-rw-r--r--src/mesa/vbo/vbo_exec.h36
1 files changed, 0 insertions, 36 deletions
diff --git a/src/mesa/vbo/vbo_exec.h b/src/mesa/vbo/vbo_exec.h
index be9f3d7..4ac7d16 100644
--- a/src/mesa/vbo/vbo_exec.h
+++ b/src/mesa/vbo/vbo_exec.h
@@ -78,26 +78,12 @@ struct vbo_exec_copied_vtx {
};
-/** Used to signal when transitioning from one kind of drawing method
- * to another.
- */
-enum draw_method
-{
- DRAW_NONE, /**< Initial value only */
- DRAW_BEGIN_END,
- DRAW_DISPLAY_LIST,
- DRAW_ARRAYS
-};
-
-
struct vbo_exec_context
{
struct gl_context *ctx;
GLvertexformat vtxfmt;
GLvertexformat vtxfmt_noop;
- enum draw_method last_draw_method;
-
struct {
struct gl_buffer_object *bufferobj;
@@ -174,28 +160,6 @@ void vbo_exec_vtx_init( struct vbo_exec_context *exec );
void vbo_exec_vtx_destroy( struct vbo_exec_context *exec );
-/**
- * This is called by glBegin, glDrawArrays and glDrawElements (and
- * variations of those calls). When we transition from immediate mode
- * drawing to array drawing we need to invalidate the array state.
- *
- * glBegin/End builds vertex arrays. Those arrays may look identical
- * to glDrawArrays arrays except that the position of the elements may
- * be different. For example, arrays of (position3v, normal3f) vs. arrays
- * of (normal3f, position3f). So we need to make sure we notify drivers
- * that arrays may be changing.
- */
-static inline void
-vbo_draw_method(struct vbo_exec_context *exec, enum draw_method method)
-{
- if (exec->last_draw_method != method) {
- struct gl_context *ctx = exec->ctx;
- ctx->Driver.UpdateState(ctx, _NEW_ARRAY);
- exec->last_draw_method = method;
- }
-}
-
-
#if FEATURE_beginend
void vbo_exec_vtx_flush( struct vbo_exec_context *exec, GLboolean unmap );