Update to mesa-11.1.0 (2015-12-15)

New features:
OpenGL 3.1 support on freedreno (a3xx, a4xx)
OpenGL 3.3 support for VMware guest VM driver
  (supported by Workstation 12 and Fusion 8).
GL_AMD_performance_monitor on nv50
GL_ARB_arrays_of_arrays on i965
GL_ARB_blend_func_extended on freedreno (a3xx)
GL_ARB_clear_texture on nv50, nvc0
GL_ARB_clip_control on freedreno/a4xx
GL_ARB_copy_image on nv50, nvc0, radeonsi
GL_ARB_depth_clamp on freedreno/a4xx
GL_ARB_fragment_layer_viewport on i965 (gen6+)
GL_ARB_gpu_shader_fp64 on r600 for Cypress/Cayman/Aruba chips
GL_ARB_gpu_shader5 on r600 for Evergreen and later chips
GL_ARB_seamless_cubemap_per_texture on freedreno/a4xx
GL_ARB_shader_clock on i965 (gen7+)
GL_ARB_shader_stencil_export on i965 (gen9+)
GL_ARB_shader_storage_buffer_object on i965
GL_ARB_shader_texture_image_samples on i965, nv50, nvc0, r600, radeonsi
GL_ARB_texture_barrier / GL_NV_texture_barrier on i965
GL_ARB_texture_buffer_range on freedreno/a3xx
GL_ARB_texture_compression_bptc on freedreno/a4xx
GL_ARB_texture_query_lod on softpipe
GL_ARB_texture_view on radeonsi and r600 (for evergeen and newer)
GL_ARB_vertex_type_2_10_10_10_rev on freedreno (a3xx, a4xx)
GL_EXT_blend_func_extended on all drivers that support the ARB version
GL_EXT_buffer_storage implemented for when ES 3.1 support is gained
GL_EXT_draw_elements_base_vertex on all drivers
GL_EXT_texture_compression_rgtc / latc on freedreno (a3xx & a4xx)
GL_KHR_debug (GLES)
GL_NV_conditional_render on freedreno
GL_OES_draw_elements_base_vertex on all drivers
EGL_KHR_create_context on softpipe, llvmpipe
EGL_KHR_gl_colorspace on softpipe, llvmpipe
new virgl gallium driver for qemu virtio-gpu
16x multisampling on i965 (gen9+)
GL_EXT_shader_samples_identical on i965.

5 files changed, 50 insertions, 54 deletions

diff --git a/graphics/MesaLib/patches/patch-configure b/graphics/MesaLib/patches/patch-configure
index 4ed6376da8c..fd42b657885 100644
--- a/graphics/MesaLib/patches/patch-configure
+++ b/graphics/MesaLib/patches/patch-configure
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.2 2015/09/11 00:03:36 tnn Exp $
+$NetBSD: patch-configure,v 1.3 2016/01/05 13:02:57 tnn Exp $
 
 Make sure toolchain can assemble SSE stuff in addition to having intrinsics.
 Add libdevq support from FreeBSD ports.
 
---- configure.orig	2015-09-04 22:02:51.000000000 +0000
+--- configure.orig	2015-12-15 14:52:26.000000000 +0000
 +++ configure
-@@ -858,6 +858,8 @@ GLPROTO_LIBS
+@@ -859,6 +859,8 @@ GLPROTO_LIBS
  GLPROTO_CFLAGS
  XLIBGL_LIBS
  XLIBGL_CFLAGS
@@ -13,9 +13,9 @@ Add libdevq support from FreeBSD ports.
 +LIBDEVQ_CFLAGS
  LIBUDEV_LIBS
  LIBUDEV_CFLAGS
- MESA_LLVM
-@@ -1154,6 +1156,8 @@ LIBDRM_CFLAGS
- LIBDRM_LIBS
+ ENABLE_SHADER_CACHE_FALSE
+@@ -1173,6 +1175,8 @@ OPENSSL_CFLAGS
+ OPENSSL_LIBS
  LIBUDEV_CFLAGS
  LIBUDEV_LIBS
 +LIBDEVQ_CFLAGS
@@ -23,15 +23,15 @@ Add libdevq support from FreeBSD ports.
  XLIBGL_CFLAGS
  XLIBGL_LIBS
  GLPROTO_CFLAGS
-@@ -5231,6 +5235,7 @@ DRI2PROTO_REQUIRED=2.6
+@@ -5281,6 +5285,7 @@ DRI2PROTO_REQUIRED=2.6
  DRI3PROTO_REQUIRED=1.0
  PRESENTPROTO_REQUIRED=1.0
  LIBUDEV_REQUIRED=151
 +LIBDEVQ_REQUIRED=0.0.2
  GLPROTO_REQUIRED=1.4.14
  LIBOMXIL_BELLAGIO_REQUIRED=0.0
- LIBVA_REQUIRED=0.35.0
-@@ -19694,7 +19699,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ LIBVA_REQUIRED=0.38.0
+@@ -19935,7 +19940,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
  #include <smmintrin.h>
  int main () {
      __m128i a = _mm_set1_epi32 (0), b = _mm_set1_epi32 (0), c;
@@ -40,7 +40,7 @@ Add libdevq support from FreeBSD ports.
      return 0;
  }
  _ACEOF
-@@ -20466,7 +20471,7 @@ _ACEOF
+@@ -20720,7 +20725,7 @@ _ACEOF
  $as_echo_n "checking if more special flags are required for pthreads... " >&6; }
          flag=no
          case ${host_os} in
@@ -49,7 +49,7 @@ Add libdevq support from FreeBSD ports.
              osf* | hpux*) flag="-D_REENTRANT";;
              solaris*)
              if test "$GCC" = "yes"; then
-@@ -21349,6 +21354,89 @@ else
+@@ -22080,6 +22085,89 @@ else
  fi
  
  
@@ -139,7 +139,7 @@ Add libdevq support from FreeBSD ports.
  if test "x$enable_dri" = xyes; then
      if test "$enable_static" = yes; then
          as_fn_error $? "Cannot use static libraries for DRI drivers" "$LINENO" 5
-@@ -22060,6 +22148,10 @@ if test "$have_sysfs" = yes; then
+@@ -22882,6 +22970,10 @@ if test "$have_sysfs" = yes; then
      DEFINES="$DEFINES -DHAVE_SYSFS"
      have_pci_id=yes
  fi
@@ -150,7 +150,7 @@ Add libdevq support from FreeBSD ports.
  
  # This is outside the case (above) so that it is invoked even for non-GLX
  # builds.
-@@ -23002,6 +23094,8 @@ fi
+@@ -23814,6 +23906,8 @@ fi
  
  if test "x$need_pci_id$have_libudev" = xyesyes; then
      GBM_PC_REQ_PRIV="libudev >= $LIBUDEV_REQUIRED"
@@ -159,7 +159,7 @@ Add libdevq support from FreeBSD ports.
  else
      GBM_PC_REQ_PRIV=""
  fi
-@@ -24558,9 +24652,6 @@ fi
+@@ -25381,9 +25475,6 @@ fi
                  CLANG_LIBDIR=${LLVM_LIBDIR}
              fi
              CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
diff --git a/graphics/MesaLib/patches/patch-src_egl_drivers_dri2_platform__drm.c b/graphics/MesaLib/patches/patch-src_egl_drivers_dri2_platform__drm.c
index 4662d7a939c..3cc288b2b51 100644
--- a/graphics/MesaLib/patches/patch-src_egl_drivers_dri2_platform__drm.c
+++ b/graphics/MesaLib/patches/patch-src_egl_drivers_dri2_platform__drm.c
@@ -1,16 +1,16 @@
-$NetBSD: patch-src_egl_drivers_dri2_platform__drm.c,v 1.1 2015/09/26 11:01:13 tnn Exp $
+$NetBSD: patch-src_egl_drivers_dri2_platform__drm.c,v 1.2 2016/01/05 13:02:57 tnn Exp $
 
 netbsd-5 build fix
 
---- src/egl/drivers/dri2/platform_drm.c.orig	2015-09-10 18:07:21.000000000 +0000
+--- src/egl/drivers/dri2/platform_drm.c.orig	2015-12-09 16:10:13.000000000 +0000
 +++ src/egl/drivers/dri2/platform_drm.c
-@@ -638,7 +638,9 @@ dri2_initialize_drm(_EGLDriver *drv, _EG
-    }
- 
-    if (fd < 0) {
+@@ -626,7 +626,9 @@ dri2_initialize_drm(_EGLDriver *drv, _EG
+       if (gbm == NULL)
+          goto cleanup;
+    } else {
 +#ifdef F_DUPFD_CLOEXEC
        fd = fcntl(gbm_device_get_fd(gbm), F_DUPFD_CLOEXEC, 3);
 +#endif
-       if (fd < 0) {
-          free(dri2_dpy);
-          return EGL_FALSE;
+       if (fd < 0)
+          goto cleanup;
+    }
diff --git a/graphics/MesaLib/patches/patch-src_loader_Makefile.in b/graphics/MesaLib/patches/patch-src_loader_Makefile.in
index 336cee7248d..fbe4e251135 100644
--- a/graphics/MesaLib/patches/patch-src_loader_Makefile.in
+++ b/graphics/MesaLib/patches/patch-src_loader_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_loader_Makefile.in,v 1.2 2015/09/26 08:45:02 tnn Exp $
+$NetBSD: patch-src_loader_Makefile.in,v 1.3 2016/01/05 13:02:57 tnn Exp $
 
 FreeBSD & DragonFly support for libdevq.
 
---- src/loader/Makefile.in.orig	2015-09-12 12:09:49.000000000 +0000
+--- src/loader/Makefile.in.orig	2015-12-15 14:52:32.000000000 +0000
 +++ src/loader/Makefile.in
-@@ -313,6 +313,8 @@ LEXLIB = @LEXLIB@
+@@ -321,6 +321,8 @@ LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBCLC_INCLUDEDIR = @LIBCLC_INCLUDEDIR@
  LIBCLC_LIBEXECDIR = @LIBCLC_LIBEXECDIR@
@@ -13,12 +13,12 @@ FreeBSD & DragonFly support for libdevq.
  LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
  LIBDRM_LIBS = @LIBDRM_LIBS@
  LIBOBJS = @LIBOBJS@
-@@ -505,7 +507,7 @@ EXTRA_DIST = SConscript
- noinst_LTLIBRARIES = libloader.la
- libloader_la_CPPFLAGS = $(DEFINES) -I$(top_srcdir)/include \
- 	-I$(top_srcdir)/src $(VISIBILITY_CFLAGS) $(LIBUDEV_CFLAGS) \
--	$(am__append_1) $(am__append_3)
-+	$(LIBDEVQ_CFLAGS) $(am__append_1) $(am__append_3)
+@@ -531,7 +533,7 @@ AM_CPPFLAGS = \
+ 	$(LIBDRM_CFLAGS) \
+ 	$(LIBUDEV_CFLAGS)
+ 
+-libloader_la_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_1)
++libloader_la_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_1) $(LIBDEVQ_CFLAGS)
  libloader_la_SOURCES = $(LOADER_C_FILES)
- libloader_la_LIBADD = $(am__append_2) $(am__append_4)
- all: all-am
+ libloader_la_LIBADD = $(am__append_2) $(am__append_3)
+ @HAVE_DRI3_TRUE@libloader_dri3_helper_la_SOURCES = \
diff --git a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_brw__context.h b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_brw__context.h
deleted file mode 100644
index 885bf05b887..00000000000
--- a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_brw__context.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_mesa_drivers_dri_i965_brw__context.h,v 1.1 2015/09/11 12:38:27 tnn Exp $
-
-Fix build on NetBSD 5.x.
-The ALIGN macro in Mesa conflicts with machine/param.h. It is easier to
-avoid it than attempting to fix the include order here.
-
---- src/mesa/drivers/dri/i965/brw_context.h.orig	2015-09-10 17:40:31.000000000 +0000
-+++ src/mesa/drivers/dri/i965/brw_context.h
-@@ -1912,7 +1912,11 @@ brw_compute_program(struct gl_compute_pr
- static inline int
- brw_register_blocks(int reg_count)
- {
-+#if 0
-    return ALIGN(reg_count, 16) / 16 - 1;
-+#else
-+   return (((reg_count + 0xF) & ~0xF) >> 4) - 1;
-+#endif
- }
- 
- static inline uint32_t
diff --git a/graphics/MesaLib/patches/patch-src_mesa_main_macros.h b/graphics/MesaLib/patches/patch-src_mesa_main_macros.h
new file mode 100644
index 00000000000..8b26b142871
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-src_mesa_main_macros.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_mesa_main_macros.h,v 1.1 2016/01/05 13:02:57 tnn Exp $
+
+ALIGN is also defined in sys/param.h on NetBSD.
+
+--- src/mesa/main/macros.h.orig	2015-12-09 16:10:13.000000000 +0000
++++ src/mesa/main/macros.h
+@@ -690,6 +690,9 @@ minify(unsigned value, unsigned levels)
+  *
+  * \sa ROUND_DOWN_TO()
+  */
++#if defined(__NetBSD__)
++#undef ALIGN
++#endif
+ static inline uintptr_t
+ ALIGN(uintptr_t value, int32_t alignment)
+ {