From 0f834b91a4768673833ab4917e87d86c237bb1a6 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 23 Mar 2012 10:05:55 +0100 Subject: libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update 23 Mar 2012 --- mesalib/Makefile | 6 + mesalib/configs/darwin | 23 +- mesalib/configs/darwin-fat-intel | 7 + mesalib/configure.ac | 29 ++- mesalib/docs/banner.html | 46 ++-- mesalib/docs/bugs.html | 3 +- mesalib/docs/install.html | 8 + mesalib/docs/news.html | 8 + mesalib/docs/relnotes.html | 1 + mesalib/src/glsl/ast_to_hir.cpp | 23 +- mesalib/src/glsl/builtin_types.h | 12 + mesalib/src/glsl/builtin_variables.cpp | 261 +++++++++++-------- mesalib/src/glsl/glsl_parser.yy | 3 + mesalib/src/glsl/glsl_parser_extras.cpp | 2 + mesalib/src/glsl/glsl_parser_extras.h | 1 + mesalib/src/glsl/glsl_types.cpp | 40 ++- mesalib/src/glsl/glsl_types.h | 8 +- mesalib/src/glsl/linker.cpp | 41 ++- mesalib/src/glsl/main.cpp | 6 +- mesalib/src/mapi/Android.mk | 4 +- mesalib/src/mapi/glapi/Makefile | 8 +- mesalib/src/mapi/mapi/sources.mak | 42 ++-- mesalib/src/mesa/drivers/dri/common/dri_util.c | 24 ++ mesalib/src/mesa/drivers/dri/common/drirc | 8 +- mesalib/src/mesa/main/api_validate.c | 73 ++++-- mesalib/src/mesa/main/api_validate.h | 2 +- mesalib/src/mesa/main/dlist.c | 10 +- mesalib/src/mesa/main/getstring.c | 2 + mesalib/src/mesa/main/mtypes.h | 4 +- mesalib/src/mesa/main/samplerobj.c | 9 +- mesalib/src/mesa/main/samplerobj.h | 21 +- mesalib/src/mesa/main/teximage.c | 17 +- mesalib/src/mesa/main/texobj.c | 334 ++++++++++--------------- mesalib/src/mesa/main/texobj.h | 21 ++ mesalib/src/mesa/main/texparam.c | 10 +- mesalib/src/mesa/main/texstate.c | 7 +- mesalib/src/mesa/main/transformfeedback.c | 27 -- mesalib/src/mesa/main/transformfeedback.h | 3 - mesalib/src/mesa/main/uniform_query.cpp | 16 +- mesalib/src/mesa/main/uniforms.c | 2 +- mesalib/src/mesa/state_tracker/st_cb_texture.c | 2 +- mesalib/src/mesa/state_tracker/st_extensions.c | 2 + mesalib/src/mesa/state_tracker/st_texture.c | 3 + mesalib/src/mesa/swrast/s_context.c | 5 +- mesalib/src/mesa/swrast/s_texfilter.c | 6 +- mesalib/src/mesa/swrast/s_texfilter.h | 83 +++--- mesalib/src/mesa/vbo/vbo_exec_api.c | 3 +- 47 files changed, 735 insertions(+), 541 deletions(-) create mode 100644 mesalib/configs/darwin-fat-intel (limited to 'mesalib') diff --git a/mesalib/Makefile b/mesalib/Makefile index 6120fbe9f..77c9154ff 100644 --- a/mesalib/Makefile +++ b/mesalib/Makefile @@ -199,6 +199,12 @@ EXTRA_FILES = \ src/glsl/glcpp/glcpp-lex.c \ src/glsl/glcpp/glcpp-parse.c \ src/glsl/glcpp/glcpp-parse.h \ + src/mesa/main/api_exec_es1.c \ + src/mesa/main/api_exec_es1_dispatch.h \ + src/mesa/main/api_exec_es1_remap_helper.h \ + src/mesa/main/api_exec_es2.c \ + src/mesa/main/api_exec_es2_dispatch.h \ + src/mesa/main/api_exec_es2_remap_helper.h \ src/mesa/program/lex.yy.c \ src/mesa/program/program_parse.tab.c \ src/mesa/program/program_parse.tab.h diff --git a/mesalib/configs/darwin b/mesalib/configs/darwin index e2ca70af9..721fbc780 100644 --- a/mesalib/configs/darwin +++ b/mesalib/configs/darwin @@ -9,8 +9,8 @@ INSTALL_DIR = /usr/X11 X11_DIR = $(INSTALL_DIR) # Compiler and flags -CC = gcc -CXX = g++ +CC = $(shell xcrun -find cc) +CXX = $(shell xcrun -find c++) PIC_FLAGS = -fPIC DEFINES = -D_DARWIN_C_SOURCE -DPTHREADS -D_GNU_SOURCE \ -DGLX_ALIAS_UNSUPPORTED \ @@ -24,11 +24,14 @@ DEFINES = -D_DARWIN_C_SOURCE -DPTHREADS -D_GNU_SOURCE \ # -DIN_DRI_DRIVER ARCH_FLAGS += $(RC_CFLAGS) +INCLUDE_FLAGS = -I$(INSTALL_DIR)/include -I$(X11_DIR)/include +OPT_FLAGS = -g3 -gdwarf-2 -Os -ffast-math -fno-strict-aliasing +WARN_FLAGS = -Wall -Wmissing-prototypes -CFLAGS = -ggdb3 -Os -Wall -Wmissing-prototypes -std=c99 -ffast-math -fno-strict-aliasing -fvisibility=hidden \ - -I$(INSTALL_DIR)/include -I$(X11_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) -CXXFLAGS = -ggdb3 -Os -Wall -fno-strict-aliasing -fvisibility=hidden \ - -I$(INSTALL_DIR)/include -I$(X11_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) +CFLAGS = -std=c99 -fvisibility=hidden \ + $(OPT_FLAGS) $(WARN_FLAGS) $(INCLUDE_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) $(EXTRA_CFLAGS) +CXXFLAGS = -fvisibility=hidden \ + $(OPT_FLAGS) $(WARN_FLAGS) $(INCLUDE_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) $(EXTRA_CFLAGS) # Library names (actual file names) GL_LIB_NAME = lib$(GL_LIB).dylib @@ -44,10 +47,10 @@ GLW_LIB_GLOB = lib$(GLW_LIB).*dylib OSMESA_LIB_GLOB = lib$(OSMESA_LIB).*dylib VG_LIB_GLOB = lib$(VG_LIB).*dylib -GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXext -lm -lpthread -OSMESA_LIB_DEPS = -GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt +GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11-xcb -lxcb -lX11 -lXext $(EXTRA_LDFLAGS) +OSMESA_LIB_DEPS = $(EXTRA_LDFLAGS) +GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LDFLAGS) +GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt $(EXTRA_LDFLAGS) SRC_DIRS = glsl mapi/glapi mapi/vgapi glx/apple mesa gallium glu GLU_DIRS = sgi diff --git a/mesalib/configs/darwin-fat-intel b/mesalib/configs/darwin-fat-intel new file mode 100644 index 000000000..273ae3d6a --- /dev/null +++ b/mesalib/configs/darwin-fat-intel @@ -0,0 +1,7 @@ +# Configuration for Darwin / MacOS X, making 32bit and 64bit fat dynamic libs for intel + +RC_CFLAGS=-arch i386 -arch x86_64 + +include $(TOP)/configs/darwin + +CONFIG_NAME = darwin-fat-intel diff --git a/mesalib/configure.ac b/mesalib/configure.ac index a2d906abb..ac7d49f1f 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -37,7 +37,7 @@ USER_CXXFLAGS="$CXXFLAGS" dnl Versions for external dependencies LIBDRM_REQUIRED=2.4.24 LIBDRM_RADEON_REQUIRED=2.4.31 -LIBDRM_INTEL_REQUIRED=2.4.30 +LIBDRM_INTEL_REQUIRED=2.4.32 LIBDRM_NOUVEAU_REQUIRED=0.6 DRI2PROTO_REQUIRED=2.6 GLPROTO_REQUIRED=1.4.14 @@ -702,6 +702,7 @@ if test "x$enable_shared_glapi" = xyes; then # libGL will use libglapi for function lookups (IN_DRI_DRIVER means to use # the remap table) DEFINES="$DEFINES -DIN_DRI_DRIVER" + SRC_DIRS="$SRC_DIRS mapi/shared-glapi" fi AC_SUBST([SHARED_GLAPI]) AM_CONDITIONAL(HAVE_SHARED_GLAPI, test $SHARED_GLAPI = 1) @@ -1935,6 +1936,29 @@ if test "x$NEED_G3DVL_DRI" = xyes; then GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS g3dvl/dri" fi +dnl Tell Automake which drivers to build +for driver in $GALLIUM_DRIVERS_DIRS; do + case "x$driver" in + xgalahad) + HAVE_GALAHAD_GALLIUM=yes; + ;; + xidentity) + HAVE_IDENTITY_GALLIUM=yes; + ;; + xnoop) + HAVE_NOOP_GALLIUM=yes; + ;; + *) + GALLIUM_MAKE_DIRS="$GALLIUM_MAKE_DIRS $driver" + ;; + esac +done + +AM_CONDITIONAL(HAVE_GALAHAD_GALLIUM, test x$HAVE_GALAHAD_GALLIUM = xyes) +AM_CONDITIONAL(HAVE_IDENTITY_GALLIUM, test x$HAVE_IDENTITY_GALLIUM = xyes) +AM_CONDITIONAL(HAVE_NOOP_GALLIUM, test x$HAVE_NOOP_GALLIUM = xyes) +AC_SUBST([GALLIUM_MAKE_DIRS]) + dnl prepend CORE_DIRS to SRC_DIRS SRC_DIRS="$CORE_DIRS $SRC_DIRS" @@ -1948,6 +1972,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS" dnl Substitute the config AC_CONFIG_FILES([configs/autoconf + src/gallium/drivers/Makefile src/gallium/drivers/r300/Makefile src/gbm/Makefile src/gbm/main/gbm.pc @@ -1961,6 +1986,7 @@ AC_CONFIG_FILES([configs/autoconf src/egl/wayland/wayland-egl/wayland-egl.pc src/egl/wayland/wayland-drm/Makefile src/glx/Makefile + src/mapi/shared-glapi/Makefile src/mesa/drivers/dri/dri.pc src/mesa/drivers/dri/Makefile src/mesa/drivers/dri/common/Makefile @@ -1985,6 +2011,7 @@ dnl Sort the dirs alphabetically GALLIUM_TARGET_DIRS=`echo $GALLIUM_TARGET_DIRS|tr " " "\n"|sort -u|tr "\n" " "` GALLIUM_WINSYS_DIRS=`echo $GALLIUM_WINSYS_DIRS|tr " " "\n"|sort -u|tr "\n" " "` GALLIUM_DRIVERS_DIRS=`echo $GALLIUM_DRIVERS_DIRS|tr " " "\n"|sort -u|tr "\n" " "` +GALLIUM_MAKE_DIRS=`echo $GALLIUM_MAKE_DIRS|tr " " "\n"|sort -u|tr "\n" " "` GALLIUM_STATE_TRACKERS_DIRS=`echo $GALLIUM_STATE_TRACKERS_DIRS|tr " " "\n"|sort -u|tr "\n" " "` AC_OUTPUT diff --git a/mesalib/docs/banner.html b/mesalib/docs/banner.html index 9cb27bb6d..4f12c7ac6 100644 --- a/mesalib/docs/banner.html +++ b/mesalib/docs/banner.html @@ -1,27 +1,27 @@ - - + + - Banner + Banner - -
- - - - - - - - -
-

- 		The -Mesa 3D Graphics Library -

-
-


-

-
+

The +Mesa 3D Graphics Library

diff --git a/mesalib/docs/bugs.html b/mesalib/docs/bugs.html index 4397339e9..fa7c484cd 100644 --- a/mesalib/docs/bugs.html +++ b/mesalib/docs/bugs.html @@ -1,4 +1,5 @@ - + + Mesa Bug Reporting diff --git a/mesalib/docs/install.html b/mesalib/docs/install.html index 0d5bab249..46d0b4c7b 100644 --- a/mesalib/docs/install.html +++ b/mesalib/docs/install.html @@ -68,6 +68,14 @@ version 2.4.15 or later
  • Xorg server version 1.5 or later

    +

    +If you're using a fedora distro the following command should install all +the needed dependencies: +

    +  sudo yum install flex bison imake libtool xorg-x11-proto-devel libdrm-devel \
+  gcc-c++ xorg-x11-server-devel libXi-devel libXmu-devel libXdamage-devel git \
+  expat-devel llvm-devel
+
    diff --git a/mesalib/docs/news.html b/mesalib/docs/news.html index 271fbdd1f..fed8881af 100644 --- a/mesalib/docs/news.html +++ b/mesalib/docs/news.html @@ -11,6 +11,14 @@

    News

    +

    March 21, 2012

    + +

    +Mesa 8.0.2 is released. +This is a bug fix release. +

    + +

    February 16, 2012

    diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html index d5c944add..23337cfd3 100644 --- a/mesalib/docs/relnotes.html +++ b/mesalib/docs/relnotes.html @@ -13,6 +13,7 @@ The release notes summarize what's new or changed in each Mesa release.