Alan Hourihane
47ad296a18
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into gallium-0.2
...
Conflicts:
src/mesa/drivers/dri/i915/intel_ioctl.c
src/mesa/main/texstore.c
src/mesa/tnl/t_vp_build.c
src/mesa/vbo/vbo_exec_draw.c
2008-09-11 17:32:18 +01:00
Keith Whitwell
0397b2bb41
Merge branch 'gallium-0.1' into gallium-0.2
...
A first attempt at moving gallium onto a branch directly off master...
It will be interesting to see how much work this takes to get running.
Have resolved the conflicts semi-arbitarily, not compiled or tested.
Conflicts:
.gitignore
Makefile
configs/config.mgw
configs/darwin
configs/darwin-x86ppc
configs/default
configs/freebsd-dri
configs/linux-dri
configs/linux-dri-xcb
configs/linux-fbdev
configs/linux-static
configs/linux-x86-64-static
configs/linux-x86-static
doxygen/Makefile
include/GL/gl.h
progs/demos/Makefile
progs/demos/descrip.mms
progs/demos/texenv.c
progs/egl/.gitignore
progs/egl/Makefile
progs/glsl/.gitignore
progs/glsl/Makefile
progs/glsl/convolutions.c
progs/samples/Makefile.mgw
progs/tests/.gitignore
progs/trivial/.gitignore
progs/trivial/point-param.c
progs/trivial/tri.c
progs/xdemos/.gitignore
progs/xdemos/glthreads.c
src/egl/drivers/demo/Makefile
src/egl/drivers/dri/Makefile
src/egl/main/Makefile
src/glu/Makefile
src/glu/sgi/Makefile
src/glu/sgi/Makefile.mgw
src/glut/glx/Makefile.mgw
src/glut/os2/WarpWin.cpp
src/glut/os2/glut_cindex.cpp
src/glut/os2/glut_gamemode.cpp
src/glut/os2/glut_win.cpp
src/glut/os2/glut_winmisc.cpp
src/glut/os2/os2_glx.cpp
src/glut/os2/os2_menu.cpp
src/glut/os2/os2_winproc.cpp
src/glw/Makefile
src/glx/x11/dri_glx.c
src/glx/x11/glxext.c
src/mesa/Makefile
src/mesa/Makefile.mgw
src/mesa/descrip.mms
src/mesa/drivers/beos/Makefile
src/mesa/drivers/common/descrip.mms
src/mesa/drivers/common/driverfuncs.c
src/mesa/drivers/directfb/Makefile
src/mesa/drivers/dri/Makefile.template
src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/common/dri_bufmgr.h
src/mesa/drivers/dri/common/dri_util.c
src/mesa/drivers/dri/common/extension_helper.h
src/mesa/drivers/dri/common/mmio.h
src/mesa/drivers/dri/common/utils.c
src/mesa/drivers/dri/common/utils.h
src/mesa/drivers/dri/glcore/Makefile
src/mesa/drivers/dri/i810/i810screen.c
src/mesa/drivers/dri/i915/intel_ioctl.c
src/mesa/drivers/dri/i915/intel_ioctl.h
src/mesa/drivers/dri/i915/intel_screen.c
src/mesa/drivers/dri/i915/server/i830_common.h
src/mesa/drivers/dri/i915/server/i830_dri.h
src/mesa/drivers/dri/i965/intel_screen.c
src/mesa/drivers/dri/i965/server/i830_common.h
src/mesa/drivers/dri/i965/server/i830_dri.h
src/mesa/drivers/dri/mach64/mach64_screen.c
src/mesa/drivers/dri/nouveau/nouveau_context.h
src/mesa/drivers/dri/nouveau/nouveau_fifo.c
src/mesa/drivers/dri/nouveau/nouveau_fifo.h
src/mesa/drivers/dri/nouveau/nouveau_screen.c
src/mesa/drivers/dri/nouveau/nouveau_screen.h
src/mesa/drivers/dri/r128/r128_tex.h
src/mesa/drivers/dri/savage/savageioctl.h
src/mesa/drivers/fbdev/Makefile
src/mesa/drivers/osmesa/Makefile
src/mesa/drivers/osmesa/descrip.mms
src/mesa/drivers/x11/Makefile
src/mesa/drivers/x11/descrip.mms
src/mesa/drivers/x11/xm_dd.c
src/mesa/glapi/glapi.c
src/mesa/glapi/glthread.c
src/mesa/main/api_validate.c
src/mesa/main/attrib.c
src/mesa/main/bufferobj.c
src/mesa/main/bufferobj.h
src/mesa/main/buffers.c
src/mesa/main/config.h
src/mesa/main/context.c
src/mesa/main/descrip.mms
src/mesa/main/drawpix.c
src/mesa/main/enums.c
src/mesa/main/fbobject.c
src/mesa/main/glheader.h
src/mesa/main/imports.c
src/mesa/main/mipmap.c
src/mesa/main/mm.c
src/mesa/main/mm.h
src/mesa/main/mtypes.h
src/mesa/main/points.c
src/mesa/main/sources
src/mesa/main/state.c
src/mesa/main/texcompress_fxt1.c
src/mesa/main/texenvprogram.c
src/mesa/main/texobj.c
src/mesa/main/texstate.c
src/mesa/main/texstore.c
src/mesa/math/descrip.mms
src/mesa/shader/arbprogram.c
src/mesa/shader/descrip.mms
src/mesa/shader/prog_execute.c
src/mesa/shader/prog_statevars.c
src/mesa/shader/prog_statevars.h
src/mesa/shader/prog_uniform.c
src/mesa/shader/program.c
src/mesa/shader/program.h
src/mesa/shader/shader_api.c
src/mesa/shader/slang/descrip.mms
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
src/mesa/sources
src/mesa/swrast/descrip.mms
src/mesa/swrast/s_drawpix.c
src/mesa/swrast/s_fragprog.c
src/mesa/swrast/s_readpix.c
src/mesa/swrast/s_span.c
src/mesa/swrast_setup/descrip.mms
src/mesa/tnl/descrip.mms
src/mesa/tnl/t_context.h
src/mesa/tnl/t_vp_build.c
src/mesa/tnl/tnl.h
src/mesa/vbo/descrip.mms
src/mesa/vbo/vbo_context.c
src/mesa/vbo/vbo_exec_array.c
src/mesa/x86-64/xform4.S
src/mesa/x86/rtasm/x86sse.c
src/mesa/x86/rtasm/x86sse.h
windows/VC6/progs/glut/glut.dsp
windows/VC7/mesa/gdi/gdi.vcproj
windows/VC7/mesa/glu/glu.vcproj
windows/VC7/mesa/mesa.sln
windows/VC7/mesa/mesa/mesa.vcproj
windows/VC7/mesa/osmesa/osmesa.vcproj
windows/VC7/progs/glut/glut.vcproj
windows/VC8/mesa/gdi/gdi.vcproj
windows/VC8/mesa/glu/glu.vcproj
windows/VC8/mesa/mesa.sln
windows/VC8/mesa/mesa/mesa.vcproj
windows/VC8/progs/glut/glut.vcproj
2008-09-11 16:05:15 +01:00
Brian Paul
9aeb6e7825
added 7.1 MD5 sums
2008-08-26 16:12:29 -06:00
Brian Paul
17e9bbd5a4
7.1 updates from 7.2 branch
2008-08-26 15:58:42 -06:00
Timo Jyrinki
385d6b2e68
asst. html doc updates
2008-08-26 12:36:39 -06:00
Brian Paul
2848b55ed5
mesa: move old/obsolete MESA extensions specs to OLD/ directory
2008-08-20 15:33:03 -06:00
Brian Paul
b7ff70e16a
bring in docs from 7.0.4 release/branch
2008-08-16 11:09:49 -06:00
Brian Paul
b068ab62a0
updated GLSL bug fixes
2008-07-29 17:50:43 -06:00
Brian Paul
1a5c99f4b5
document GLSL 1.20 status
2008-07-29 16:46:08 -06:00
Brian Paul
77497eb73b
mesa: revert building glslcompiler by default
2008-07-21 09:01:34 -06:00
Brian Paul
3bfedb7ed4
mesa: build the stand-alone glslcompiler by default, update the docs
2008-07-17 15:40:10 -06:00
Brian Paul
1f4d0748ba
GLSL-related bug fixes
2008-07-04 10:05:39 -06:00
Brian Paul
011b0e51e4
link to DRM 2.3.1
2008-07-01 09:02:10 -06:00
Dan Nicholson
5cae1b747b
autoconf: Improve the visibility of the swrast DRI driver
...
Improve the --with-dri-drivers help text so that users are aware that
they should install the swrast DRI driver.
2008-06-30 11:16:09 -07:00
Brian Paul
3491cbea88
added pointer to beta/release candidates
2008-06-21 10:19:45 -06:00
Brian Paul
376203cff8
document makefile changes
2008-06-09 13:52:22 -06:00
Brian Paul
8bd70a7bbe
update, re-org build/install instructions
2008-05-27 13:27:57 -06:00
Brian Paul
5173fc6669
updates for 7.1 release
2008-05-27 12:51:10 -06:00
José Fonseca
77ce568ff7
Remove CVS keywords.
2008-05-26 20:14:40 +09:00
Dan Nicholson
5dbbde5b22
Default DRI driver directory to match X.Org xserver
...
Since the only valid consumer of the DRI drivers is the X.Org xserver,
this changes the default DRI driver directory to match xorg-server:
${libdir}/dri. The old default of /usr/X11R6/modules/dri was wrong for
nearly all current systems.
2008-05-09 07:06:52 -07:00
Dan Nicholson
00994ac08c
autoconf: Scrape the version from configs/default
...
Added the make script version.mk to print the various version numbers
from configs/default. This is used to substitute the version in autoconf
rather than duplicating it in both places.
2008-05-05 14:21:28 -07:00
Brian
5d73502625
7.0.3 updates
2008-04-04 19:28:33 -06:00
Brian
fad7933c44
updated w/ 7.0.3 release
2008-04-04 19:28:33 -06:00
Brian
6eddb4cb20
import 7.0.3 relnotes from 7.0 branch
2008-04-04 19:28:33 -06:00
Dan Nicholson
460d25dca1
autoconf: Add autogen.sh from Xorg for easier setup from git
...
The defacto method to rebuild the autotools and run the generated
configure is an autogen.sh script. It is much more discoverable than the
custom `make configure' used here. The Makefile targets are still useful
for creating tarballs, though. This autogen.sh is copied from Xorg.
2008-03-10 12:36:57 -07:00
Brian
99a1260985
added info about checking out gallium-0.1 for cell code
2008-03-09 10:39:00 -06:00
Brian
ddbfa8c462
added git on Windows section
2008-02-28 08:03:34 -07:00
Brian
cef71f58c9
a few words about how the cell driver works.
2008-02-28 08:03:34 -07:00
José Fonseca
60159c1b09
Convert crlf->lf line endings.
...
Windows/DOS users should enable core.autocrlf from now on:
git config --global core.autocrlf true
2008-02-28 16:34:32 +09:00
José Fonseca
2573f0e5d6
Convert crlf->lf line endings.
...
Windows/DOS users should enable core.autocrlf from now on.
2008-02-28 15:53:13 +09:00
Brian
cabcee9ea9
document cell -DSPU_MAIN_PARAM_LONG_LONG flag
2008-02-27 18:02:23 -07:00
caner
5047a8ae19
miniglx doc updates
2008-02-14 09:33:26 -07:00
Brian
b87c1ab2c0
Bring in previous 7.0.1/2 release notes, added Cell driver page.
2008-01-24 09:15:31 -07:00
Dan Nicholson
544ab209e7
Allow osmesa to be enabled or disabled
...
The conditional in src/mesa/Makefile currently hardcodes the cases where
libOSMesa can be built on libGL. Likewise, the xlib case always includes
libOSMesa in the stand-alone target.
This changes the conditional to a loop over the DRIVER_DIRS variable.
This means that any driver configuration can enable or disable osmesa.
The current "stand-alone" rule is changed so that DRIVER_DIRS=x11 and
DRIVER_DIRS="x11 osmesa" are both respected.
The configure option is changed to --enable-gl-osmesa as this change
allows libOSMesa to be built upon any of the libGL-enabling drivers.
2008-01-11 08:25:15 -08:00
Dan Nicholson
73f6f7ed91
autoconf: Remind developers to bump version numbers in configure.ac
...
Just like configs/default, the version number in configure.ac needs to
be bumped for releases. Maybe later we can figure out how to scrape the
version from configs/default into configure.ac.
2007-12-30 08:48:10 -08:00
Dan Nicholson
2b440d5461
Merge branch 'master' into autoconf2
2007-12-26 15:41:24 -06:00
Dan Nicholson
ab57cbaccc
autoconf: Helper options for adding GCC 32/64 bit flags
...
Two new configure options to add -m32 or -m64 to the CFLAGS and CXXFLAGS
when GCC is in use. By default, the user supplied options are
environment variables are respected, but these options are quick helps
for the common case of x86/x86_64 using GCC.
2007-12-26 15:38:30 -06:00
Dan Nicholson
4c5a2b3af2
autoconf: Documentation for using the autoconf'd build
...
Most of the options available from configure are documented on the
autoconf.html. This page is reached as an alternative provided on the
install.html page. An FAQ about why there is no configure script has
been removed.
2007-12-23 16:38:18 -08:00
Dan Nicholson
f71032b7e2
docs: Fix links in contribute section
...
The contribute section had a broken hyperlink, masking the mailing list
text.
2007-12-18 22:13:46 -08:00
Brian
27028fcf74
minor additions to avoid FAQs
2007-11-27 10:31:55 -07:00
Brian
5ef3a2c06d
document GLSL float f/F suffix bug
2007-11-27 10:31:55 -07:00
Brian
2bdd467dfd
GLSL support in i965 driver
2007-10-31 09:57:47 -06:00
Brian
7f80dc1ebe
updated list
2007-10-31 09:57:47 -06:00
Brian
de1d725f44
updated glext.h license info (Khronos), plus other clean-ups
2007-10-01 17:57:25 -06:00
Brian
e776e7a95a
update the DRM/DRI instructions
2007-09-28 18:39:41 -06:00
Brian
f2d9a07efe
for Miniglx, use git sources
2007-09-27 10:39:01 -06:00
Brian
d3c77cebff
updated vrml link
2007-09-13 14:44:27 -06:00
Brian
5bba58ca22
updated with pkg-config info
2007-09-12 10:11:49 -06:00
Dan Nicholson
f5557c3a52
DESTDIR support.
2007-09-12 09:57:53 -06:00
Brian
9ceff4ac4c
updated bug report guidelines
2007-09-05 10:04:37 -06:00