Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glcpp/glcpp.c
	mesalib/src/mesa/drivers/dri/common/dri_util.c
	mesalib/src/mesa/drivers/dri/common/spantmp2.h
	mesalib/src/mesa/drivers/dri/common/utils.c
	mesalib/src/mesa/drivers/dri/swrast/swrast.c
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/state_tracker/st_extensions.c
	mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
	pixman/configure.ac
	pixman/pixman/pixman-arm-neon-asm.S
	pixman/test/Makefile.am
	pixman/test/utils.c
	pixman/test/utils.h

1 files changed, 11 insertions, 1 deletions

diff --git a/mesalib/src/mesa/drivers/dri/common/dri_util.c b/mesalib/src/mesa/drivers/dri/common/dri_util.c
index 6d3dd0a2c..adc6716c6 100644
--- a/mesalib/src/mesa/drivers/dri/common/dri_util.c
+++ b/mesalib/src/mesa/drivers/dri/common/dri_util.c
@@ -418,6 +418,7 @@ driCreateNewDrawable(__DRIscreen *psp, const __DRIconfig *config,
      * supported either.

      */

     (void) attrs;

+    (void) renderType;

 

     pdp = malloc(sizeof *pdp);

     if (!pdp) {

@@ -594,8 +595,10 @@ driDestroyContext(__DRIcontext *pcp)
 /**

  * Create the per-drawable private driver information.

  * 

- * \param render_type   Type of rendering target.  \c GLX_RGBA is the only

+ * \param render_type   Type of rendering target.  \c GLX_RGBA_TYPE is the only

  *                      type likely to ever be supported for direct-rendering.

+ *                      However, \c GLX_RGBA_FLOAT_TYPE_ARB may eventually be

+ *                      supported by some drivers.

  * \param shared        Context with which to share textures, etc. or NULL

  *

  * \returns An opaque pointer to the per-context private information on

@@ -616,6 +619,8 @@ driCreateNewContext(__DRIscreen *psp, const __DRIconfig *config,
     __DRIcontext *pcp;

     void * const shareCtx = (shared != NULL) ? shared->driverPrivate : NULL;

 

+    (void) render_type;

+

     pcp = malloc(sizeof *pcp);

     if (!pcp)

 	return NULL;

@@ -700,6 +705,9 @@ dri2CreateNewContext(__DRIscreen *screen, const __DRIconfig *config,
 static int

 driCopyContext(__DRIcontext *dest, __DRIcontext *src, unsigned long mask)

 {

+    (void) dest;

+    (void) src;

+    (void) mask;

     return GL_FALSE;

 }

 

@@ -806,6 +814,8 @@ driCreateNewScreen(int scrn,
     static const __DRIextension *emptyExtensionList[] = { NULL };

     __DRIscreen *psp;

 

+    (void) loaderPrivate;

+

     if (driDriverAPI.InitScreen == NULL)

 	return NULL;