diff --git a/Makefile b/Makefile index d65d4c4968e..cf6555c782d 100644 --- a/Makefile +++ b/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/common.py b/common.py index 5e2967fc59b..5578f72af1f 100644 --- a/common.py +++ b/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', '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/configs/linux-cell b/configs/linux-cell deleted file mode 100644 index 7f38da971d1..00000000000 --- a/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/configs/linux-cell-debug b/configs/linux-cell-debug deleted file mode 100644 index 42f3245edc9..00000000000 --- a/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/docs/cell.html b/docs/cell.html deleted file mode 100644 index 30626b60b42..00000000000 --- a/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/docs/contents.html b/docs/contents.html index 8882e731879..e3cea2a7ce3 100644 --- a/docs/contents.html +++ b/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/docs/news.html b/docs/news.html index 91284922880..d6a2aa8e6dd 100644 --- a/docs/news.html +++ b/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/docs/relnotes-7.12.html b/docs/relnotes-7.12.html index 0d2211358cf..393b1124e58 100644 --- a/docs/relnotes-7.12.html +++ b/docs/relnotes-7.12.html @@ -74,6 +74,8 @@ tbd by the gallium drivers for this hardware.
  • Removed the i965g driver, which was broken and with nobody in sight to fix the situation
    • +
  • Removed the Gallium cell driver, it was just a burden on Gallium + development and nobody seems to use it.
    • diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index 56deca6a86c..a25ca8efc11 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -61,7 +61,7 @@ baa7a1e850b6e39bae58868fd0684004 MesaGLUT-7.5.tar.bz2