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
José Fonseca
90b2beb661
Simplify makefile boilerplate code.
...
Don't define ASM_SOURCES variable globally -- reserve that variable to be defined
locally by makefiles, together with C_SOURCES and CPP_SOURCES.
2008-02-19 14:06:11 +09:00
Dan Nicholson
da693b7c89
Don't try to build nonexistent i915tex driver on linux-x86-64
2007-12-18 22:20:37 -08:00
Gary Wong
50a81669ba
Add i915tex and i965.
2006-12-02 02:20:05 +00:00
Brian Paul
883f9891cb
LIB_DIR is now just 'lib' or 'lib64'
...
Replaced $(LIB_DIR) with $(TOP)/$(LIB_DIR), use LIB_DIR in install targets.
Patch by Hanno Böck.
2006-07-13 02:50:27 +00:00
Alan Hourihane
fbcb37cac5
remove i830
2006-01-26 08:53:32 +00:00
Brian Paul
28569c25f6
use ASM_API variable, bug 4415
2005-09-12 15:19:19 +00:00
Adam Jackson
8fcd1e0287
Convert libGL and DRI drivers to require libdrm.
...
libdrm can be had from:
http://people.freedesktop.org/~ajax/libdrm/
2005-08-19 20:20:03 +00:00
Vladimir Dergachev
8e653f12bc
Allow R300 driver to build on x86-64 and PowerPC.
2005-08-07 21:50:33 +00:00
Ian Romanick
f0ff50d4ed
Add support for assembly (static) dispatch functions on x86-64. This
...
is basically patch #2939 from X.org bugzilla #3379 . This does *not*
fix the bug as it does not dynamically generate stubs at run-time. It
just gets things one step closer.
2005-07-02 08:29:57 +00:00
Ian Romanick
9204e87b2e
Massive refactor of (most of) the Linux config files. This reduces
...
the length of each config and brings a lot of much needed uniformity
to them.
2005-07-02 07:38:40 +00:00
Ian Romanick
bfc8a8dc63
Make linux-dri-x86-64 more like linux-dri-x86. Add ARCH_FLAGS. This is
...
where things like "-m64" or "-m32" should be specified. Using this, a
32-bit DRI build can be done on an x86-64 system by doing 'ARCH_CFLAGS=-m32
make linux-dri-x86'. Minor tweaks to linux-dri to support these changes.
2005-04-06 21:34:34 +00:00
Eric Anholt
baa832d311
Change another usage of __AMD64__ to the standard __amd64__, and remove
...
__AMD64__ from the linux configs so it won't creep back in as easily. Fixes
hang on FreeBSD on the first lock grab.
2005-02-14 06:57:27 +00:00
Keith Whitwell
fc23672327
Improve the behaviour of the build system wrt depend files.
...
- Remove the -Y option for makedepend, so that the standard
directories are searched
- No longer pipe the multiple errors that the -Y option caused
into /dev/null -- we want to know about these failures.
- Fix up a few other misc makedepend failures.
2004-12-08 15:16:36 +00:00
Adam Jackson
0b8acd90b3
libGL needs libXxf86vm.a.
2004-10-29 00:10:43 +00:00
Adam Jackson
61702d4afe
Add glx/x11 to the DRI configs, and change the Solo configs to build glx/mini.
2004-10-25 21:23:08 +00:00
Adam Jackson
312c68fab3
Add DRI_LIB_DEPS for the DRI drivers to link against. Remove expat from the
...
link list for libGL itself under DRI configurations, since the XML parsing
code is in the drivers themselves.
2004-10-25 21:20:29 +00:00
Brian Paul
d84f09306c
Replace -lGL with -l$(GL_LIB), etc.
...
Remove GLU_LIB_DEPS, OSMESA_LIB_DEPS lines if identical to 'default' file.
2004-09-13 21:04:48 +00:00
Felix Kuehling
c2530b5730
Converted the Savage driver to the new DRI interface and enabled compilation
...
in the Mesa tree.
2004-08-22 20:31:40 +00:00
Brian Paul
9408fe0c09
remove -lXm (motif) from GLW_LIB_DEPS since it's not needed by default
2004-07-20 20:43:24 +00:00
Dave Airlie
2a28636274
add i915 as it seems to build okay..
2004-06-12 02:36:42 +00:00
Ian Romanick
75046c5e59
Remove drivers that have not been converted to the new interface from
...
the DRI builds.
2004-06-06 02:19:24 +00:00
Ian Romanick
18a5ecec89
DRI_NEW_INTERFACE_ONLY is now the only support way to build in the
...
Mesa tree. If you need a driver that supports the old libGL/DRI
inteface, it must be built in the DRI tree.
2004-06-02 17:48:16 +00:00
Keith Whitwell
739f50f542
Define GLX_DIRECT_RENDERING in Makefile.template
2004-04-30 09:15:58 +00:00
Keith Whitwell
69ab4fec12
AMD64 changes from Ronny V. Vindenes.
2004-04-30 08:29:04 +00:00