vbo: merge more primitive types for glBegin/End (v2)

[mesa.git] / src / mesa / vbo / vbo_save.c

diff --git a/src/mesa/vbo/vbo_save.c b/src/mesa/vbo/vbo_save.c
index 87248e10f3bc30e8b5e8ec89cbefef38bf797052..55b7792b85bdd67e9f48f14142e11a053f95743a 100644 (file)
--- a/src/mesa/vbo/vbo_save.c
+++ b/src/mesa/vbo/vbo_save.c
@@ -1,8 +1,7 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
  *
- * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -17,37 +16,26 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  *
  * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
+ *    Keith Whitwell <keithw@vmware.com>
  */
 
 
-#include "main/mtypes.h"
-#include "main/dlist.h"
-#include "main/vtxfmt.h"
-#include "main/imports.h"
+#include "main/arrayobj.h"
+#include "main/bufferobj.h"
 
-#include "vbo_context.h"
+#include "vbo_private.h"
 
 
-
-static void vbo_save_callback_init( GLcontext *ctx )
-{
-   ctx->Driver.NewList = vbo_save_NewList;
-   ctx->Driver.EndList = vbo_save_EndList;
-   ctx->Driver.SaveFlushVertices = vbo_save_SaveFlushVertices;
-   ctx->Driver.BeginCallList = vbo_save_BeginCallList;
-   ctx->Driver.EndCallList = vbo_save_EndCallList;
-   ctx->Driver.NotifySaveBegin = vbo_save_NotifyBegin;
-}
-
-
-
-void vbo_save_init( GLcontext *ctx )
+/**
+ * Called at context creation time.
+ */
+void vbo_save_init( struct gl_context *ctx )
 {
    struct vbo_context *vbo = vbo_context(ctx);
    struct vbo_save_context *save = &vbo->save;
@@ -55,35 +43,33 @@ void vbo_save_init( GLcontext *ctx )
    save->ctx = ctx;
 
    vbo_save_api_init( save );
-   vbo_save_callback_init(ctx);
 
-   {
-      struct gl_client_array *arrays = save->arrays;
-      memcpy(arrays,      vbo->legacy_currval,  16 * sizeof(arrays[0]));
-      memcpy(arrays + 16, vbo->generic_currval, 16 * sizeof(arrays[0]));
-   }
+   for (gl_vertex_processing_mode vpm = VP_MODE_FF; vpm < VP_MODE_MAX; ++vpm)
+      save->VAO[vpm] = NULL;
 
-   ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN;
-}
+   save->no_current_update = false;
 
-
-void vbo_save_destroy( GLcontext *ctx )
-{
+   ctx->Driver.CurrentSavePrimitive = PRIM_OUTSIDE_BEGIN_END;
 }
 
 
-
-
-/* Note that this can occur during the playback of a display list:
- */
-void vbo_save_fallback( GLcontext *ctx, GLboolean fallback )
+void vbo_save_destroy( struct gl_context *ctx )
 {
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-
-   if (fallback)
-      save->replay_flags |= VBO_SAVE_FALLBACK;
-   else
-      save->replay_flags &= ~VBO_SAVE_FALLBACK;
-}
+   struct vbo_context *vbo = vbo_context(ctx);
+   struct vbo_save_context *save = &vbo->save;
 
+   for (gl_vertex_processing_mode vpm = VP_MODE_FF; vpm < VP_MODE_MAX; ++vpm)
+      _mesa_reference_vao(ctx, &save->VAO[vpm], NULL);
 
+   if (save->prim_store) {
+      if ( --save->prim_store->refcount == 0 ) {
+         free(save->prim_store);
+         save->prim_store = NULL;
+      }
+   }
+   if (save->vertex_store) {
+      _mesa_reference_buffer_object(ctx, &save->vertex_store->bufferobj, NULL);
+      free(save->vertex_store);
+      save->vertex_store = NULL;
+   }
+}