svn merge ^/branches/released .

6 files changed, 52 insertions, 30 deletions

diff --git a/mesalib/src/mesa/vbo/vbo.h b/mesalib/src/mesa/vbo/vbo.h
index b94d58f3d..37bdde9a8 100644
--- a/mesalib/src/mesa/vbo/vbo.h
+++ b/mesalib/src/mesa/vbo/vbo.h
@@ -127,6 +127,7 @@ vbo_get_minmax_index(struct gl_context *ctx, const struct _mesa_prim *prim,
 

 void vbo_use_buffer_objects(struct gl_context *ctx);

 

+void vbo_always_unmap_buffers(struct gl_context *ctx);

 

 void vbo_set_draw_func(struct gl_context *ctx, vbo_draw_func func);

 

diff --git a/mesalib/src/mesa/vbo/vbo_attrib_tmp.h b/mesalib/src/mesa/vbo/vbo_attrib_tmp.h
index 654f0eaae..198b2d85f 100644
--- a/mesalib/src/mesa/vbo/vbo_attrib_tmp.h
+++ b/mesalib/src/mesa/vbo/vbo_attrib_tmp.h
@@ -341,7 +341,7 @@ TAG(VertexAttrib1fARB)(GLuint index, GLfloat x)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR1F(VBO_ATTRIB_GENERIC0 + index, x);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 static void GLAPIENTRY

@@ -353,7 +353,7 @@ TAG(VertexAttrib1fvARB)(GLuint index, const GLfloat * v)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR1FV(VBO_ATTRIB_GENERIC0 + index, v);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 static void GLAPIENTRY

@@ -365,7 +365,7 @@ TAG(VertexAttrib2fARB)(GLuint index, GLfloat x, GLfloat y)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR2F(VBO_ATTRIB_GENERIC0 + index, x, y);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 static void GLAPIENTRY

@@ -377,7 +377,7 @@ TAG(VertexAttrib2fvARB)(GLuint index, const GLfloat * v)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR2FV(VBO_ATTRIB_GENERIC0 + index, v);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 static void GLAPIENTRY

@@ -389,7 +389,7 @@ TAG(VertexAttrib3fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR3F(VBO_ATTRIB_GENERIC0 + index, x, y, z);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 static void GLAPIENTRY

@@ -401,7 +401,7 @@ TAG(VertexAttrib3fvARB)(GLuint index, const GLfloat * v)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR3FV(VBO_ATTRIB_GENERIC0 + index, v);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 static void GLAPIENTRY

@@ -413,7 +413,7 @@ TAG(VertexAttrib4fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR4F(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 static void GLAPIENTRY

@@ -425,7 +425,7 @@ TAG(VertexAttrib4fvARB)(GLuint index, const GLfloat * v)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR4FV(VBO_ATTRIB_GENERIC0 + index, v);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 

@@ -442,7 +442,7 @@ TAG(VertexAttribI1i)(GLuint index, GLint x)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR1I(VBO_ATTRIB_GENERIC0 + index, x);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 static void GLAPIENTRY

@@ -454,7 +454,7 @@ TAG(VertexAttribI2i)(GLuint index, GLint x, GLint y)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR2I(VBO_ATTRIB_GENERIC0 + index, x, y);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 static void GLAPIENTRY

@@ -466,7 +466,7 @@ TAG(VertexAttribI3i)(GLuint index, GLint x, GLint y, GLint z)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR3I(VBO_ATTRIB_GENERIC0 + index, x, y, z);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 static void GLAPIENTRY

@@ -478,7 +478,7 @@ TAG(VertexAttribI4i)(GLuint index, GLint x, GLint y, GLint z, GLint w)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR4I(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 static void GLAPIENTRY

@@ -490,7 +490,7 @@ TAG(VertexAttribI2iv)(GLuint index, const GLint *v)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR2IV(VBO_ATTRIB_GENERIC0 + index, v);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 static void GLAPIENTRY

@@ -502,7 +502,7 @@ TAG(VertexAttribI3iv)(GLuint index, const GLint *v)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR3IV(VBO_ATTRIB_GENERIC0 + index, v);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 static void GLAPIENTRY

@@ -514,7 +514,7 @@ TAG(VertexAttribI4iv)(GLuint index, const GLint *v)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR4IV(VBO_ATTRIB_GENERIC0 + index, v);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 

@@ -531,7 +531,7 @@ TAG(VertexAttribI1ui)(GLuint index, GLuint x)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR1UI(VBO_ATTRIB_GENERIC0 + index, x);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 static void GLAPIENTRY

@@ -543,7 +543,7 @@ TAG(VertexAttribI2ui)(GLuint index, GLuint x, GLuint y)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR2UI(VBO_ATTRIB_GENERIC0 + index, x, y);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 static void GLAPIENTRY

@@ -555,7 +555,7 @@ TAG(VertexAttribI3ui)(GLuint index, GLuint x, GLuint y, GLuint z)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR3UI(VBO_ATTRIB_GENERIC0 + index, x, y, z);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 static void GLAPIENTRY

@@ -567,7 +567,7 @@ TAG(VertexAttribI4ui)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR4UI(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 static void GLAPIENTRY

@@ -579,7 +579,7 @@ TAG(VertexAttribI2uiv)(GLuint index, const GLuint *v)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR2UIV(VBO_ATTRIB_GENERIC0 + index, v);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 static void GLAPIENTRY

@@ -591,7 +591,7 @@ TAG(VertexAttribI3uiv)(GLuint index, const GLuint *v)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR3UIV(VBO_ATTRIB_GENERIC0 + index, v);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 static void GLAPIENTRY

@@ -603,7 +603,7 @@ TAG(VertexAttribI4uiv)(GLuint index, const GLuint *v)
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR4UIV(VBO_ATTRIB_GENERIC0 + index, v);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 

@@ -720,7 +720,7 @@ TAG(Materialfv)(GLenum face, GLenum pname,
       MAT(VBO_ATTRIB_MAT_FRONT_DIFFUSE, 4, face, params);

       break;

    default:

-      ERROR();

+      ERROR(GL_INVALID_ENUM);

       return;

    }

 }

diff --git a/mesalib/src/mesa/vbo/vbo_exec.h b/mesalib/src/mesa/vbo/vbo_exec.h
index 2531f20f5..c8e509285 100644
--- a/mesalib/src/mesa/vbo/vbo_exec.h
+++ b/mesalib/src/mesa/vbo/vbo_exec.h
@@ -143,6 +143,9 @@ struct vbo_exec_context
       const struct gl_client_array *inputs[VERT_ATTRIB_MAX];

    } array;

 

+   /* Which flags to set in vbo_exec_BeginVertices() */

+   GLbitfield begin_vertices_flags;

+

 #ifdef DEBUG

    GLint flush_call_depth;

 #endif

diff --git a/mesalib/src/mesa/vbo/vbo_exec_api.c b/mesalib/src/mesa/vbo/vbo_exec_api.c
index bb366b272..790310903 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_api.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_api.c
@@ -423,7 +423,7 @@ do {									\
 } while (0)

 

 

-#define ERROR() _mesa_error( ctx, GL_INVALID_ENUM, __FUNCTION__ )

+#define ERROR(err) _mesa_error( ctx, err, __FUNCTION__ )

 #define TAG(x) vbo_##x

 

 #include "vbo_attrib_tmp.h"

@@ -839,6 +839,19 @@ void vbo_use_buffer_objects(struct gl_context *ctx)
 }

 

 

+/**

+ * If this function is called, all VBO buffers will be unmapped when

+ * we flush.

+ * Otherwise, if a simple command like glColor3f() is called and we flush,

+ * the current VBO may be left mapped.

+ */

+void

+vbo_always_unmap_buffers(struct gl_context *ctx)

+{

+   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;

+   exec->begin_vertices_flags |= FLUSH_STORED_VERTICES;

+}

+

 

 void vbo_exec_vtx_init( struct vbo_exec_context *exec )

 {

@@ -894,6 +907,8 @@ void vbo_exec_vtx_init( struct vbo_exec_context *exec )
    }

 

    exec->vtx.vertex_size = 0;

+

+   exec->begin_vertices_flags = FLUSH_UPDATE_CURRENT;

 }

 

 

@@ -942,7 +957,9 @@ void vbo_exec_BeginVertices( struct gl_context *ctx )
    vbo_exec_vtx_map( exec );

 

    assert((ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT) == 0);

-   ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;

+   assert(exec->begin_vertices_flags);

+

+   ctx->Driver.NeedFlush |= exec->begin_vertices_flags;

 }

 

 

@@ -1045,7 +1062,7 @@ VertexAttrib4f_nopos(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
    if (index < MAX_VERTEX_GENERIC_ATTRIBS)

       ATTR(VBO_ATTRIB_GENERIC0 + index, 4, x, y, z, w);

    else

-      ERROR();

+      ERROR(GL_INVALID_VALUE);

 }

 

 void GLAPIENTRY

diff --git a/mesalib/src/mesa/vbo/vbo_exec_array.c b/mesalib/src/mesa/vbo/vbo_exec_array.c
index 1d7fe4d3f..78aba9039 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_array.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_array.c
@@ -52,6 +52,7 @@ check_buffers_are_unmapped(const struct gl_client_array **inputs)
       if (inputs[i]) {

          struct gl_buffer_object *obj = inputs[i]->BufferObj;

          assert(!_mesa_bufferobj_mapped(obj));

+         (void) obj;

       }

    }

 #endif

diff --git a/mesalib/src/mesa/vbo/vbo_save_api.c b/mesalib/src/mesa/vbo/vbo_save_api.c
index 90ff39e55..d10d44139 100644
--- a/mesalib/src/mesa/vbo/vbo_save_api.c
+++ b/mesalib/src/mesa/vbo/vbo_save_api.c
@@ -633,7 +633,7 @@ static void _save_reset_vertex( struct gl_context *ctx )
 

 

 

-#define ERROR()   _mesa_compile_error( ctx, GL_INVALID_ENUM, __FUNCTION__ );

+#define ERROR(err)   _mesa_compile_error( ctx, GL_INVALID_ENUM, __FUNCTION__ );

 

 

 /* Only one size for each attribute may be active at once.  Eg. if

@@ -646,11 +646,11 @@ static void _save_reset_vertex( struct gl_context *ctx )
 do {								\

    struct vbo_save_context *save = &vbo_context(ctx)->save;	\

 								\

-   if (save->active_sz[A] != N)				\

+   if (save->active_sz[A] != N)					\

       save_fixup_vertex(ctx, A, N);				\

 								\

    {								\

-      GLfloat *dest = save->attrptr[A];			\

+      GLfloat *dest = save->attrptr[A];				\

       if (N>0) dest[0] = V0;					\

       if (N>1) dest[1] = V1;					\

       if (N>2) dest[2] = V2;					\

@@ -663,7 +663,7 @@ do {								\
       for (i = 0; i < save->vertex_size; i++)			\

 	 save->buffer_ptr[i] = save->vertex[i];			\

 								\

-      save->buffer_ptr += save->vertex_size;				\

+      save->buffer_ptr += save->vertex_size;			\

 								\

       if (++save->vert_count >= save->max_vert)			\

 	 _save_wrap_filled_vertex( ctx );			\