Commit Graph

115 Commits

Author SHA1 Message Date
Brian Paul 42943a4cf9 mesa: bump version to 7.5.2
I'm not 100% sure there'll be a 7.5.2 release, but just in case.
2009-09-08 14:45:27 -06:00
Brian Paul 9c4b877519 mesa: bump version to 7.5.1 2009-07-22 12:46:53 -06:00
Brian Paul 3eafd25aa3 configs: bump MESA_MINOR to 5 2009-05-01 09:15:14 -06:00
Joel Bosveld 8acca48cd5 st/xorg: Install to XORG_DRIVER_INSTALL_DIR 2009-03-06 01:31:49 +01:00
Brian Paul c34c78b853 egl: use new EGL_LIB_DEPS to pass library dependencies to mklib when building libEGL
EGL_LIB_DEPS may need fine-tuning for some platforms.  It's only defined
in configs/default ATM.
2009-02-25 08:41:13 -07:00
Jakob Bornecrantz d67bd60ecf gallium: s/GALLIUM_DRIVER_DIRS/GALLIUM_DRIVERS_DIRS/ 2009-02-20 11:25:55 +00:00
Jakob Bornecrantz 9c9fcc83c0 gallium: Renable pipe drivers disabled during vbuf changes
i965simple is not enabled because it is still broken.
2009-02-19 23:16:57 +01:00
Keith Whitwell 7ca78a07b3 softpipe: update to new draw interfaces 2009-02-17 12:20:05 +00:00
Jakob Bornecrantz e94b4dd4f0 gallium: Disable nouveau by default
Most piep drivers should be able to build by default, but since
	the nouveau ones depend drm they can't be enabled by default.
2009-02-11 02:43:27 +01:00
Jakob Bornecrantz 767b1acbb7 mesa: Build both software rasterizers for debug
But put the gallium one in lib/gallium
2009-02-10 17:43:25 +01:00
Jakob Bornecrantz 43e6272ae5 gallium: Introduce new subdirs build variables
(based on gallium-xorg-driver/commit 270ce504052d415870a25ab59818b2309eb8ac13)
2009-02-10 16:23:02 +01:00
Jakob Bornecrantz b96d50da8b Revert "mesa: added new linux-gallium and linux-gallium-debug configs"
This reverts commit abbe96cb6e.

It only reverts parts of the commit the other parts where related to
libmesagallium changes.
2009-02-10 16:22:19 +01:00
Brian Paul abbe96cb6e mesa: added new linux-gallium and linux-gallium-debug configs
Also, remove gallium-related things from configs/default.  They're in
linux-gallium now.

So the default builds are the same as they have been for Mesa/master.
2009-02-09 10:17:58 -07:00
Corbin Simpson 5538323005 Readd trace to list of default pipe drivers.
Looks like the gallium-0.2-radeon merge clobbered it.
2009-02-06 13:36:31 -08:00
Corbin Simpson 4683fc94f5 Merge branch 'gallium-0.2-radeon' into gallium-0.2 2009-02-06 13:34:04 -08:00
Corbin Simpson 0bf152e0be Remove r300 from default build. 2009-02-06 13:27:51 -08:00
Keith Whitwell 3120894c6d gallium: add new aux lib for index list translations
Could this be the ultimate index list translating utility?  Maybe, but it
doesn't yet include support for splitting primitives.

Unlike previous attempts, this captures all possible combinations of API
and hardware provoking vertex, supports generated list reuse and various
other tricks.  Relies on python-generated code.
2009-02-05 16:04:38 +00:00
Corbin Simpson fbeeb66757 r300, amd: Make everything build. (Not necessarily work, mind you.)
Lots of structural work, especially in getting the two parts to talk nicely.

Todo:
- Get damn blitter working.
- Add CS flush.
- Reverse order of above two items.
2009-02-01 23:30:22 -08:00
José Fonseca fcf9353fea glew: Build it as a static lib. 2009-01-24 16:54:59 +00:00
José Fonseca 57d00016ca glew: Initial import.
From glew 1.5.1 release.
2009-01-23 12:32:35 +00:00
Keith Whitwell 002dfb12fc gallium: split driver-independent code out of xlib winsys
Place in new xlib state-tracker.  This is a statetracker for the GLX API.
2009-01-08 14:10:56 +00:00
Alan Hourihane a22d865f93 Merge commit 'origin/master' into gallium-0.2 2008-12-15 11:16:03 +00:00
Dan Nicholson 8be02fc8c6 Add OSMesa pkg-config file
This makes the GLU .pc file a little simpler, too.
2008-12-14 09:35:29 -08:00
Dan Nicholson 71e208bafe Add more package metadata to the pkg-config files
The pkg-config files have been filled in more thoroughly to allow users
to use mesa more effectively. By adding metadata to Requires.private,
Libs.private and Cflags, we can ensure that all the libraries and
headers will be found in all situations. However, the full substitutions
are only done when using the configure script.

This also fixes the glu pkg-config file to account for using GL or
OSMesa.

Fixes bug 18161.
2008-12-14 08:47:03 -08:00
Pekka Paalanen 5aaeb13a76 Merge commit 'origin/gallium-0.1' into gallium-0.2
* commit 'origin/gallium-0.1':
  Mesa: fix number of buffers in st_draw_vbo().
  Nouveau: fix nv20_vertex_layout()
  Nouveau: update nv20 miptree according to nv40.
  Nouveau: build, link and use nv20.
  Nouveau: name replace for nv20.
  Nouveau: Rename nv20/ files as nv20.
  Nouveau: copy nv30_vertprog.c to nv20.
  Nouveau: start nv20 by copying the nv10 tree.
2008-11-12 23:13:22 +02:00
Pekka Paalanen 0da43322bb Nouveau: build, link and use nv20.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
2008-11-08 18:32:33 +02:00
Ben Skeggs 63c49bee3a Merge remote branch 'upstream/gallium-0.2' into nouveau-gallium-0.2 2008-09-12 22:53:44 +10:00
Keith Whitwell f7d7a212cd mesa: build gallium directories before core mesa 2008-09-12 12:24:21 +01:00
Ben Skeggs cbe05a4734 Merge remote branch 'nouveau/gallium-0.1' into nouveau-gallium-0.2
Conflicts:
	configs/linux-dri
2008-09-12 20:37:33 +10:00
Ben Skeggs 81335d0f17 Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1 2008-09-12 20:33:59 +10:00
Keith Whitwell cc7dd4fc1b Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:

	Makefile
	progs/demos/Makefile
	progs/glsl/Makefile
	progs/redbook/Makefile
	progs/samples/Makefile
	progs/tests/Makefile
	progs/trivial/Makefile
	progs/xdemos/Makefile
	src/gallium/Makefile
	src/mesa/main/attrib.c
	src/mesa/main/bufferobj.c
	src/mesa/vbo/vbo_exec_draw.c
2008-09-11 18:32:05 +01:00
Brian Paul 90c93bbeee define new APP_CC configuration variable for building apps/demos/tests
For Cell, need to use different compilers for the libraries vs. the demos/tests
to avoid strange link error regarding "_Unwind_GetIPInfo@GCC_4.2.0"
2008-09-11 11:00:54 -06:00
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
Ben Skeggs 7158203b08 Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Conflicts:
	configs/default
2008-09-11 06:09:05 +10:00
Brian Paul 019b9529e5 change MESA_MINOR to 3 2008-08-26 15:59:06 -06:00
Alan Hourihane ccf1910dd4 consolidate intel directories.
we now have

src/gallium/winsys/drm/intel/{common,dri,egl}
2008-08-17 20:17:18 +01:00
Alan Hourihane 3eeafb7179 choose sane default for dri driver location 2008-08-17 19:12:54 +01:00
Jeremy Huddleston 98e7c1cf38 Fixed 'make install' for darwin 2008-08-12 10:59:40 -07:00
Ben Skeggs 704dca40c4 Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1 2008-07-23 14:05:22 +10:00
Brian Paul 77497eb73b mesa: revert building glslcompiler by default 2008-07-21 09:01:34 -06:00
Dan Nicholson 776c60d3c3 autoconf: Support Motif widgets in GLw with --enable-motif
Add an --enable-motif option, which will enable the Motif widgets in
libGLw and link it with libXm. The Motif installation information will
be gathered from the motif-config script (this comes with LessTif) or
fallback to the standard autoconf checks.

To allow the location of the Motif headers to be set from configure, the
default setting of -I/usr/include/Motif1.2 has been moved into
configs/default and then passed to the Makefile through the MOTIF_CFLAGS
variable.
2008-07-18 08:07:07 -07:00
Brian Paul 3bfedb7ed4 mesa: build the stand-alone glslcompiler by default, update the docs 2008-07-17 15:40:10 -06:00
Jakob Bornecrantz e59086ab91 EGL: Only build EGL dri based drivers under linux-dri based configs 2008-07-13 18:05:20 +02:00
Ben Skeggs d68a3ebf0e Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1 2008-07-14 01:14:52 +10:00
Dan Nicholson db072baaaf Call mklib with $(SHELL) so the user controls the interpreter
Respect the user's choice of shell when running mklib rather than always
using /bin/sh.
2008-07-12 10:25:40 -07:00
Dan Nicholson 4f5d97ee9e Call minstall with $(SHELL) so the user controls the interpreter
Running minstall directly means that /bin/sh is always used as hte
interpreter. If the user needs or wants to use a different shell fo
minstall, they can use the SHELL make variable.
2008-07-12 10:25:40 -07:00
Dan Nicholson 9eee7f260f Set $(SHELL) for all configs
Most make implementations will use /bin/sh as the interpreter for
commands and only use a different shell when the $(SHELL) make variable
is set. This makes the setting explicit and allows $(SHELL) to be used
in the commands themselves.
2008-07-12 10:25:40 -07:00
Jakob Bornecrantz 5de823c00b gallium: Re-order the GALLIUM_AUXILIARY_DIRS to satisfy dependencies on util 2008-07-10 22:41:34 +02:00
Brian Paul a452e0cbde gallium: re-order the GALLIUM_AUXILIARY_DIRS to satisfy .a interdependencies
libutil.a and libtranslate.a depend on libcso_cache.a so put them in that order.
2008-07-10 13:28:22 -06:00