Merge remote-tracking branch 'mesa/12.0' into marshmallow-x86

Conflicts:
	src/egl/drivers/dri2/platform_android.c
	src/mesa/drivers/dri/i965/intel_syncobj.c

diff --cc configure.ac
Simple merge

diff --cc src/egl/drivers/dri2/egl_dri2.c
Simple merge

diff --cc src/egl/drivers/dri2/platform_android.c
index 9f598c9,31833c9..940ed54
--- 1/src/egl/drivers/dri2/platform_android.c
--- 2/src/egl/drivers/dri2/platform_android.c
+++ b/src/egl/drivers/dri2/platform_android.c
@@@ -288,15 -288,12 +296,17 @@@ droid_create_surface(_EGLDriver *drv, _
  
     config = dri2_get_dri_config(dri2_conf, EGL_WINDOW_BIT,
                                  dri2_surf->base.GLColorspace);
+    if (!config)
+       goto cleanup_surface;
  
 -   dri2_surf->dri_drawable =
 -      (*dri2_dpy->dri2->createNewDrawable)(dri2_dpy->dri_screen, config,
 -                                           dri2_surf);
 +   if (dri2_dpy->dri2) {
 +      dri2_surf->dri_drawable =
 +         dri2_dpy->dri2->createNewDrawable(dri2_dpy->dri_screen, config, dri2_surf);
 +   } else {
 +      dri2_surf->dri_drawable =
 +         dri2_dpy->swrast->createNewDrawable(dri2_dpy->dri_screen, config, dri2_surf);
 +   }
 +
     if (dri2_surf->dri_drawable == NULL) {
        _eglError(EGL_BAD_ALLOC, "dri2->createNewDrawable");
        goto cleanup_surface;

diff --cc src/gallium/auxiliary/util/u_math.h
Simple merge

diff --cc src/gallium/drivers/nouveau/nvc0/nvc0_context.c
Simple merge

diff --cc src/gallium/drivers/nouveau/nvc0/nvc0_context.h
Simple merge

diff --cc src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c
Simple merge

diff --cc src/gallium/drivers/nouveau/nvc0/nve4_compute.c
Simple merge