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

diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
index e6d1ab741..63b3fe94c 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
@@ -140,6 +140,9 @@ swrastFillInModes(__DRIscreen *psp,
     uint8_t stencil_bits_array[4];

     uint8_t msaa_samples_array[1];

 

+    (void) psp;

+    (void) have_back_buffer;

+

     depth_bits_array[0] = 0;

     depth_bits_array[1] = 0;

     depth_bits_array[2] = depth_bits;

@@ -220,6 +223,7 @@ static void
 dri_destroy_screen(__DRIscreen * sPriv)

 {

     TRACE;

+    (void) sPriv;

 }

 

 

@@ -283,6 +287,9 @@ swrast_alloc_front_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
 

     TRACE;

 

+    (void) ctx;

+    (void) internalFormat;

+

     rb->Data = NULL;

     rb->Width = width;

     rb->Height = height;

@@ -381,6 +388,9 @@ dri_create_buffer(__DRIscreen * sPriv,
 

     TRACE;

 

+    (void) sPriv;

+    (void) isPixmap;

+

     drawable = CALLOC_STRUCT(dri_drawable);

     if (drawable == NULL)

 	goto drawable_fail;

@@ -542,6 +552,10 @@ viewport(struct gl_context *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
     struct gl_framebuffer *draw = ctx->WinSysDrawBuffer;

     struct gl_framebuffer *read = ctx->WinSysReadBuffer;

 

+    (void) x;

+    (void) y;

+    (void) w;

+    (void) h;

     swrast_check_and_update_window_size(ctx, draw);

     swrast_check_and_update_window_size(ctx, read);

 }

@@ -614,9 +628,6 @@ InitExtensionsES2(struct gl_context *ctx)
 {

    int i;

 

-   /* Can't use driInitExtensions() since it uses extensions from

-    * main/remap_helper.h when called the first time. */

-

    for (i = 0; es2_extensions[i]; i++)

       _mesa_enable_extension(ctx, es2_extensions[i]);

 }

@@ -686,8 +697,6 @@ dri_create_context(gl_api api,
         _mesa_enable_1_5_extensions(mesaCtx);

         _mesa_enable_2_0_extensions(mesaCtx);

         _mesa_enable_2_1_extensions(mesaCtx);

-

-        driInitExtensions( mesaCtx, NULL, GL_FALSE );

         break;

     case API_OPENGLES:

         _mesa_enable_1_3_extensions(mesaCtx);