mesa: Branch 'vbo-0.2'

[Aapo Tahkola]

 src/mesa/vbo/vbo_exec_array.c |    2 +-
 src/mesa/vbo/vbo_save_api.c   |    2 +-
 src/mesa/vbo/vbo_split_copy.c |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree 2cb3594af9cd1434aa2c408cd6f8d51bcd12e8ea (from fea6e5a69588012cf0373f36dff99a45b0202f55)
Author: Aapo Tahkola <aapo at aapo-desktop.(none)>
Date:   Thu Jan 18 04:17:56 2007 +0200

    Fix invalid enums passed to MapBuffer

diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index cec353c..e0a6240 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -334,7 +334,7 @@ vbo_exec_DrawElements(GLenum mode, GLsiz
    if (ctx->Array.ElementArrayBufferObj->Name) {
       const GLvoid *map = ctx->Driver.MapBuffer(ctx,
 						 GL_ELEMENT_ARRAY_BUFFER_ARB,
-						 GL_DYNAMIC_READ_ARB,
+						 GL_READ_ONLY,
 						 ctx->Array.ElementArrayBufferObj);
 
       max_index = get_max_index(count, type, ADD_POINTERS(map, indices));
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index f718cdd..c08fd1f 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -198,7 +198,7 @@ static GLfloat *map_vertex_store( GLcont
    assert(!vertex_store->buffer);
    vertex_store->buffer = (GLfloat *)ctx->Driver.MapBuffer(ctx, 
 							   GL_ARRAY_BUFFER_ARB,	/* not used */
-							   GL_STATIC_DRAW_ARB, /* not used */
+							   GL_WRITE_ONLY, /* not used */
 							   vertex_store->bufferobj); 
 
    assert(vertex_store->buffer);
diff --git a/src/mesa/vbo/vbo_split_copy.c b/src/mesa/vbo/vbo_split_copy.c
index 08eae2d..fff733c 100644
--- a/src/mesa/vbo/vbo_split_copy.c
+++ b/src/mesa/vbo/vbo_split_copy.c
@@ -382,7 +382,7 @@ static void replay_init( struct copy_con
 	 if (vbo->Name && !vbo->Pointer) 
 	    ctx->Driver.MapBuffer(ctx,
 				  GL_ARRAY_BUFFER_ARB, 
-				  GL_DYNAMIC_DRAW_ARB, /* XXX */
+				  GL_WRITE_ONLY, /* XXX */
 				  vbo);
 
 	 copy->varying[j].src_ptr = ADD_POINTERS(vbo->Pointer,
@@ -399,7 +399,7 @@ static void replay_init( struct copy_con
    if (copy->ib->obj->Name && !copy->ib->obj->Pointer) 
       ctx->Driver.MapBuffer(ctx, 
 			    GL_ARRAY_BUFFER_ARB, /* XXX */
-			    GL_DYNAMIC_DRAW_ARB, /* XXX */
+			    GL_WRITE_ONLY, /* XXX */
 			    copy->ib->obj);
 
    switch (copy->ib->type) {