Merge remote-tracking branch 'origin/released'

Conflicts:
	libX11/configure.ac
	mesalib/configs/linux-dri
	mesalib/docs/download.html
	mesalib/src/SConscript
	mesalib/src/mesa/main/bufferobj.c
	mesalib/src/mesa/main/bufferobj.h
	mesalib/src/mesa/main/framebuffer.c
	mesalib/src/mesa/main/renderbuffer.c
	mesalib/src/mesa/main/renderbuffer.h
	mesalib/src/mesa/main/texobj.c
	mesalib/src/mesa/program/program.c
	mesalib/src/mesa/vbo/vbo_exec_array.c
	xorg-server/dix/window.c
	xorg-server/xkb/xkb.c
	xorg-server/xkb/xkmread.c

1 files changed, 4 insertions, 8 deletions

diff --git a/mesalib/src/mesa/main/renderbuffer.c b/mesalib/src/mesa/main/renderbuffer.c
index 6ae8b1f96..08bb23cb3 100644
--- a/mesalib/src/mesa/main/renderbuffer.c
+++ b/mesalib/src/mesa/main/renderbuffer.c
@@ -2530,17 +2530,13 @@ _mesa_remove_renderbuffer(struct gl_framebuffer *fb,
  * Set *ptr to point to rb.  If *ptr points to another renderbuffer,

  * dereference that buffer first.  The new renderbuffer's refcount will

  * be incremented.  The old renderbuffer's refcount will be decremented.

+ * This is normally only called from the _mesa_reference_renderbuffer() macro

+ * when there's a real pointer change.

  */

 void

-_mesa_reference_renderbuffer(struct gl_renderbuffer **ptr,

-                             struct gl_renderbuffer *rb)

+_mesa_reference_renderbuffer_(struct gl_renderbuffer **ptr,

+                              struct gl_renderbuffer *rb)

 {

-   assert(ptr);

-   if (*ptr == rb) {

-      /* no change */

-      return;

-   }

-

    if (*ptr) {

       /* Unreference the old renderbuffer */

       GLboolean deleteFlag = GL_FALSE;