svn merge ^/branches/released .

6 files changed, 13 insertions, 23 deletions

diff --git a/mesalib/src/mapi/glapi/gen/Makefile b/mesalib/src/mapi/glapi/gen/Makefile
index 1e4fee6aa..867cc3e29 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile
+++ b/mesalib/src/mapi/glapi/gen/Makefile
@@ -41,8 +41,6 @@ XORG_GLX_DIR = $(XORG_BASE)/glx
 XORG_GLAPI_DIR = $(XORG_BASE)/glx

 

 XORG_GLAPI_FILES = \

-	$(XORG_GLAPI_DIR)/glapi.h \

-	$(XORG_GLAPI_DIR)/glapi.c \

 	$(XORG_GLAPI_DIR)/glapi_getproc.c \

 	$(XORG_GLAPI_DIR)/glapi_nop.c \

 	$(XORG_GLAPI_DIR)/glthread.c \

@@ -50,7 +48,6 @@ XORG_GLAPI_FILES = \
 

 XORG_GLAPI_OUTPUTS = \

 	$(XORG_GLAPI_DIR)/glprocs.h \

-	$(XORG_GLAPI_DIR)/glapitemp.h \

 	$(XORG_GLAPI_DIR)/glapioffsets.h \

 	$(XORG_GLAPI_DIR)/glapitable.h \

 	$(XORG_GLAPI_DIR)/glapidispatch.h

diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c
index a3cae1cbc..206c66062 100644
--- a/mesalib/src/mesa/main/get.c
+++ b/mesalib/src/mesa/main/get.c
@@ -572,7 +572,7 @@ static const struct value_desc values[] = {
    { GL_VERTEX_ARRAY_SIZE, ARRAY_INT(Vertex.Size), NO_EXTRA },

    { GL_VERTEX_ARRAY_TYPE, ARRAY_ENUM(Vertex.Type), NO_EXTRA },

    { GL_VERTEX_ARRAY_STRIDE, ARRAY_INT(Vertex.Stride), NO_EXTRA },

-   { GL_NORMAL_ARRAY, ARRAY_ENUM(Normal.Enabled), NO_EXTRA },

+   { GL_NORMAL_ARRAY, ARRAY_BOOL(Normal.Enabled), NO_EXTRA },

    { GL_NORMAL_ARRAY_TYPE, ARRAY_ENUM(Normal.Type), NO_EXTRA },

    { GL_NORMAL_ARRAY_STRIDE, ARRAY_INT(Normal.Stride), NO_EXTRA },

    { GL_COLOR_ARRAY, ARRAY_BOOL(Color.Enabled), NO_EXTRA },

@@ -582,11 +582,11 @@ static const struct value_desc values[] = {
    { GL_TEXTURE_COORD_ARRAY,

      LOC_CUSTOM, TYPE_BOOLEAN, offsetof(struct gl_client_array, Enabled), NO_EXTRA },

    { GL_TEXTURE_COORD_ARRAY_SIZE,

-     LOC_CUSTOM, TYPE_BOOLEAN, offsetof(struct gl_client_array, Size), NO_EXTRA },

+     LOC_CUSTOM, TYPE_INT, offsetof(struct gl_client_array, Size), NO_EXTRA },

    { GL_TEXTURE_COORD_ARRAY_TYPE,

-     LOC_CUSTOM, TYPE_BOOLEAN, offsetof(struct gl_client_array, Type), NO_EXTRA },

+     LOC_CUSTOM, TYPE_ENUM, offsetof(struct gl_client_array, Type), NO_EXTRA },

    { GL_TEXTURE_COORD_ARRAY_STRIDE,

-     LOC_CUSTOM, TYPE_BOOLEAN, offsetof(struct gl_client_array, Stride), NO_EXTRA },

+     LOC_CUSTOM, TYPE_INT, offsetof(struct gl_client_array, Stride), NO_EXTRA },

 

    /* GL_ARB_ES2_compatibility */

    { GL_SHADER_COMPILER, CONST(1), extra_ARB_ES2_compatibility },

@@ -1367,7 +1367,7 @@ void _mesa_init_get_hash(struct gl_context *ctx)
 static void

 find_custom_value(struct gl_context *ctx, const struct value_desc *d, union value *v)

 {

-   struct gl_buffer_object *buffer_obj;

+   struct gl_buffer_object **buffer_obj;

    struct gl_client_array *array;

    GLuint unit, *p;

 

@@ -1569,9 +1569,9 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu
    case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:

    case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:

    case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:

-      buffer_obj = (struct gl_buffer_object *)

+      buffer_obj = (struct gl_buffer_object **)

 	 ((char *) ctx->Array.ArrayObj + d->offset);

-      v->value_int = buffer_obj->Name;

+      v->value_int = (*buffer_obj)->Name;

       break;

    case GL_ARRAY_BUFFER_BINDING_ARB:

       v->value_int = ctx->Array.ArrayBufferObj->Name;

diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index c6678b85c..94e449ae8 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -3022,11 +3022,6 @@ struct gl_matrix_stack
                                            _NEW_POINT |		\

                                            _NEW_PROGRAM |	\

                                            _NEW_MODELVIEW)

-

-#define _MESA_NEW_NEED_NORMALS            (_NEW_LIGHT |		\

-                                           _NEW_TEXTURE)

-

-#define _MESA_NEW_TRANSFER_STATE          (_NEW_PIXEL)

 /*@}*/

 

 

diff --git a/mesalib/src/mesa/main/pixel.c b/mesalib/src/mesa/main/pixel.c
index 55e368c36..5a14eb2d4 100644
--- a/mesalib/src/mesa/main/pixel.c
+++ b/mesalib/src/mesa/main/pixel.c
@@ -617,7 +617,7 @@ update_image_transfer_state(struct gl_context *ctx)
  */

 void _mesa_update_pixel( struct gl_context *ctx, GLuint new_state )

 {

-   if (new_state & _MESA_NEW_TRANSFER_STATE)

+   if (new_state & _NEW_PIXEL)

       update_image_transfer_state(ctx);

 }

 

diff --git a/mesalib/src/mesa/main/state.c b/mesalib/src/mesa/main/state.c
index f50f2af1e..70f8154e8 100644
--- a/mesalib/src/mesa/main/state.c
+++ b/mesalib/src/mesa/main/state.c
@@ -602,7 +602,7 @@ _mesa_update_state_locked( struct gl_context *ctx )
    if (new_state & (_NEW_STENCIL | _NEW_BUFFERS))

       _mesa_update_stencil( ctx );

 

-   if (new_state & _MESA_NEW_TRANSFER_STATE)

+   if (new_state & _NEW_PIXEL)

       _mesa_update_pixel( ctx, new_state );

 

    if (new_state & _DD_NEW_SEPARATE_SPECULAR)

diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index f4d7a4212..351dccc16 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -55,9 +55,7 @@
  * In particular, we care about pixel transfer state and buffer state

  * (such as glReadBuffer to make sure we read from the right renderbuffer).

  */

-#define NEW_COPY_TEX_STATE (_MESA_NEW_TRANSFER_STATE | \

-                            _NEW_BUFFERS | \

-                            _NEW_PIXEL)

+#define NEW_COPY_TEX_STATE (_NEW_BUFFERS | _NEW_PIXEL)

 

 

 

@@ -2434,7 +2432,7 @@ teximage(struct gl_context *ctx, GLuint dims,
          return;   /* error was recorded */

       }

 

-      if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)

+      if (ctx->NewState & _NEW_PIXEL)

 	 _mesa_update_state(ctx);

 

       texObj = _mesa_get_current_tex_object(ctx, target);

@@ -2580,7 +2578,7 @@ _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image)
       return;

    }

 

-   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)

+   if (ctx->NewState & _NEW_PIXEL)

       _mesa_update_state(ctx);

 

    texObj = _mesa_get_current_tex_object(ctx, target);

@@ -2637,7 +2635,7 @@ texsubimage(struct gl_context *ctx, GLuint dims, GLenum target, GLint level,
       return;

    }       

 

-   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)

+   if (ctx->NewState & _NEW_PIXEL)

       _mesa_update_state(ctx);

 

    if (subtexture_error_check(ctx, dims, target, level, xoffset, yoffset, zoffset,