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, 25 insertions, 14 deletions

diff --git a/mesalib/src/mesa/tnl/t_draw.c b/mesalib/src/mesa/tnl/t_draw.c
index a2ca6225b..f3f324314 100644
--- a/mesalib/src/mesa/tnl/t_draw.c
+++ b/mesalib/src/mesa/tnl/t_draw.c
@@ -280,10 +280,9 @@ static void bind_inputs( struct gl_context *ctx,
 	 if (!inputs[i]->BufferObj->Pointer) {

 	    bo[*nr_bo] = inputs[i]->BufferObj;

 	    (*nr_bo)++;

-	    ctx->Driver.MapBuffer(ctx, 

-				  GL_ARRAY_BUFFER,

-				  GL_READ_ONLY_ARB,

-				  inputs[i]->BufferObj);

+	    ctx->Driver.MapBufferRange(ctx, 0, inputs[i]->BufferObj->Size,

+				       GL_MAP_READ_BIT,

+				       inputs[i]->BufferObj);

 	    

 	    assert(inputs[i]->BufferObj->Pointer);

 	 }

@@ -348,18 +347,32 @@ static void bind_indices( struct gl_context *ctx,
    }

 

    if (ib->obj->Name && !ib->obj->Pointer) {

+      unsigned map_size;

+

+      switch (ib->type) {

+      case GL_UNSIGNED_BYTE:

+	 map_size = ib->count * sizeof(GLubyte);

+	 break;

+      case GL_UNSIGNED_SHORT:

+	 map_size = ib->count * sizeof(GLushort);

+	 break;

+      case GL_UNSIGNED_INT:

+	 map_size = ib->count * sizeof(GLuint);

+	 break;

+      default:

+	 assert(0);

+	 map_size = 0;

+      }

+

       bo[*nr_bo] = ib->obj;

       (*nr_bo)++;

-      ctx->Driver.MapBuffer(ctx, 

-			    GL_ELEMENT_ARRAY_BUFFER,

-			    GL_READ_ONLY_ARB,

-			    ib->obj);

-

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

+				       GL_MAP_READ_BIT, ib->obj);

       assert(ib->obj->Pointer);

+   } else {

+      ptr = ib->ptr;

    }

 

-   ptr = ADD_POINTERS(ib->obj->Pointer, ib->ptr);

-

    if (ib->type == GL_UNSIGNED_INT && VB->Primitive[0].basevertex == 0) {

       VB->Elts = (GLuint *) ptr;

    }

@@ -402,9 +415,7 @@ static void unmap_vbos( struct gl_context *ctx,
 {

    GLuint i;

    for (i = 0; i < nr_bo; i++) { 

-      ctx->Driver.UnmapBuffer(ctx, 

-			      0, /* target -- I don't see why this would be needed */

-			      bo[i]);

+      ctx->Driver.UnmapBuffer(ctx, bo[i]);

    }

 }