Merge remote-tracking branch 'origin/released'

Conflicts:
	apps/xwininfo/configure.ac
	apps/xwininfo/xwininfo.c
	libX11/configure.ac
	libX11/specs/libX11/AppC.xml
	libX11/specs/libX11/AppD.xml
	libX11/specs/libX11/CH03.xml
	libX11/specs/libX11/CH04.xml
	libX11/specs/libX11/CH05.xml
	libX11/specs/libX11/CH06.xml
	libX11/specs/libX11/CH07.xml
	libX11/specs/libX11/CH08.xml
	libX11/specs/libX11/CH09.xml
	libX11/specs/libX11/CH11.xml
	libX11/specs/libX11/CH12.xml
	libX11/specs/libX11/CH13.xml
	libX11/specs/libX11/CH14.xml
	libX11/specs/libX11/CH15.xml
	libX11/specs/libX11/CH16.xml
	libxcb/configure.ac
	libxcb/src/c_client.py
	libxcb/src/xcb_auth.c
	libxcb/src/xcb_util.c
	mesalib/common.py
	mesalib/configs/linux-dri
	mesalib/docs/GL3.txt
	mesalib/docs/download.html
	mesalib/docs/install.html
	mesalib/include/GL/internal/dri_interface.h
	mesalib/scons/custom.py
	mesalib/scons/gallium.py
	mesalib/src/gallium/auxiliary/util/u_math.h
	mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glcpp/glcpp-parse.y
	mesalib/src/glsl/glsl_parser_extras.cpp
	mesalib/src/glsl/glsl_parser_extras.h
	mesalib/src/glsl/ir.cpp
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/ir_clone.cpp
	mesalib/src/glsl/ir_print_visitor.cpp
	mesalib/src/glsl/ir_validate.cpp
	mesalib/src/glsl/linker.cpp
	mesalib/src/glsl/main.cpp
	mesalib/src/glsl/opt_tree_grafting.cpp
	mesalib/src/mapi/glapi/gen/Makefile
	mesalib/src/mapi/glapi/gen/gl_XML.py
	mesalib/src/mapi/glapi/gen/gl_table.py
	mesalib/src/mapi/glapi/glapi_mapi_tmp.h
	mesalib/src/mapi/glapi/glapi_sparc.S
	mesalib/src/mapi/glapi/glapi_x86-64.S
	mesalib/src/mapi/glapi/glapi_x86.S
	mesalib/src/mapi/glapi/glapitemp.h
	mesalib/src/mapi/glapi/glprocs.h
	mesalib/src/mapi/mapi/u_thread.c
	mesalib/src/mapi/mapi/u_thread.h
	mesalib/src/mesa/SConscript
	mesalib/src/mesa/drivers/common/driverfuncs.c
	mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c
	mesalib/src/mesa/main/api_arrayelt.c
	mesalib/src/mesa/main/bufferobj.c
	mesalib/src/mesa/main/compiler.h
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/dlist.c
	mesalib/src/mesa/main/enums.c
	mesalib/src/mesa/main/es_generator.py
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/imports.h
	mesalib/src/mesa/main/mtypes.h
	mesalib/src/mesa/main/pbo.c
	mesalib/src/mesa/main/remap_helper.h
	mesalib/src/mesa/main/shared.c
	mesalib/src/mesa/main/texgetimage.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/program/prog_optimize.c
	mesalib/src/mesa/program/register_allocate.c
	mesalib/src/mesa/program/register_allocate.h
	mesalib/src/mesa/sources.mak
	mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mesalib/src/mesa/state_tracker/st_texture.h
	mesalib/src/mesa/swrast/s_context.c
	mesalib/src/mesa/tnl/t_draw.c
	mesalib/src/mesa/vbo/vbo_exec_array.c
	mesalib/src/mesa/vbo/vbo_save_api.c
	pixman/pixman/pixman-arm-common.h
	pixman/pixman/pixman-fast-path.c
	pixman/pixman/pixman-inlines.h
	pixman/test/Makefile.am
	pixman/test/utils.c
	pixman/test/utils.h
	xorg-server/configure.ac
	xorg-server/fb/fbblt.c
	xorg-server/hw/xquartz/darwin.c
	xorg-server/xkeyboard-config/symbols/de

1 files changed, 37 insertions, 23 deletions

diff --git a/mesalib/src/mesa/vbo/vbo_exec_array.c b/mesalib/src/mesa/vbo/vbo_exec_array.c
index ea96761e7..5e34a2305 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_array.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_array.c
@@ -95,10 +95,25 @@ vbo_get_minmax_index(struct gl_context *ctx,
    GLuint i;

 

    if (_mesa_is_bufferobj(ib->obj)) {

-      const GLvoid *map =

-         ctx->Driver.MapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER_ARB,

-                               GL_READ_ONLY, ib->obj);

-      indices = ADD_POINTERS(map, ib->ptr);

+      unsigned map_size;

+

+      switch (ib->type) {

+      case GL_UNSIGNED_INT:

+	 map_size = count * sizeof(GLuint);

+	 break;

+      case GL_UNSIGNED_SHORT:

+	 map_size = count * sizeof(GLushort);

+	 break;

+      case GL_UNSIGNED_BYTE:

+	 map_size = count * sizeof(GLubyte);

+	 break;

+      default:

+	 assert(0);

+	 map_size = 0;

+      }

+

+      indices = ctx->Driver.MapBufferRange(ctx, (GLsizeiptr) ib->ptr, map_size,

+					   GL_MAP_READ_BIT, ib->obj);

    } else {

       indices = ib->ptr;

    }

@@ -176,7 +191,7 @@ vbo_get_minmax_index(struct gl_context *ctx,
    }

 

    if (_mesa_is_bufferobj(ib->obj)) {

-      ctx->Driver.UnmapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER_ARB, ib->obj);

+      ctx->Driver.UnmapBuffer(ctx, ib->obj);

    }

 }

 

@@ -196,8 +211,8 @@ check_array_data(struct gl_context *ctx, struct gl_client_array *array,
          if (!array->BufferObj->Pointer) {

             /* need to map now */

             array->BufferObj->Pointer =

-               ctx->Driver.MapBuffer(ctx, GL_ARRAY_BUFFER_ARB,

-                                     GL_READ_ONLY, array->BufferObj);

+               ctx->Driver.MapBufferRange(ctx, 0, array->BufferObj->Size,

+					  GL_MAP_READ_BIT, array->BufferObj);

          }

          data = ADD_POINTERS(data, array->BufferObj->Pointer);

       }

@@ -238,7 +253,7 @@ unmap_array_buffer(struct gl_context *ctx, struct gl_client_array *array)
    if (array->Enabled &&

        _mesa_is_bufferobj(array->BufferObj) &&

        _mesa_bufferobj_mapped(array->BufferObj)) {

-      ctx->Driver.UnmapBuffer(ctx, GL_ARRAY_BUFFER_ARB, array->BufferObj);

+      ctx->Driver.UnmapBuffer(ctx, array->BufferObj);

    }

 }

 

@@ -256,10 +271,10 @@ check_draw_elements_data(struct gl_context *ctx, GLsizei count, GLenum elemType,
    GLint i, k;

 

    if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {

-      elemMap = ctx->Driver.MapBuffer(ctx,

-                                      GL_ELEMENT_ARRAY_BUFFER_ARB,

-                                      GL_READ_ONLY,

-                                      ctx->Array.ElementArrayBufferObj);

+      elemMap = ctx->Driver.MapBufferRange(ctx, 0,

+					   ctx->Array.ElementArrayBufferObj->Size,

+					   GL_MAP_READ_BIT,

+					   ctx->Array.ElementArrayBufferObj);

       elements = ADD_POINTERS(elements, elemMap);

    }

 

@@ -296,8 +311,7 @@ check_draw_elements_data(struct gl_context *ctx, GLsizei count, GLenum elemType,
    }

 

    if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {

-      ctx->Driver.UnmapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER_ARB,

-			      ctx->Array.ElementArrayBufferObj);

+      ctx->Driver.UnmapBuffer(ctx, ctx->Array.ElementArrayBufferObj);

    }

 

    unmap_array_buffer(ctx, &arrayObj->Vertex);

@@ -351,8 +365,8 @@ print_draw_arrays(struct gl_context *ctx,
 	     bufName);

 

       if (bufName) {

-         GLubyte *p = ctx->Driver.MapBuffer(ctx, GL_ARRAY_BUFFER_ARB,

-                                            GL_READ_ONLY_ARB, bufObj);

+         GLubyte *p = ctx->Driver.MapBufferRange(ctx, 0, bufObj->Size,

+						 GL_MAP_READ_BIT, bufObj);

          int offset = (int) (GLintptr) exec->array.inputs[i]->Ptr;

          float *f = (float *) (p + offset);

          int *k = (int *) f;

@@ -364,7 +378,7 @@ print_draw_arrays(struct gl_context *ctx,
          for (i = 0; i < n; i++) {

             printf("    float[%d] = 0x%08x %f\n", i, k[i], f[i]);

          }

-         ctx->Driver.UnmapBuffer(ctx, GL_ARRAY_BUFFER_ARB, bufObj);

+         ctx->Driver.UnmapBuffer(ctx, bufObj);

       }

    }

 }

@@ -715,10 +729,11 @@ vbo_exec_DrawArraysInstanced(GLenum mode, GLint start, GLsizei count,
 static void

 dump_element_buffer(struct gl_context *ctx, GLenum type)

 {

-   const GLvoid *map = ctx->Driver.MapBuffer(ctx,

-                                             GL_ELEMENT_ARRAY_BUFFER_ARB,

-                                             GL_READ_ONLY,

-                                             ctx->Array.ElementArrayBufferObj);

+   const GLvoid *map =

+      ctx->Driver.MapBufferRange(ctx, 0,

+				 ctx->Array.ElementArrayBufferObj->Size,

+				 GL_MAP_READ_BIT,

+				 ctx->Array.ElementArrayBufferObj);

    switch (type) {

    case GL_UNSIGNED_BYTE:

       {

@@ -760,8 +775,7 @@ dump_element_buffer(struct gl_context *ctx, GLenum type)
       ;

    }

 

-   ctx->Driver.UnmapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER_ARB,

-                           ctx->Array.ElementArrayBufferObj);

+   ctx->Driver.UnmapBuffer(ctx, ctx->Array.ElementArrayBufferObj);

 }