From 0e3699334faf92f508b6c187a261548b656b0dd3 Mon Sep 17 00:00:00 2001
From: marha
Date: Fri, 20 Apr 2012 17:07:15 +0200
Subject: fontconfig libX11 mesa pixman xserver git update 20 april 2012
---
mesalib/Makefile | 2 +-
mesalib/configure.ac | 4 +-
mesalib/docs/download.html | 43 +-
mesalib/docs/install.html | 251 ++++----
mesalib/src/gallium/auxiliary/util/u_blit.c | 17 +-
mesalib/src/gallium/auxiliary/util/u_blit.h | 191 +++---
mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c | 17 +-
mesalib/src/gallium/auxiliary/util/u_gen_mipmap.h | 134 ++--
mesalib/src/gallium/auxiliary/util/u_inlines.h | 2 +-
mesalib/src/glsl/ast_function.cpp | 29 +-
mesalib/src/glsl/ast_to_hir.cpp | 70 ++
mesalib/src/glsl/ir.h | 13 +
mesalib/src/glsl/main.cpp | 2 +-
mesalib/src/glsl/opt_array_splitting.cpp | 53 +-
mesalib/src/glsl/opt_structure_splitting.cpp | 739 +++++++++++-----------
mesalib/src/mesa/main/attrib.c | 3 -
mesalib/src/mesa/main/context.c | 5 +-
mesalib/src/mesa/main/ff_fragment_shader.cpp | 2 +-
mesalib/src/mesa/main/mtypes.h | 2 +-
mesalib/src/mesa/main/readpix.c | 62 +-
mesalib/src/mesa/main/state.c | 22 +-
mesalib/src/mesa/main/varray.c | 2 +-
mesalib/src/mesa/state_tracker/st_cb_bitmap.c | 124 ++--
mesalib/src/mesa/state_tracker/st_cb_clear.c | 95 +--
mesalib/src/mesa/state_tracker/st_cb_clear.h | 101 ++-
mesalib/src/mesa/state_tracker/st_cb_drawpixels.c | 33 +-
mesalib/src/mesa/state_tracker/st_cb_drawtex.c | 26 +-
mesalib/src/mesa/state_tracker/st_cb_flush.c | 324 +++++-----
mesalib/src/mesa/state_tracker/st_context.c | 3 +
mesalib/src/mesa/state_tracker/st_context.h | 20 +-
mesalib/src/mesa/vbo/vbo_context.c | 13 +-
mesalib/src/mesa/vbo/vbo_context.h | 10 -
mesalib/src/mesa/vbo/vbo_exec.c | 4 +
mesalib/src/mesa/vbo/vbo_exec.h | 1 +
mesalib/src/mesa/vbo/vbo_exec_api.c | 10 +-
mesalib/src/mesa/vbo/vbo_exec_array.c | 100 +--
mesalib/src/mesa/vbo/vbo_exec_draw.c | 12 +-
mesalib/src/mesa/vbo/vbo_save.c | 10 +-
mesalib/src/mesa/vbo/vbo_save_draw.c | 10 +-
39 files changed, 1281 insertions(+), 1280 deletions(-)
(limited to 'mesalib')
diff --git a/mesalib/Makefile b/mesalib/Makefile
index 1368b44ea..0f88071aa 100644
--- a/mesalib/Makefile
+++ b/mesalib/Makefile
@@ -22,7 +22,7 @@ doxygen:
cd doxygen && $(MAKE)
check:
- cd src/glsl/tests/ && ./optimization-test
+ make -C src/glsl/tests check
make -C tests check
clean:
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index 9d6cbeb96..1b571b95c 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -708,7 +708,7 @@ default_driver="xlib"
case "$host_os" in
linux*)
case "$host_cpu" in
- i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
+ i*86|x86_64|powerpc*|sparc*|ia64*) default_driver="dri";;
esac
;;
*freebsd* | dragonfly* | *netbsd*)
@@ -1993,6 +1993,7 @@ dnl Substitute the config
AC_CONFIG_FILES([configs/autoconf
src/gallium/drivers/Makefile
src/gallium/drivers/r300/Makefile
+ src/gallium/drivers/r600/Makefile
src/gbm/Makefile
src/gbm/main/gbm.pc
src/egl/drivers/Makefile
@@ -2004,6 +2005,7 @@ AC_CONFIG_FILES([configs/autoconf
src/egl/wayland/wayland-egl/Makefile
src/egl/wayland/wayland-egl/wayland-egl.pc
src/egl/wayland/wayland-drm/Makefile
+ src/glsl/tests/Makefile
src/glx/Makefile
src/mapi/shared-glapi/Makefile
src/gtest/Makefile
diff --git a/mesalib/docs/download.html b/mesalib/docs/download.html
index 4e8fc2f02..6a9533aae 100644
--- a/mesalib/docs/download.html
+++ b/mesalib/docs/download.html
@@ -20,26 +20,12 @@ When a new release is coming, release candidates (betas) may be found
+Unpacking
+
-The Mesa package is named MesaLib-x.y.z.{tar.bz2, tar.gz, zip} where x.y.z
-is the version. There are three types of compressed archives.
-
-
-In the past, there was also MesaGLUT-x.y.z.{tar.bz2, tar.gz, zip} packages which
-contained Mark Kilgard's GLUT library.
-Most Linux distributions include an implementation of GLUT (such as freeglut).
-
-
-In the past, the Mesa demos collection was distributed as
-MesaDemos-x.y.z.{tar.bz2, tar.gz, zip}.
-Now, the
-
-Mesa demos are distributed separately.
+Mesa releases are available in three formats: .tar.bz2, .tar.gz, and .zip
-
-Unpacking
-
To unpack .tar.gz files:
@@ -86,10 +72,6 @@ src/glu - libGLU source code
src/glx - sources for building libGL with full GLX and DRI support
-If you downloaded and unpacked the MesaGLUT.x.y.z package:
-
-src/glut - GLUT library source code
-
Proceed to the compilation and installation
@@ -97,5 +79,24 @@ instructions.
+Demos and GLUT
+
+
+A package of Mark Kilgard's GLUT library is available
+here
+
+
+
+The Mesa demos collection is available
+here
+
+
+
+In the past, GLUT and the Mesa demos were released in conjunction with
+Mesa releases. But since GLUT and the demos change infrequently, they
+were split off some time ago.
+
+
+