From d6d5581d5fba846c8476ad4d593da662306765d7 Mon Sep 17 00:00:00 2001 From: marha Date: Sat, 25 Oct 2014 19:53:22 +0200 Subject: libXft mesa xserver pixman xkeyboard-config git update 25 Oct 2014 xserver commit 16a32c53f6e9ad1f3284d4596edfa33e9efb740e xkeyboard-config commit 0d4c3d9d891536aa1ec4f1fff5e3df51cfd2718d pixman commit 594e6a6c93e92fcfb495e987aec5617f6c37f467 libXft commit e8a83226bc10afb587f6f34daac44d2ef809c85e mesa commit 13862812dc910a4ef57cb72cb9fe777ce3c14515 --- mesalib/configure.ac | 12 +- mesalib/docs/GL3.txt | 2 +- mesalib/docs/index.html | 6 + mesalib/docs/relnotes.html | 1 + mesalib/docs/relnotes/10.3.2.html | 115 +++++++++++++++++++ mesalib/docs/relnotes/10.4.html | 1 + mesalib/scons/llvm.py | 16 +-- mesalib/src/gallium/auxiliary/util/u_blitter.c | 77 ++++++++----- mesalib/src/gallium/auxiliary/util/u_math.h | 2 +- mesalib/src/glsl/ast_array_index.cpp | 6 +- mesalib/src/glsl/ast_to_hir.cpp | 107 +++++++++++------- mesalib/src/glsl/glsl_parser_extras.h | 4 +- mesalib/src/glsl/ir_uniform.h | 11 -- mesalib/src/glsl/linker.cpp | 18 +-- mesalib/src/glsl/lower_offset_array.cpp | 10 +- mesalib/src/glsl/main.cpp | 2 + mesalib/src/glsl/opt_array_splitting.cpp | 2 +- mesalib/src/glsl/standalone_scaffolding.cpp | 27 +++++ mesalib/src/glsl/standalone_scaffolding.h | 3 + mesalib/src/mapi/glapi/gen/ARB_clip_control.xml | 25 +++++ mesalib/src/mapi/glapi/gen/Makefile.am | 1 + mesalib/src/mapi/glapi/gen/gl_API.xml | 4 +- mesalib/src/mapi/glapi/gen/gl_gentable.py | 4 +- mesalib/src/mesa/drivers/common/meta.c | 9 ++ mesalib/src/mesa/drivers/common/meta.h | 3 + mesalib/src/mesa/main/attrib.c | 1 + mesalib/src/mesa/main/bufferobj.c | 4 +- mesalib/src/mesa/main/context.c | 12 ++ mesalib/src/mesa/main/dd.h | 3 +- mesalib/src/mesa/main/dlist.c | 26 +++++ mesalib/src/mesa/main/extensions.c | 1 + mesalib/src/mesa/main/ff_fragment_shader.cpp | 14 +-- mesalib/src/mesa/main/get.c | 1 + mesalib/src/mesa/main/get_hash_params.py | 2 + mesalib/src/mesa/main/mtypes.h | 7 +- mesalib/src/mesa/main/polygon.c | 2 - mesalib/src/mesa/main/shaderapi.c | 2 +- mesalib/src/mesa/main/shaderapi.h | 9 -- mesalib/src/mesa/main/shaderimage.c | 2 +- mesalib/src/mesa/main/shaderobj.c | 28 +++-- mesalib/src/mesa/main/shaderobj.h | 6 +- mesalib/src/mesa/main/state.c | 25 ++++- mesalib/src/mesa/main/uniform_query.cpp | 74 ++----------- mesalib/src/mesa/main/uniforms.c | 22 +++- mesalib/src/mesa/main/uniforms.h | 2 +- mesalib/src/mesa/main/version.c | 2 - mesalib/src/mesa/main/viewport.c | 122 ++++++++++++++++++--- mesalib/src/mesa/main/viewport.h | 6 + mesalib/src/mesa/math/m_matrix.c | 17 ++- mesalib/src/mesa/math/m_matrix.h | 4 +- mesalib/src/mesa/program/ir_to_mesa.cpp | 2 +- .../src/mesa/state_tracker/st_atom_rasterizer.c | 25 ++++- mesalib/src/mesa/state_tracker/st_atom_viewport.c | 23 ++-- mesalib/src/mesa/state_tracker/st_cb_program.c | 2 - mesalib/src/mesa/state_tracker/st_debug.c | 1 + mesalib/src/mesa/state_tracker/st_debug.h | 1 + mesalib/src/mesa/state_tracker/st_extensions.c | 9 +- mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 47 ++------ mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.h | 5 - mesalib/src/util/macros.h | 14 +++ mesalib/src/util/register_allocate.c | 2 +- 61 files changed, 666 insertions(+), 327 deletions(-) create mode 100644 mesalib/docs/relnotes/10.3.2.html create mode 100644 mesalib/src/mapi/glapi/gen/ARB_clip_control.xml (limited to 'mesalib') diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 0ed932544..03f1bca86 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -1465,6 +1465,7 @@ AC_ARG_WITH([clang-libdir], [CLANG_LIBDIR='']) PKG_CHECK_EXISTS([libclc], [have_libclc=yes], [have_libclc=no]) +AC_CHECK_LIB([elf], [elf_memory], [have_libelf=yes;ELF_LIB=-lelf]) if test "x$enable_opencl" = xyes; then if test -z "$with_gallium_drivers"; then @@ -1495,6 +1496,10 @@ if test "x$enable_opencl" = xyes; then else OPENCL_LIBNAME="OpenCL" fi + + if test "x$have_libelf" != xyes; then + AC_MSG_ERROR([Clover requires libelf]) + fi fi AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes) AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes) @@ -1714,7 +1719,7 @@ if test "x$enable_gallium_llvm" = xyes; then fi LLVM_REQUIRED_VERSION_MAJOR="3" - LLVM_REQUIRED_VERSION_MINOR="1" + LLVM_REQUIRED_VERSION_MINOR="3" if test "$LLVM_VERSION_INT" -lt "${LLVM_REQUIRED_VERSION_MAJOR}0${LLVM_REQUIRED_VERSION_MINOR}"; then AC_MSG_ERROR([LLVM $LLVM_REQUIRED_VERSION_MAJOR.$LLVM_REQUIRED_VERSION_MINOR or newer is required]) fi @@ -1870,8 +1875,9 @@ radeon_llvm_check() { fi LLVM_COMPONENTS="${LLVM_COMPONENTS} r600 bitreader ipo" NEED_RADEON_LLVM=yes - AC_CHECK_LIB([elf], [elf_memory], [ELF_LIB=-lelf], - [AC_MSG_ERROR([$1 requires libelf when using LLVM])]) + if test "x$have_libelf" != xyes; then + AC_MSG_ERROR([$1 requires libelf when using llvm]) + fi } dnl Duplicates in GALLIUM_DRIVERS_DIRS are removed by sorting it after this block diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index 07d1d2c49..6a988d5e7 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -187,7 +187,7 @@ GL 4.4, GLSL 4.40: GL 4.5, GLSL 4.50: GL_ARB_ES3_1_compatibility not started - GL_ARB_clip_control not started + GL_ARB_clip_control DONE (llvmpipe, softpipe, r300, r600, radeonsi) GL_ARB_conditional_render_inverted DONE (i965, nvc0, llvmpipe, softpipe) GL_ARB_cull_distance not started GL_ARB_derivative_control DONE (i965, nv50, nvc0, r600) diff --git a/mesalib/docs/index.html b/mesalib/docs/index.html index 244a7a3b2..0a491a2c9 100644 --- a/mesalib/docs/index.html +++ b/mesalib/docs/index.html @@ -16,6 +16,12 @@

News

+

October 24, 2014

+

+Mesa 10.3.2 is released. +This is a bug-fix release. +

+

October 12, 2014

Mesa 10.2.9 diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html index d546e8589..1c97edd64 100644 --- a/mesalib/docs/relnotes.html +++ b/mesalib/docs/relnotes.html @@ -21,6 +21,7 @@ The release notes summarize what's new or changed in each Mesa release.