From fa5a6df66cfe9b19014ea9d2fca35b762f457041 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 19 Oct 2014 11:17:56 +0200 Subject: mesa git update 19 oct 2014 mesa commit 6212d2402df4ad0658cbb98ce889e35ef5f32fa3 --- mesalib/configure.ac | 38 ++--- mesalib/docs/GL3.txt | 2 +- mesalib/docs/index.html | 12 ++ mesalib/docs/relnotes.html | 2 + mesalib/docs/relnotes/10.2.9.html | 101 +++++++++++++ mesalib/docs/relnotes/10.3.1.html | 158 +++++++++++++++++++++ mesalib/docs/relnotes/10.4.html | 1 + mesalib/src/glsl/README | 16 +-- mesalib/src/mesa/drivers/common/meta_blit.c | 1 + mesalib/src/mesa/main/bufferobj.c | 21 +-- mesalib/src/mesa/main/bufferobj.h | 2 +- mesalib/src/mesa/main/dd.h | 2 +- mesalib/src/mesa/main/mtypes.h | 13 ++ mesalib/src/mesa/main/shared.c | 2 +- mesalib/src/mesa/main/teximage.c | 6 + .../src/mesa/state_tracker/st_cb_bufferobjects.c | 4 +- mesalib/src/mesa/state_tracker/st_cb_eglimage.c | 3 +- mesalib/src/mesa/state_tracker/st_cb_texture.c | 13 +- mesalib/src/mesa/state_tracker/st_gen_mipmap.c | 2 +- mesalib/src/mesa/state_tracker/st_texture.c | 6 +- mesalib/src/mesa/state_tracker/st_texture.h | 3 +- mesalib/src/mesa/state_tracker/st_vdpau.c | 4 +- mesalib/src/mesa/vbo/vbo_exec_api.c | 2 +- mesalib/src/mesa/vbo/vbo_save_api.c | 4 +- 24 files changed, 355 insertions(+), 63 deletions(-) create mode 100644 mesalib/docs/relnotes/10.2.9.html create mode 100644 mesalib/docs/relnotes/10.3.1.html diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 680dff4ab..0ed932544 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -1126,14 +1126,13 @@ if test "x$enable_dri" = xyes; then fi # Check for expat - PKG_CHECK_EXISTS([expat], [have_expat=yes], [have_expat=no]) - if test "x$have_expat" = "xyes"; then - PKG_CHECK_MODULES([EXPAT], [expat], [], - AC_MSG_ERROR([Expat required for DRI.])) - else - # expat version 2.0 and earlier do not provide expat.pc - EXPAT_LIBS=-lexpat - fi + PKG_CHECK_MODULES([EXPAT], [expat], [], + # expat version 2.0 and earlier do not provide expat.pc + [AC_CHECK_HEADER([expat.h],[], + [AC_MSG_ERROR([Expat headers required for DRI not found])]) + AC_CHECK_LIB([expat],[XML_ParserCreate],[], + [AC_MSG_ERROR([Expat library required for DRI not found])]) + EXPAT_LIBS="-lexpat"]) DRICOMMON_NEED_LIBDRM=no # If we are building any DRI driver other than swrast. @@ -1438,7 +1437,6 @@ AM_CONDITIONAL(HAVE_ST_OMX, test "x$enable_omx" = xyes) if test "x$enable_va" = xyes; then PKG_CHECK_MODULES([VA], [libva >= 0.35.0 x11-xcb xcb-dri2 >= $XCBDRI2_REQUIRED], [VA_LIBS="`$PKG_CONFIG --libs x11-xcb xcb-dri2`"]) - GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS va" enable_gallium_loader=$enable_shared_pipe_drivers fi AM_CONDITIONAL(HAVE_ST_VA, test "x$enable_va" = xyes) @@ -1786,38 +1784,30 @@ if test "x$enable_gallium_tests" = xyes; then fi AM_CONDITIONAL(HAVE_GALLIUM_TESTS, test "x$enable_gallium_tests" = xyes) -VDPAU_LIB_INSTALL_DIR_DEFAULT='' -if test "x$enable_vdpau" = xyes; then - VDPAU_LIB_INSTALL_DIR_DEFAULT=`$PKG_CONFIG --variable=moduledir vdpau` -fi - dnl Directory for VDPAU libs AC_ARG_WITH([vdpau-libdir], [AS_HELP_STRING([--with-vdpau-libdir=DIR], - [directory for the VDPAU libraries @<:@default=`pkg-config --variable=moduledir vdpau`@:>@])], + [directory for the VDPAU libraries @<:@default=${libdir}/vdpau@:>@])], [VDPAU_LIB_INSTALL_DIR="$withval"], - [VDPAU_LIB_INSTALL_DIR="$VDPAU_LIB_INSTALL_DIR_DEFAULT"]) + [VDPAU_LIB_INSTALL_DIR='${libdir}/vdpau']) AC_SUBST([VDPAU_LIB_INSTALL_DIR]) -OMX_LIB_INSTALL_DIR_DEFAULT='' -if test "x$enable_omx" = xyes; then - OMX_LIB_INSTALL_DIR_DEFAULT=`$PKG_CONFIG --variable=pluginsdir libomxil-bellagio` -fi +dnl Directory for OMX libs AC_ARG_WITH([omx-libdir], [AS_HELP_STRING([--with-omx-libdir=DIR], - [directory for the OMX libraries @<:@default=`pkg-config --variable=pluginsdir libomxil-bellagio`@:>@])], + [directory for the OMX libraries])], [OMX_LIB_INSTALL_DIR="$withval"], - [OMX_LIB_INSTALL_DIR="$OMX_LIB_INSTALL_DIR_DEFAULT"]) + [OMX_LIB_INSTALL_DIR=`$PKG_CONFIG --define-variable=libdir=\$libdir --variable=pluginsdir libomxil-bellagio`]) AC_SUBST([OMX_LIB_INSTALL_DIR]) dnl Directory for VA libs AC_ARG_WITH([va-libdir], [AS_HELP_STRING([--with-va-libdir=DIR], - [directory for the VA libraries @<:@default=`pkg-config libva --variable=driverdir`@:>@])], + [directory for the VA libraries @<:@${libdir}/dri@:>@])], [VA_LIB_INSTALL_DIR="$withval"], - [VA_LIB_INSTALL_DIR=`pkg-config libva --variable=driverdir`]) + [VA_LIB_INSTALL_DIR="${libdir}/dri"]) AC_SUBST([VA_LIB_INSTALL_DIR]) dnl diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index 5adc7598c..07d1d2c49 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -110,7 +110,7 @@ GL 4.0, GLSL 4.00: - Interpolation functions DONE () - New overload resolution rules DONE GL_ARB_gpu_shader_fp64 started (Dave) - GL_ARB_sample_shading DONE (i965, nv50, nvc0, radeonsi) + GL_ARB_sample_shading DONE (i965, nv50, nvc0, r600, radeonsi) GL_ARB_shader_subroutine not started GL_ARB_tessellation_shader started (Chris, Ilia) GL_ARB_texture_buffer_object_rgb32 DONE (i965, nvc0, r600, radeonsi, llvmpipe, softpipe) diff --git a/mesalib/docs/index.html b/mesalib/docs/index.html index 98162bbe9..244a7a3b2 100644 --- a/mesalib/docs/index.html +++ b/mesalib/docs/index.html @@ -16,6 +16,18 @@

News

+

October 12, 2014

+

+Mesa 10.2.9 +and Mesa 10.3.1 are released. + +These are bug-fix releases from the 10.2 and 10.3 branches, respectively. +
+NOTE: It is anticipated that 10.2.9 will be the final release in the 10.2 +series. Users of 10.2 are encouraged to migrate to the 10.3 series in order +to obtain future fixes. +

+

September 19, 2014

Mesa 10.3 is released. This is a new diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html index 0a4c3de1d..d546e8589 100644 --- a/mesalib/docs/relnotes.html +++ b/mesalib/docs/relnotes.html @@ -21,6 +21,8 @@ The release notes summarize what's new or changed in each Mesa release.