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 07022b9578911eac10d5724267278c803c1d2877..55b7792b85bdd67e9f48f14142e11a053f95743a 100644 (file)
--- a/src/mesa/vbo/vbo_save.c
+++ b/src/mesa/vbo/vbo_save.c
@@ -26,18 +26,10 @@
  */
 
 
-#include "main/mtypes.h"
+#include "main/arrayobj.h"
 #include "main/bufferobj.h"
-#include "main/imports.h"
-
-#include "vbo_context.h"
-
-
-static void vbo_save_callback_init( struct gl_context *ctx )
-{
-   ctx->Driver.EndCallList = vbo_save_EndCallList;
-}
 
+#include "vbo_private.h"
 
 
 /**
@@ -51,34 +43,11 @@ void vbo_save_init( struct gl_context *ctx )
    save->ctx = ctx;
 
    vbo_save_api_init( save );
-   vbo_save_callback_init(ctx);
 
-   {
-      struct gl_client_array *arrays = save->arrays;
-      unsigned i;
+   for (gl_vertex_processing_mode vpm = VP_MODE_FF; vpm < VP_MODE_MAX; ++vpm)
+      save->VAO[vpm] = NULL;
 
-      memcpy(arrays, &vbo->currval[VBO_ATTRIB_POS],
-             VERT_ATTRIB_FF_MAX * sizeof(arrays[0]));
-      for (i = 0; i < VERT_ATTRIB_FF_MAX; ++i) {
-         struct gl_client_array *array;
-         array = &arrays[VERT_ATTRIB_FF(i)];
-         array->BufferObj = NULL;
-         _mesa_reference_buffer_object(ctx, &arrays->BufferObj,
-                                       vbo->currval[VBO_ATTRIB_POS+i].BufferObj);
-      }
-
-      memcpy(arrays + VERT_ATTRIB_GENERIC(0),
-             &vbo->currval[VBO_ATTRIB_GENERIC0],
-             VERT_ATTRIB_GENERIC_MAX * sizeof(arrays[0]));
-
-      for (i = 0; i < VERT_ATTRIB_GENERIC_MAX; ++i) {
-         struct gl_client_array *array;
-         array = &arrays[VERT_ATTRIB_GENERIC(i)];
-         array->BufferObj = NULL;
-         _mesa_reference_buffer_object(ctx, &array->BufferObj,
-                           vbo->currval[VBO_ATTRIB_GENERIC0+i].BufferObj);
-      }
-   }
+   save->no_current_update = false;
 
    ctx->Driver.CurrentSavePrimitive = PRIM_OUTSIDE_BEGIN_END;
 }
@@ -88,37 +57,19 @@ void vbo_save_destroy( struct gl_context *ctx )
 {
    struct vbo_context *vbo = vbo_context(ctx);
    struct vbo_save_context *save = &vbo->save;
-   GLuint i;
+
+   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->refcount == 0 ) {
-         _mesa_reference_buffer_object(ctx,
-                                       &save->vertex_store->bufferobj, NULL);
-         free(save->vertex_store);
-         save->vertex_store = NULL;
-      }
    }
-
-   for (i = 0; i < VBO_ATTRIB_MAX; i++) {
-      _mesa_reference_buffer_object(ctx, &save->arrays[i].BufferObj, NULL);
+   if (save->vertex_store) {
+      _mesa_reference_buffer_object(ctx, &save->vertex_store->bufferobj, NULL);
+      free(save->vertex_store);
+      save->vertex_store = NULL;
    }
 }
-
-
-
-
-/* Note that this can occur during the playback of a display list:
- */
-void vbo_save_fallback( struct gl_context *ctx, GLboolean fallback )
-{
-   struct vbo_save_context *save = &vbo_context(ctx)->save;
-
-   if (fallback)
-      save->replay_flags |= VBO_SAVE_FALLBACK;
-   else
-      save->replay_flags &= ~VBO_SAVE_FALLBACK;
-}