Merge remote-tracking branch 'origin/released'

Conflicts:
	libxcb/src/xcb_in.c
	mesalib/src/mesa/main/formats.c
	mesalib/src/mesa/main/mtypes.h
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
	mesalib/src/mesa/state_tracker/st_extensions.c
	mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
	mesalib/src/mesa/swrast/s_context.c
	mesalib/src/mesa/swrast/s_readpix.c

1 files changed, 8 insertions, 24 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c b/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
index 59c59e113..6bb36b9b5 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
@@ -229,13 +229,6 @@ st_bufferobj_data(struct gl_context *ctx,
 

 

 /**

- * Dummy data whose's pointer is used for zero size buffers or ranges.

- */

-static long st_bufferobj_zero_length = 0;

-

-

-

-/**

  * Called via glMapBufferRange().

  */

 static void *

@@ -280,24 +273,15 @@ st_bufferobj_map_range(struct gl_context *ctx,
    assert(offset < obj->Size);

    assert(offset + length <= obj->Size);

 

-   /*

-    * We go out of way here to hide the degenerate yet valid case of zero

-    * length range from the pipe driver.

-    */

-   if (!length) {

-      obj->Pointer = &st_bufferobj_zero_length;

-   }

-   else {

-      obj->Pointer = pipe_buffer_map_range(pipe, 

-                                           st_obj->buffer,

-                                           offset, length,

-                                           flags,

-                                           &st_obj->transfer);

-      if (obj->Pointer) {

-         obj->Pointer = (ubyte *) obj->Pointer + offset;

-      }

+   obj->Pointer = pipe_buffer_map_range(pipe,

+                                        st_obj->buffer,

+                                        offset, length,

+                                        flags,

+                                        &st_obj->transfer);

+   if (obj->Pointer) {

+      obj->Pointer = (ubyte *) obj->Pointer + offset;

    }

-   

+

    if (obj->Pointer) {

       obj->Offset = offset;

       obj->Length = length;