diff --git a/SConstruct b/SConstruct index 89144f7579d..4a0fb94debc 100644 --- a/SConstruct +++ b/SConstruct @@ -32,10 +32,10 @@ import common default_statetrackers = 'mesa' if common.default_platform in ('linux', 'freebsd', 'darwin'): - default_drivers = 'softpipe,failover,i915simple,trace' + default_drivers = 'softpipe,failover,i915simple,trace,identity' default_winsys = 'xlib' elif common.default_platform in ('winddk',): - default_drivers = 'softpipe,i915simple,trace' + default_drivers = 'softpipe,i915simple,trace,identity' default_winsys = 'all' else: default_drivers = 'all' @@ -46,7 +46,7 @@ common.AddOptions(opts) opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers, ['mesa', 'python'])) opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers, - ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell', 'trace', 'r300'])) + ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell', 'trace', 'r300', 'identity'])) opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys, ['xlib', 'intel', 'gdi', 'radeon'])) diff --git a/configs/darwin b/configs/darwin index 29fa0f13ff4..213c397287e 100644 --- a/configs/darwin +++ b/configs/darwin @@ -10,7 +10,7 @@ X11_DIR = $(INSTALL_DIR) # Compiler and flags CC = gcc -CXX = gcc +CXX = g++ PIC_FLAGS = -fPIC DEFINES = -D_DARWIN_C_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L \ -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE -DPTHREADS \ diff --git a/configs/default b/configs/default index dc28be37ddf..a8996702d70 100644 --- a/configs/default +++ b/configs/default @@ -95,7 +95,7 @@ EGL_DRIVERS_DIRS = demo GALLIUM_DIRS = auxiliary drivers state_trackers GALLIUM_AUXILIARY_DIRS = rbug draw translate cso_cache pipebuffer tgsi sct rtasm util indices GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a) -GALLIUM_DRIVERS_DIRS = softpipe i915simple failover trace +GALLIUM_DRIVERS_DIRS = softpipe i915simple failover trace identity GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) GALLIUM_WINSYS_DIRS = xlib egl_xlib GALLIUM_WINSYS_DRM_DIRS = diff --git a/configure.ac b/configure.ac index c5e86f9ac47..9b65d96b396 100644 --- a/configure.ac +++ b/configure.ac @@ -417,7 +417,7 @@ GALLIUM_DIRS="auxiliary drivers state_trackers" GALLIUM_WINSYS_DIRS="" GALLIUM_WINSYS_DRM_DIRS="" GALLIUM_AUXILIARY_DIRS="rbug draw translate cso_cache pipebuffer tgsi sct rtasm util indices" -GALLIUM_DRIVERS_DIRS="softpipe failover trace" +GALLIUM_DRIVERS_DIRS="softpipe failover trace identity" GALLIUM_STATE_TRACKERS_DIRS="" case "$mesa_driver" in @@ -656,7 +656,7 @@ dnl Which drivers to build - default is chosen by platform AC_ARG_WITH([dri-drivers], [AS_HELP_STRING([--with-dri-drivers@<:@=DIRS...@:>@], [comma delimited DRI drivers list, e.g. - "swrast,i965,radeon,nouveau" @<:@default=auto@:>@])], + "swrast,i965,radeon" @<:@default=auto@:>@])], [with_dri_drivers="$withval"], [with_dri_drivers=yes]) if test "x$with_dri_drivers" = x; then diff --git a/docs/devinfo.html b/docs/devinfo.html index 3cebf5f36db..0fb816749ed 100644 --- a/docs/devinfo.html +++ b/docs/devinfo.html @@ -123,48 +123,46 @@ These are the instructions for making a new Mesa release.

Get latest source files

-Use "cvs update -dAP " to get the latest Mesa files from CVS. +Use git to get the latest Mesa files from the git repository, from whatever +branch is relevant.

Verify and update version info

-Create/edit the docs/RELNOTES-X.Y file to document what's new in the release. -Add the new RELNOTES-X.Y file to relnotes.html. -Update the docs/VERSIONS file too. +Create/edit the docs/relnotes-x.y.html file to document what's new in the release. +Add the new relnotes-x.y.html file to relnotes.html.

-Edit the MESA_MAJOR, MESA_MINOR and MESA_TINY version numbers in +Update the MESA_MAJOR, MESA_MINOR and MESA_TINY version numbers in configs/default. +Also update the VERSION line in the top-level Makefile.

Make sure the values in src/mesa/main/version.h are correct.

-

-Edit the top-level Makefile and verify that DIRECTORY, LIB_NAME and -DEMO_NAME are correct. -

-

Update the docs/news.html file and docs/download.html files.

-Check in all updates to CVS. +Check in all updates to git.

-Tag the CVS files with the release name (in the form mesa_X_Y). +Tag the files with the release name (in the form mesa_X_Y) +with: git tag -a mesa_X_Y +Then: git push origin mesa_X_Y

Make the tarballs

Make a symbolic link from $(DIRECTORY) to 'Mesa'. For example, -ln -s Mesa Mesa-6.3 +ln -s Mesa Mesa-7.5 This is needed in order to make a correct tar file in the next step.

@@ -177,7 +175,7 @@ Make the distribution files. From inside the Mesa directory:

After the tarballs are created, the md5 checksums for the files will be computed. -Add them to the docs/news.html file. +Add them to the docs/relnotes-X.Y.html file.

@@ -191,9 +189,21 @@ Follow the directions on SourceForge for creating a new "release" and uploading the tarballs.

+

+Basically, to upload the tarball files with: +
+ +rsync -avP ssh Mesa*-X.Y.* USERNAME@frs.sourceforge.net:uploads/ + +

+

Update the web site by copying the docs/ directory's files to -/home/users/b/br/brianp/mesa-www/htdocs/ +/home/users/b/br/brianp/mesa-www/htdocs/ with: +
+ +sftp USERNAME,mesa3d@web.sourceforge.net +

diff --git a/docs/install.html b/docs/install.html index be61ef30433..953d2094d5b 100644 --- a/docs/install.html +++ b/docs/install.html @@ -21,6 +21,7 @@

  • Building OpenGL programs with pkg-config
  • Windows +
  • SCons
  • Other
    @@ -328,13 +329,60 @@ For example, compiling and linking a GLUT application can be done with:

    2. Windows Compilation and Installation

    -Please see the README.WIN32 file. +Please see the instructions on building with SCons. +Alternatively see README.WIN32 file.

    + +

    3. Building with SCons

    + +

    +To build Mesa with SCons on Linux or Windows do +

    +
    +    scons
+
    +

    +The build output will be placed in +build/platform-machine-debug/..., where platform is for +example linux or windows, machine is x86 or x86_64, optionally followed +by -debug for debug builds. +

    + +

    +The sample programs are built seperately. To build them do +

    +    scons -C progs
+
    +And the build output will be placed in progs/build/... +

    + +

    +To build Mesa with SCons for Windows on Linux using the MinGW crosscompiler toolchain do +

    +
    +    scons platform=windows toolchain=crossmingw machine=x86 statetrackers=mesa drivers=softpipe,trace winsys=gdi
+    scons -C progs platform=windows toolchain=crossmingw machine=x86 -k
+
    +

    +This will create: +

    + +

    +Put them all in the same directory to test them. +

    + +     -

    3. Other systems

    +

    4. Other systems

    Documentation for other environments (some may be very out of date): diff --git a/docs/news.html b/docs/news.html index 8cf2f91dd03..ee4a86c2a21 100644 --- a/docs/news.html +++ b/docs/news.html @@ -11,6 +11,21 @@

    News

    +

    June 23, 2009

    +

    +Mesa 7.4.4 is released. +This is a stable release that fixes a regression in the i915/i965 drivers +that slipped into the 7.4.3 release. +

    + + +

    June 19, 2009

    +

    +Mesa 7.4.3 is released. +This is a stable release fixing bugs since the 7.4.2 release. +

    + +

    May 15, 2009

    Mesa 7.4.2 is released. diff --git a/docs/openvg.html b/docs/openvg.html new file mode 100644 index 00000000000..442ee522f18 --- /dev/null +++ b/docs/openvg.html @@ -0,0 +1,68 @@ + + +Mesa Release Notes + + + + + + + +

    OpenVG State Tracker

    + +

    +The current version of the OpenVG state tracker implements OpenVG 1.0. +

    +

    +More informations about OpenVG can be found at + +http://www.khronos.org/openvg/ . +

    +

    +The OpenVG state tracker depends on the Gallium architecture and a working EGL implementation. +

    + + +

    Building the library

    +
      +
    1. Build Mesa3D with Gallium3D. Any build that builds Gallium3D libraries and EGL will suffice
      2. +
    2. cd src/gallium/state_trackers/vega; make
      3. +
    3. The last step will build libOpenVG library. You can add the libdir to LD_LIBRARY_PATH or install libOpenVG
      4. +
    + +

    Sample build

    +A sample build looks as follows: +
    +  make linux-x86-64-debug
+  cd src/gallium/state_trackers/vega
+  make
+  cd ../../../..
+  export LD_LIBRARY_PATH=$PWD/lib64
+  export EGL_DRIVER="egl_softpipe"
+
    + +

    OpenVG Demos

    + +

    +To build the OpenVG demos: +

    +
    +  cd progs/openvg
+  make
+
    +

    +To run a demo: +

    +
    +  cd openvg/demos
+  ./lion
+
    + + +

    Notes

    + + + + diff --git a/docs/relnotes-7.4.3.html b/docs/relnotes-7.4.3.html new file mode 100644 index 00000000000..35b5dccbb0a --- /dev/null +++ b/docs/relnotes-7.4.3.html @@ -0,0 +1,79 @@ + + +Mesa Release Notes + + + + + + + +

    Mesa 7.4.3 Release Notes / 19 June 2009

    + +

    +Mesa 7.4.3 is a stable development release fixing bugs since the 7.4.2 release. +

    +

    +Mesa 7.4.3 implements the OpenGL 2.1 API, but the version reported by +glGetString(GL_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 2.1. +

    +

    +See the Compiling/Installing page for prerequisites +for DRI hardware acceleration. +

    + + +

    MD5 checksums

    +
    +34c5a6c47ed51f31c4fa36e269831352  MesaLib-7.4.3.tar.gz
+70a983ba3deaa8bd63b18bbab283f698  MesaLib-7.4.3.tar.bz2
+34f21b3205b271d575030aa98a2dda51  MesaLib-7.4.3.zip
+56752b7adede212e6097afb10d0c0d59  MesaDemos-7.4.3.tar.gz
+8ffa51c4833b1e298300a005e2d7ca2a  MesaDemos-7.4.3.tar.bz2
+0037d24d41400d6fb9800ae55b8c863f  MesaDemos-7.4.3.zip
+20e24f6692c0c90e7e3b220f79c4108d  MesaGLUT-7.4.3.tar.gz
+03a4beeef74fc5ef0b1d6d04710e5a8a  MesaGLUT-7.4.3.tar.bz2
+273788230adbdb9d57371309adedcf5f  MesaGLUT-7.4.3.zip
+
    + + +

    Bug fixes

    + + + + +

    Driver Status

    + +
    +Driver			Status
+----------------------	----------------------
+DRI drivers		varies with the driver
+XMesa/GLX (on Xlib)	implements OpenGL 2.1
+OSMesa (off-screen)	implements OpenGL 2.1
+Windows/Win32		implements OpenGL 2.1
+Glide (3dfx Voodoo1/2)	implements OpenGL 1.3
+SVGA			unsupported
+Wind River UGL		unsupported
+DJGPP			unsupported
+GGI			unsupported
+BeOS			unsupported
+Allegro			unsupported
+D3D			unsupported
+
    + + + diff --git a/docs/relnotes-7.4.4.html b/docs/relnotes-7.4.4.html new file mode 100644 index 00000000000..2a34568a7e4 --- /dev/null +++ b/docs/relnotes-7.4.4.html @@ -0,0 +1,68 @@ + + +Mesa Release Notes + + + + + + + +

    Mesa 7.4.4 Release Notes / 23 June 2009

    + +

    +Mesa 7.4.4 is a stable development release fixing bugs since the 7.4.3 release. +

    +

    +Mesa 7.4.4 implements the OpenGL 2.1 API, but the version reported by +glGetString(GL_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 2.1. +

    +

    +See the Compiling/Installing page for prerequisites +for DRI hardware acceleration. +

    + + +

    MD5 checksums

    +
    +0b56fe5a88ab0c3c5b2da5068f63f416  MesaLib-7.4.4.tar.gz
+b66528d314c574dccbe0ed963cac5e93  MesaLib-7.4.4.tar.bz2
+2818076f3ba23fa87fdfe4602a637a18  MesaLib-7.4.4.zip
+3e77b208386c47b18165bce5ae317e2c  MesaDemos-7.4.4.tar.gz
+628142ec9a54cd28cc027e6ce26cff47  MesaDemos-7.4.4.tar.bz2
+d08a30d30ab7174859aa709cba6c726d  MesaDemos-7.4.4.zip
+e6e91ba16e274d40cf3a97ad3218af01  MesaGLUT-7.4.4.tar.gz
+e14bbb52517e8121b31f1387515365ab  MesaGLUT-7.4.4.tar.bz2
+f10ed20469753c2b3d68c99854f80fd4  MesaGLUT-7.4.4.zip
+
    + + +

    Bug fixes

    + + + + +

    Driver Status

    + +
    +Driver			Status
+----------------------	----------------------
+DRI drivers		varies with the driver
+XMesa/GLX (on Xlib)	implements OpenGL 2.1
+OSMesa (off-screen)	implements OpenGL 2.1
+Windows/Win32		implements OpenGL 2.1
+Glide (3dfx Voodoo1/2)	implements OpenGL 1.3
+SVGA			unsupported
+Wind River UGL		unsupported
+DJGPP			unsupported
+GGI			unsupported
+BeOS			unsupported
+Allegro			unsupported
+D3D			unsupported
+
    + + + diff --git a/docs/relnotes-7.5.html b/docs/relnotes-7.5.html index 663626cb05a..5a67d3fb528 100644 --- a/docs/relnotes-7.5.html +++ b/docs/relnotes-7.5.html @@ -68,6 +68,10 @@ including GL_ATI_separate_stencil, GL_EXT_stencil_two_side and OpenGL 2.0
  • GL_EXT_texture_swizzle extension (software drivers, i965 driver)
  • Updated SPARC assembly optimizations (David S. Miller)
  • Initial support for separate compilation units in GLSL compiler. +
  • Increased max number of generic GLSL varying variables to 16 (formerly 8). +
  • GLSL linker now detects when too many varying variables are used. +
  • Optimize-out redundant glMaterial and glShadeModel calls in display lists +
  • Fixed gl_TextureMatrix[i][j] array indexing bug in GLSL compiler. @@ -75,6 +79,7 @@ including GL_ATI_separate_stencil, GL_EXT_stencil_two_side and OpenGL 2.0 diff --git a/docs/relnotes-7.6.html b/docs/relnotes-7.6.html index f0e15f5024c..1e7ccf88bf2 100644 --- a/docs/relnotes-7.6.html +++ b/docs/relnotes-7.6.html @@ -37,7 +37,15 @@ tbd
  • OpenVG front-end (state tracker for Gallium). This was written by Zack Rusin at Tungsten Graphics.
  • GL_APPLE_vertex_array_object for Gallium drivers and Intel DRI drivers. +
  • GL_ARB_vertex_array_object for Gallium drivers, software drivers and + Intel DRI drivers.
  • GL_ARB_copy_buffer extension (supported in Gallium and swrast drivers) +
  • GL_ARB_map_buffer_range extension (supported in Gallium and software drivers) +
  • GL_EXT_provoking_vertex extension (supported in Gallium and software drivers) +
  • Rewritten radeon/r200/r300 driver using a buffer manager +
  • radeon/r200/r300 GL_EXT_framebuffer_object support when used with + kernel memory manager +
  • r300 driver support for GL_EXT_vertex_array_bgra, GL_EXT_texture_sRGB diff --git a/docs/relnotes.html b/docs/relnotes.html index ad5b74bad3c..35a4c7385f7 100644 --- a/docs/relnotes.html +++ b/docs/relnotes.html @@ -8,13 +8,6 @@

    Release Notes

    -

    -Mesa uses an even/odd version number scheme like the Linux kernel. -Odd numbered versions (such as 6.5) designate new developmental releases. -Even numbered versions (such as 6.4) designate stable releases. -

    - -

    The release notes summarize what's new or changed in each Mesa release.

    @@ -22,6 +15,8 @@ The release notes summarize what's new or changed in each Mesa release.