Merge remote-tracking branch 'origin/released'

Conflicts:
	apps/xwininfo/configure.ac
	apps/xwininfo/xwininfo.c
	fontconfig/src/fcmatch.c
	mesalib/include/GL/internal/dri_interface.h
	mesalib/src/glsl/main.cpp
	mesalib/src/mesa/main/pack.c
	mesalib/src/mesa/main/renderbuffer.c
	mesalib/src/mesa/main/renderbuffer.h
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mesalib/src/mesa/state_tracker/st_draw.c
	mesalib/src/mesa/state_tracker/st_format.c
	pixman/configure.ac
	pixman/pixman/pixman-arm-neon-asm.S
	pixman/test/blitters-test.c

1 files changed, 0 insertions, 23 deletions

diff --git a/mesalib/src/mesa/main/renderbuffer.c b/mesalib/src/mesa/main/renderbuffer.c
index af3029499..8733853cb 100644
--- a/mesalib/src/mesa/main/renderbuffer.c
+++ b/mesalib/src/mesa/main/renderbuffer.c
@@ -2567,26 +2567,3 @@ _mesa_reference_renderbuffer(struct gl_renderbuffer **ptr,
       *ptr = rb;

    }

 }

-

-

-/**

- * Create a new combined depth/stencil renderbuffer for implementing

- * the GL_EXT_packed_depth_stencil extension.

- * \return new depth/stencil renderbuffer

- */

-struct gl_renderbuffer *

-_mesa_new_depthstencil_renderbuffer(struct gl_context *ctx, GLuint name)

-{

-   struct gl_renderbuffer *dsrb;

-

-   dsrb = _mesa_new_renderbuffer(ctx, name);

-   if (!dsrb)

-      return NULL;

-

-   /* init fields not covered by _mesa_new_renderbuffer() */

-   dsrb->InternalFormat = GL_DEPTH24_STENCIL8_EXT;

-   dsrb->Format = MESA_FORMAT_Z24_S8;

-   dsrb->AllocStorage = _mesa_soft_renderbuffer_storage;

-

-   return dsrb;

-}