From 528f5bd58a139174170c4130c67dca30193c9057 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 5 Dec 2011 07:42:31 +0100 Subject: xserver xkeyboard-config mesa git update 5 dec 2011 --- mesalib/Makefile | 2 - mesalib/common.py | 2 +- mesalib/configs/darwin | 2 +- mesalib/configs/default | 4 +- mesalib/configs/linux-cell | 71 - mesalib/configs/linux-cell-debug | 10 - mesalib/configs/linux-dri | 2 +- mesalib/configs/linux-i965 | 9 - mesalib/configure.ac | 16 +- mesalib/docs/cell.html | 138 - mesalib/docs/contents.html | 3 +- mesalib/docs/news.html | 2 +- mesalib/docs/relnotes-7.12.html | 8 +- mesalib/docs/relnotes-7.5.html | 2 +- mesalib/docs/sourcetree.html | 2 - mesalib/scons/gallium.py | 128 +- mesalib/src/gallium/auxiliary/util/u_atomic.h | 701 ++- mesalib/src/gallium/auxiliary/util/u_debug.c | 61 +- .../src/gallium/auxiliary/util/u_debug_refcnt.c | 26 +- mesalib/src/gallium/auxiliary/util/u_dump.h | 352 +- mesalib/src/gallium/auxiliary/util/u_dump_state.c | 103 +- mesalib/src/gallium/auxiliary/util/u_format.csv | 3 + mesalib/src/gallium/auxiliary/util/u_format.h | 7 +- mesalib/src/gallium/auxiliary/util/u_format_etc.c | 104 + mesalib/src/gallium/auxiliary/util/u_format_etc.h | 46 + .../src/gallium/auxiliary/util/u_format_pack.py | 2 +- .../src/gallium/auxiliary/util/u_format_table.py | 1 + mesalib/src/gallium/auxiliary/util/u_math.h | 68 +- mesalib/src/gallium/auxiliary/util/u_snprintf.c | 2986 +++++----- mesalib/src/gallium/auxiliary/util/u_vbuf.c | 2 + mesalib/src/glsl/ir_validate.cpp | 1 + mesalib/src/mapi/glapi/SConscript | 142 +- mesalib/src/mapi/glapi/gen/es_EXT.xml | 4 + mesalib/src/mapi/glapi/gen/gl_table.py | 4 +- mesalib/src/mesa/SConscript | 1 + mesalib/src/mesa/drivers/dri/swrast/swrast.c | 4 +- mesalib/src/mesa/main/APIspec.xml | 2 + mesalib/src/mesa/main/bitset.h | 21 +- mesalib/src/mesa/main/compiler.h | 12 + mesalib/src/mesa/main/dispatch.h | 3892 ++++++------- mesalib/src/mesa/main/drawpix.c | 18 + mesalib/src/mesa/main/enums.c | 6073 ++++++++++---------- mesalib/src/mesa/main/extensions.c | 1 + mesalib/src/mesa/main/format_unpack.c | 37 +- mesalib/src/mesa/main/formats.c | 37 +- mesalib/src/mesa/main/formats.h | 6 +- mesalib/src/mesa/main/glheader.h | 4 + mesalib/src/mesa/main/image.c | 4 +- mesalib/src/mesa/main/mipmap.c | 1 + mesalib/src/mesa/main/mtypes.h | 1 + mesalib/src/mesa/main/pack.c | 64 - mesalib/src/mesa/main/renderbuffer.c | 4 +- mesalib/src/mesa/main/shader_query.cpp | 9 +- mesalib/src/mesa/main/texcompress.c | 22 + mesalib/src/mesa/main/texcompress_etc.c | 71 + mesalib/src/mesa/main/texcompress_etc.h | 40 + mesalib/src/mesa/main/texcompress_etc_tmp.h | 136 + mesalib/src/mesa/main/texformat.c | 14 +- mesalib/src/mesa/main/teximage.c | 60 +- mesalib/src/mesa/main/texstore.c | 65 +- mesalib/src/mesa/main/transformfeedback.c | 2 +- mesalib/src/mesa/main/varray.c | 2 +- mesalib/src/mesa/program/prog_print.c | 12 +- mesalib/src/mesa/program/program_parse.y | 6 +- mesalib/src/mesa/program/program_parser.h | 2 +- mesalib/src/mesa/sources.mak | 1 + mesalib/src/mesa/state_tracker/st_draw_feedback.c | 575 +- mesalib/src/mesa/state_tracker/st_extensions.c | 10 +- mesalib/src/mesa/state_tracker/st_format.c | 16 +- mesalib/src/mesa/swrast/s_texfetch.c | 25 +- mesalib/src/mesa/swrast/s_texfetch_tmp.h | 18 +- mesalib/src/mesa/swrast/s_texfilter.c | 9 + mesalib/src/mesa/tnl/t_context.h | 1093 ++-- mesalib/src/mesa/tnl/t_vb_cliptmp.h | 640 +-- mesalib/src/mesa/vbo/vbo_exec_api.c | 3 - xorg-server/Xext/security.c | 4 +- xorg-server/Xext/shm.c | 2 +- xorg-server/Xext/xselinux_hooks.c | 4 +- xorg-server/Xi/exevents.c | 35 +- xorg-server/Xi/xipassivegrab.c | 36 +- xorg-server/dix/dispatch.c | 23 +- xorg-server/dix/events.c | 25 +- xorg-server/dix/extension.c | 14 - xorg-server/hw/xfree86/fbdevhw/fbdevhw.c | 2 - xorg-server/include/dixstruct.h | 1 + xorg-server/include/extension.h | 2 - xorg-server/include/input.h | 2 +- xorg-server/include/inputstr.h | 2 +- xorg-server/include/misc.h | 7 + xorg-server/record/record.c | 8 +- xorg-server/test/misc.c | 3 - xorg-server/xkeyboard-config/Makefile.am | 2 - xorg-server/xkeyboard-config/configure.in | 1 - xorg-server/xkeyboard-config/rules/base.xml.in | 1 - xorg-server/xkeyboard-config/symbols/cd | 2 +- xorg-server/xkeyboard-config/symbols/is | 20 +- .../xkeyboard-config/xkeyboard-config.spec.in | 45 - 97 files changed, 9137 insertions(+), 9131 deletions(-) delete mode 100644 mesalib/configs/linux-cell delete mode 100644 mesalib/configs/linux-cell-debug delete mode 100644 mesalib/configs/linux-i965 delete mode 100644 mesalib/docs/cell.html create mode 100644 mesalib/src/gallium/auxiliary/util/u_format_etc.c create mode 100644 mesalib/src/gallium/auxiliary/util/u_format_etc.h create mode 100644 mesalib/src/mesa/main/texcompress_etc.c create mode 100644 mesalib/src/mesa/main/texcompress_etc.h create mode 100644 mesalib/src/mesa/main/texcompress_etc_tmp.h delete mode 100644 xorg-server/xkeyboard-config/xkeyboard-config.spec.in diff --git a/mesalib/Makefile b/mesalib/Makefile index d65d4c496..cf6555c78 100644 --- a/mesalib/Makefile +++ b/mesalib/Makefile @@ -112,8 +112,6 @@ linux \ linux-i965 \ linux-alpha \ linux-alpha-static \ -linux-cell \ -linux-cell-debug \ linux-debug \ linux-dri \ linux-dri-debug \ diff --git a/mesalib/common.py b/mesalib/common.py index cfee1b5dc..5578f72af 100644 --- a/mesalib/common.py +++ b/mesalib/common.py @@ -83,7 +83,7 @@ def AddOptions(opts): opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine, allowed_values=('generic', 'ppc', 'x86', 'x86_64'))) opts.Add(EnumOption('platform', 'target platform', host_platform, - allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince', 'darwin', 'cygwin', 'sunos', 'freebsd8'))) + allowed_values=('linux', 'windows', 'darwin', 'cygwin', 'sunos', 'freebsd8'))) opts.Add(BoolOption('embedded', 'embedded build', 'no')) opts.Add('toolchain', 'compiler toolchain', default_toolchain) opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support', 'no')) diff --git a/mesalib/configs/darwin b/mesalib/configs/darwin index 98cd457a0..e2ca70af9 100644 --- a/mesalib/configs/darwin +++ b/mesalib/configs/darwin @@ -54,5 +54,5 @@ GLU_DIRS = sgi DRIVER_DIRS = osmesa #DRIVER_DIRS = dri DRI_DIRS = swrast -GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad failover +GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad #GALLIUM_DRIVERS_DIRS += llvmpipe diff --git a/mesalib/configs/default b/mesalib/configs/default index 2b1bf9bef..33e5f024d 100644 --- a/mesalib/configs/default +++ b/mesalib/configs/default @@ -116,10 +116,10 @@ EGL_DRIVERS_DIRS = glx # gbm backends to build GBM_BACKEND_DIRS = dri -# Gallium directories and +# Gallium directories and GALLIUM_DIRS = auxiliary drivers state_trackers GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a -GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad i915 i965 svga r300 nvfx nv50 failover +GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad i915 svga r300 nvfx nv50 GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) GALLIUM_WINSYS_DIRS = sw sw/xlib GALLIUM_TARGET_DIRS = libgl-xlib diff --git a/mesalib/configs/linux-cell b/mesalib/configs/linux-cell deleted file mode 100644 index 7f38da971..000000000 --- a/mesalib/configs/linux-cell +++ /dev/null @@ -1,71 +0,0 @@ -# linux-cell (non-debug build) - -include $(TOP)/configs/linux - -CONFIG_NAME = linux-cell - - -# Omiting other gallium drivers: -GALLIUM_DRIVERS_DIRS = cell softpipe trace rbug identity - - -# Compiler and flags -CC = ppu32-gcc -CXX = ppu32-g++ -HOST_CC = gcc -APP_CC = gcc -APP_CXX = g++ - -OPT_FLAGS = -O3 - -# Cell SDK location -## For SDK 2.1: (plus, remove -DSPU_MAIN_PARAM_LONG_LONG below) -#SDK = /opt/ibm/cell-sdk/prototype/sysroot/usr -## For SDK 3.0: -SDK = /opt/cell/sdk/usr - - - -COMMON_C_CPP_FLAGS = $(OPT_FLAGS) -Wall -Winline \ - -fPIC -m32 -mabi=altivec -maltivec \ - -I. -I$(SDK)/include \ - -DGALLIUM_CELL $(DEFINES) - -CFLAGS = $(COMMON_C_CPP_FLAGS) -Wmissing-prototypes -std=c99 - -CXXFLAGS = $(COMMON_C_CPP_FLAGS) - - -SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \ - gallium gallium/winsys gallium/targets glu - -# Build no traditional Mesa drivers: -DRIVER_DIRS = - - -MKDEP_OPTIONS = -fdepend -Y - - -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread \ - -L$(SDK)/lib -m32 -Wl,-m,elf32ppc -R$(SDK)/lib -lspe2 - - -CELL_SPU_LIB = $(TOP)/src/gallium/drivers/cell/spu/g3d_spu.a - - -### SPU stuff - -SPU_CC = spu-gcc - -SPU_CFLAGS = $(OPT_FLAGS) -W -Wall -Winline -Wmissing-prototypes -Wno-main \ - -I. -I$(SDK)/spu/include -I$(TOP)/src/mesa/ $(INCLUDE_DIRS) \ - -DSPU_MAIN_PARAM_LONG_LONG \ - -include spu_intrinsics.h - -SPU_LFLAGS = -L$(SDK)/spu/lib -Wl,-N -lmisc -lm - -SPU_AR = ppu-ar -SPU_AR_FLAGS = -qcs - -SPU_EMBED = ppu32-embedspu -SPU_EMBED_FLAGS = -m32 diff --git a/mesalib/configs/linux-cell-debug b/mesalib/configs/linux-cell-debug deleted file mode 100644 index 42f3245ed..000000000 --- a/mesalib/configs/linux-cell-debug +++ /dev/null @@ -1,10 +0,0 @@ -# linux-cell-debug - -include $(TOP)/configs/linux-cell - -# just override name and OPT_FLAGS here: - -CONFIG_NAME = linux-cell-debug - -OPT_FLAGS = -g -DDEBUG - diff --git a/mesalib/configs/linux-dri b/mesalib/configs/linux-dri index 44c0c3d1d..6990c3a7a 100644 --- a/mesalib/configs/linux-dri +++ b/mesalib/configs/linux-dri @@ -58,7 +58,7 @@ SRC_DIRS := glx egl $(SRC_DIRS) EGL_DRIVERS_DIRS = glx DRIVER_DIRS = dri -GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965 svga/drm +GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel svga/drm GALLIUM_TARGET_DIRS = dri-vmwgfx GALLIUM_STATE_TRACKERS_DIRS = egl dri diff --git a/mesalib/configs/linux-i965 b/mesalib/configs/linux-i965 deleted file mode 100644 index 7656a2adc..000000000 --- a/mesalib/configs/linux-i965 +++ /dev/null @@ -1,9 +0,0 @@ -# Configuration for standalone mode i965 debug - -include $(TOP)/configs/linux-debug - -CONFIG_NAME = linux-i965 - -GALLIUM_DRIVER_DIRS = i965 -GALLIUM_WINSYS_DIRS = drm/i965/xlib -GALLIUM_TARGET_DIRS = diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 39d4e0f55..a4943e126 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -799,7 +799,7 @@ GLU_DIRS="sgi" GALLIUM_DIRS="auxiliary drivers state_trackers" GALLIUM_TARGET_DIRS="" GALLIUM_WINSYS_DIRS="sw" -GALLIUM_DRIVERS_DIRS="failover galahad trace rbug noop identity" +GALLIUM_DRIVERS_DIRS="galahad trace rbug noop identity" GALLIUM_STATE_TRACKERS_DIRS="" # build shared-glapi if enabled for OpenGL or if OpenGL ES is enabled @@ -1844,14 +1844,6 @@ if test "x$with_gallium_drivers" != x; then GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS i915/sw" gallium_check_st "i915/drm" "dri-i915" "xorg-i915" ;; - xi965) - PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED]) - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i965 softpipe" - if test "x$MESA_LLVM" = x1; then - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe" - fi - gallium_check_st "i965/drm" "dri-i965" "xorg-i965" - ;; xr300) gallium_require_llvm "Gallium R300" GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300" @@ -2019,12 +2011,6 @@ if echo "$SRC_DIRS" | grep 'gallium' >/dev/null 2>&1; then echo " Winsys dirs: $GALLIUM_WINSYS_DIRS" echo " Driver dirs: $GALLIUM_DRIVERS_DIRS" echo " Trackers dirs: $GALLIUM_STATE_TRACKERS_DIRS" - if echo "$GALLIUM_DRIVERS_DIRS" | grep i965 > /dev/null 2>&1; then - echo - echo " WARNING: enabling i965 gallium driver" - echo " the i965g driver is currently utterly broken, only for adventurous developers" - echo - fi else echo " Gallium: no" fi diff --git a/mesalib/docs/cell.html b/mesalib/docs/cell.html deleted file mode 100644 index 30626b60b..000000000 --- a/mesalib/docs/cell.html +++ /dev/null @@ -1,138 +0,0 @@ - - -Cell Driver - - - - - -

Mesa/Gallium Cell Driver

- -

-The Mesa -Cell -driver is part of the -Gallium3D -architecture. -Tungsten Graphics did the original implementation of the Cell driver. -

- - -

Source Code

- -

-The latest Cell driver source code is on the master branch of the Mesa -git repository. -

-

-To build the driver you'll need the IBM Cell SDK (version 2.1 or 3.0). -To use the driver you'll need a Cell system, such as a PS3 running Linux, -or the Cell Simulator (untested, though). -

- -

-If using Cell SDK 2.1, see the configs/linux-cell file for some -special changes. -

- -

-To compile the code, run make linux-cell. -Or to build in debug mode, run make linux-cell-debug. -

- -

-To use the library, make sure your current directory is the top of the -Mesa tree, then set LD_LIBRARY_PATH like this: -

-  export LD_LIBRARY_PATH=$PWD/lib/gallium:$PWD/lib/
-
- -

-Verify that the Cell driver is being used by running -progs/xdemos/glxinfo and looking for: -

-  OpenGL renderer string: Gallium 0.3, Cell on Xlib
-
- - -

Driver Implementation Summary

- -

-Rasterization is parallelized across the SPUs in a tiled-based manner. -Batches of transformed triangles are sent to the SPUs (actually, pulled by from -main memory by the SPUs). -Each SPU loops over a set of 32x32-pixel screen tiles, rendering the triangles -into each tile. -Because of the limited SPU memory, framebuffer tiles are paged in/out of -SPU local store as needed. -Similarly, textures are tiled and brought into local store as needed. -

- - -

Status

- -

-As of October 2008, the driver runs quite a few OpenGL demos. -Features that work include: -

- -

-Performance has recently improved with the addition of PPC code generation -for vertex shaders, but the code quality isn't too great yet. -

-

-Another bottleneck is SwapBuffers. It may be the limiting factor for -many simple GL tests. -

- - - -

Debug Options

- -

-The CELL_DEBUG env var can be set to a comma-separated list of one or -more of the following debug options: -

- -

-Note that some of these options may only work for linux-cell-debug builds. -

- -

-If the GALLIUM_NOPPC env var is set, PPC code generation will not be used -and vertex shaders will be run with the TGSI interpreter. -

-

-If the GALLIUM_NOCELL env var is set, the softpipe driver will be used -intead of the Cell driver. -This is useful for comparison/validation. -

- - - -

Contributing

- -

-If you're interested in contributing to the effort, familiarize yourself -with the code, join the mesa3d-dev mailing list, -and describe what you'd like to do. -

- - - - diff --git a/mesalib/docs/contents.html b/mesalib/docs/contents.html index 8882e7318..e3cea2a7c 100644 --- a/mesalib/docs/contents.html +++ b/mesalib/docs/contents.html @@ -78,8 +78,7 @@ a:visited {
  • Development Notes
  • Source Documentation
  • Mesa Subset Driver -
  • GL Dispatch -
  • Cell Driver +
  • GL Dispatch Links diff --git a/mesalib/docs/news.html b/mesalib/docs/news.html index 912849228..d6a2aa8e6 100644 --- a/mesalib/docs/news.html +++ b/mesalib/docs/news.html @@ -217,7 +217,7 @@ This is a bug-fix release.

    January 24, 2008

    -Added a new page describing the Mesa Cell driver. +Added a new page describing the Mesa Cell driver.

    diff --git a/mesalib/docs/relnotes-7.12.html b/mesalib/docs/relnotes-7.12.html index 74279a0e4..471bbdac7 100644 --- a/mesalib/docs/relnotes-7.12.html +++ b/mesalib/docs/relnotes-7.12.html @@ -46,6 +46,7 @@ tbd
  • GL_NV_fog_distance (all gallium drivers, nouveau classic)
  • GL_NV_primitive_restart (r600g)
  • GL_OES_EGL_image_external (gallium drivers) +
  • GL_OES_compressed_ETC1_RGB8_texture (softpipe, llvmpipe)
  • ARB_texture_rgb10_a2ui (softpipe, r600g)
  • Many updates to the VMware svga Gallium driver @@ -69,9 +70,12 @@ tbd desktop OpenGL, GL_COLOR_INDEX data can still be uploaded to a color (e.g., RGBA) texture. However, the data cannot be stored internally as color-index.
    • -
  • Removed support for GL_APPLE_client_storage extension. +
  • Removed support for GL_APPLE_client_storage extension.
  • Removed the classic Mesa r300 and r600 drivers, which are superseded - by the gallium drivers for this hardware. + by the gallium drivers for this hardware.
    • +
  • Removed the dead Gallium i965, cell and failover drivers, which were + either broken and with nobody in sight to fix the situation or + deprecated.
    • diff --git a/mesalib/docs/relnotes-7.5.html b/mesalib/docs/relnotes-7.5.html index 56deca6a8..a25ca8efc 100644 --- a/mesalib/docs/relnotes-7.5.html +++ b/mesalib/docs/relnotes-7.5.html @@ -61,7 +61,7 @@ baa7a1e850b6e39bae58868fd0684004 MesaGLUT-7.5.tar.bz2