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.

9 files changed, 70 insertions, 68 deletions

diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 3f7a8507e82..f56cf1f50ce 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.118 2015/12/05 21:25:45 adam Exp $
+# $NetBSD: Makefile,v 1.119 2016/01/05 13:02:57 tnn Exp $
 
-DISTNAME=	mesa-11.0.5
+DISTNAME=	mesa-11.1.0
 PKGNAME=	${DISTNAME:S/mesa/MesaLib/}
 CATEGORIES=	graphics x11
 MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${PKGVERSION_NOREV}/
diff --git a/graphics/MesaLib/PLIST b/graphics/MesaLib/PLIST
index 011e80b83da..49d833b51df 100644
--- a/graphics/MesaLib/PLIST
+++ b/graphics/MesaLib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2015/09/27 21:58:03 tnn Exp $
+@comment $NetBSD: PLIST,v 1.32 2016/01/05 13:02:57 tnn Exp $
 ${PLIST.dri}include/EGL/egl.h
 ${PLIST.dri}include/EGL/eglext.h
 ${PLIST.dri}include/EGL/eglextchromium.h
@@ -49,6 +49,7 @@ ${PLIST.dri}lib/libGLESv1_CM.la
 ${PLIST.dri}lib/libGLESv2.la
 ${PLIST.gbm}lib/libgbm.la
 lib/libglapi.la
+${PLIST.wayland}lib/libwayland-egl.la
 ${PLIST.xatracker}lib/libxatracker.la
 ${PLIST.dri}lib/pkgconfig/dri.pc
 ${PLIST.dri}lib/pkgconfig/egl.pc
@@ -56,5 +57,6 @@ ${PLIST.gbm}lib/pkgconfig/gbm.pc
 lib/pkgconfig/gl.pc
 ${PLIST.dri}lib/pkgconfig/glesv1_cm.pc
 ${PLIST.dri}lib/pkgconfig/glesv2.pc
+${PLIST.wayland}lib/pkgconfig/wayland-egl.pc
 ${PLIST.xatracker}lib/pkgconfig/xatracker.pc
 share/examples/MesaLib/drirc
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index 99dfa1559ae..708175b0648 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.109 2015/11/11 13:54:08 tnn Exp $
+$NetBSD: distinfo,v 1.110 2016/01/05 13:02:57 tnn Exp $
 
-SHA1 (mesa-11.0.5.tar.xz) = 0d015c7b2041f06503144f71fbc432e78706bc79
-RMD160 (mesa-11.0.5.tar.xz) = dcda3665d55213af1a0a4e179ca0da6157b86761
-SHA512 (mesa-11.0.5.tar.xz) = 87b36b48d6a9d6abd47fb127c2bb2048aa1099f56ec2c9c4bcf6edd7c0d055abfffb4f63462a81b8852f79a8d8f173e7de5ac0dd8759b1645ea601c19fe26ee3
-Size (mesa-11.0.5.tar.xz) = 7271684 bytes
-SHA1 (patch-configure) = 24d1ee6bf62cdea9c9356132f727b490679f0330
+SHA1 (mesa-11.1.0.tar.xz) = a57c3b741a465cfd189416bb036323d2ec581d94
+RMD160 (mesa-11.1.0.tar.xz) = 386684fe856ab3acfa914fb8809886330c7696c4
+SHA512 (mesa-11.1.0.tar.xz) = 49817dbe599fdeb3e9d69f149283a5414d3101177040e04ec2c07c9bc57c2e86dcd74c0eb9e5784eb74ec5adff01f4fc8fd07fce650ce0afc18c81265e369192
+Size (mesa-11.1.0.tar.xz) = 7557948 bytes
+SHA1 (patch-configure) = 3e0c3402bfbc4ad286fe938b8b117add23d51454
 SHA1 (patch-include_GL_glxext.h) = 830902f2d38a8395cda682c059fc5223e1b0e89e
-SHA1 (patch-src_egl_drivers_dri2_platform__drm.c) = 5e7cca543258ae269760305d9b432f93e726abd7
+SHA1 (patch-src_egl_drivers_dri2_platform__drm.c) = 99b6dd6739c29551ae2c885eabd7babd159fc3e5
 SHA1 (patch-src_gallium_auxiliary_util_u__cpu__detect.c) = 5f4c3db54620739da0fe7dfb57c58728ecbbb6e0
 SHA1 (patch-src_gallium_auxiliary_util_u__format__tests.c) = 4d5e4677c2825778c43440ab131b8807f6840975
 SHA1 (patch-src_gallium_auxiliary_util_u__math.h) = 812e4a5291aea47e06505f09891e0434c4d9c34d
@@ -24,7 +24,7 @@ SHA1 (patch-src_glsl_ralloc.c) = 7443d00ff05ee1e1dcfa2b76972b55abadebcad8
 SHA1 (patch-src_glx_apple_apple__glapi.c) = df70afc24759978f954ac3a774a14e6518dde97a
 SHA1 (patch-src_glx_glxclient.h) = e15256851559dafb7a86e1eb7e9d6afc86de581b
 SHA1 (patch-src_glx_glxcurrent.c) = 713f75bcafb186c7123d19a6aae3deaed9d5fa69
-SHA1 (patch-src_loader_Makefile.in) = 25cf645bc43a8157961e9ddd249936ca2053c49c
+SHA1 (patch-src_loader_Makefile.in) = be0eb34d814366c14ba5165b8081d18f37d262eb
 SHA1 (patch-src_loader_loader.c) = f99b13451f4f932031e876cd611ab746ec5caf1b
 SHA1 (patch-src_mapi_entry__x86-64__tls.h) = e1cc896dd9cf7d77b837104557c0e0bf9d41ff55
 SHA1 (patch-src_mapi_entry__x86__tls.h) = 3d6c11281b57c9c713899022bfc8fcea54d07d56
@@ -36,10 +36,10 @@ SHA1 (patch-src_mesa_drivers_dri_Makefile.in) = 48032b8f8e6eac59092f68f3c32cfdd4
 SHA1 (patch-src_mesa_drivers_dri_common_Makefile.in) = 5e160f7d92c2e9f3fa36e52a082a496af67e634e
 SHA1 (patch-src_mesa_drivers_dri_common_xmlconfig.c) = 668cc1d6a58f8f02eb9eb32c1aeffb4bef7beaf4
 SHA1 (patch-src_mesa_drivers_dri_i915_intel__screen.c) = fd8436e4e3a69250256c2cddf8138effb16bd7b3
-SHA1 (patch-src_mesa_drivers_dri_i965_brw__context.h) = e0db31a3ea077531d922923c300d06d9e265283b
 SHA1 (patch-src_mesa_drivers_dri_i965_intel__screen.c) = 7c1a1e5c549f64d4c390e0c87984c44a88d4abfe
 SHA1 (patch-src_mesa_drivers_dri_swrast_swrast.c) = b8a6cca517e1cccbdb2c59cf67a6d2481cdfebd4
 SHA1 (patch-src_mesa_main_context.c) = 695b0e04cbd08dfed46b4dae5f9602b35e21f5b3
+SHA1 (patch-src_mesa_main_macros.h) = e0e98dff37bbf96fea2f3adf0dc9ef9911b711d9
 SHA1 (patch-src_mesa_main_shader__query.cpp) = 6273c74161f045363c58f38adeb672287f6a0898
 SHA1 (patch-src_mesa_tnl_t__pipeline.c) = afc7d5f27aeadacc7c6a762e5aa892e01a0c1317
 SHA1 (patch-src_mesa_x86_common__x86.c) = bdac91384d67ad0238ecd4cdcf5cfc787952a3d9
diff --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk
index 5a43057bb43..95f4a41925d 100644
--- a/graphics/MesaLib/options.mk
+++ b/graphics/MesaLib/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.44 2015/09/27 21:58:03 tnn Exp $
+# $NetBSD: options.mk,v 1.45 2016/01/05 13:02:57 tnn Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS=		llvm dri
@@ -35,7 +35,7 @@ PLIST_VARS+=		swrast svga ilo i915 i965 nouveau r300 r600 radeonsi
 # classic DRI
 PLIST_VARS+=		dri swrast_dri i915_dri nouveau_dri i965_dri radeon_dri r200_dri
 # other features
-PLIST_VARS+=		gbm xatracker
+PLIST_VARS+=		gbm wayland xatracker
 
 .if !empty(PKG_OPTIONS:Mdri)
 
@@ -143,6 +143,10 @@ DRI_DRIVERS+=		nouveau
 
 .if ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=	--with-egl-platforms=x11
+#.elif ${OPSYS} == "Linux"
+#.include "../../wip/wayland/buildlink3.mk"
+#CONFIGURE_ARGS+=	--with-egl-platforms=x11,drm,wayland
+#PLIST.wayland=		yes
 .else
 CONFIGURE_ARGS+=	--with-egl-platforms=x11,drm
 .endif
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)
+ {