fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-19 09:18:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
26431 commits 66 branches 935 tags 964 MiB
Commit graph

65 commits

Author SHA1 Message Date
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
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
José Fonseca
77ce568ff7 Remove CVS keywords. 2008-05-26 20:14:40 +09:00
Dan Nicholson
c5e2b850ad Always cleanup the makedepend backup files 
Consistently cleanup the depend.bak files created by makedepend. Also,
realclean has been changed to use a single find command, which speeds it
up considerably.
 2008-05-06 14:00:43 -07:00
Brian
4875b40304 Assorted patches for miniglx/linux-solo (Gavin Li <codeview@gmail.com>) 2008-01-23 16:03:19 -07:00
Dan Nicholson
2a3e33865d add support for LDFLAGS env var 2007-09-28 18:42:21 -06:00
Keith Whitwell
90ee7a4144 Gutsy oopses on touch of existing file. Workaround. 2007-08-07 10:18:30 +01:00
Dave Airlie
0b11203038 miniglx: implement GetProcAddressARB in miniglx as an alias for GPA 2007-06-05 09:38:49 +10:00
Dave Airlie
47e33a27df miniglx: fixup use of create windows x and y coordinates 
This makes miniglx take not of the x and y from XCreateWindow
 2007-05-08 10:51:44 +10:00
Brian
ae5f67575d Makefile clean-ups for miniglx. 2007-05-04 18:27:12 -06:00
George Sapountzis
487f7a73cb Remove SI imports/exports remnants. 2007-04-05 19:01:51 +03:00
George Sapountzis
885111518e Move glcontextmodes.c to glx. 
It is no longer linked with DRI drivers, libGL passes function pointers through
the DRI interface.
 2007-04-05 18:59:42 +03:00
Dave Airlie
c058f69daa add support to miniglx for updating drawables .. 
requires hacks to DRM to remove MASTER from UPDATE_DRAW and ADD_DRAW
 2006-11-28 04:50:54 +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
Dave Airlie
9d3de643d1 make miniglx use libdrm properly 2006-04-07 03:20:56 +00:00
Dave Airlie
a951c80ae4 setup to use pci access, comment out size bumps, 
sest xres from real width, use new -1 ddx version
 2006-04-03 07:32:11 +00:00
Dave Airlie
808a678d85 do a drm lock/unlock sequence after the client close 2006-04-03 07:31:27 +00:00
Dave Airlie
d61c1cc7c9 add width to struct for width != virtual width 2006-04-03 07:30:48 +00:00
Dave Airlie
cf69d09202 make miniglx use libdrm and libpciaccess 2006-04-03 07:30:23 +00:00
Brian Paul
a01cb26a90 s/unsigned long/drm_handle_t/ to get compilation of fb driver to work 2005-09-19 17:17:58 +00:00
Dave Airlie
3d4d6d29e2 complete fix for miniglx startup issue since driver version checks 2005-08-31 01:24:01 +00:00
Dave Airlie
ac54de021a fix miniglx setting virtual size of 832 for 800x600 2005-08-08 04:17:52 +00:00
Dave Airlie
7f5925d57c Add color tiling support to miniglx for radeon 
(Stephane Marchesin + Dave Airlie)
 2005-08-03 10:22:31 +00:00
Jon Smirl
4ce390b933 Commit Ian's fixes from Bug 3877 
I have tested these on miniglx and they seem to be working.
I'm sure Dave will give them a better test.
 2005-07-29 00:48:12 +00:00
Ian Romanick
a08d8a095c Quote $(CC) and $(CXX) so that 'CC=ccache gcc' and 'CXX=ccache g++' will 
work again.
 2005-07-26 05:55:56 +00:00
Brian Paul
8dcc6736ab Added -linker option to mklib, used to specify a particular program for 
linking, if relevant.
Updated Makefiles to use -linker option instead of setting CC, CXX env vars.
 2005-07-25 22:59:58 +00:00
Dave Airlie
1bb14ad90c fix for solo to set the mode, and make solo gcc2 friendly... 
From: Stephane Marchesin
 2005-03-05 04:00:09 +00:00
Dave Airlie
dee1c795c2 add more functionality to miniglx for glitz 2005-02-20 10:46:34 +00:00
Dave Airlie
09298228c6 add EnableExtension so r200 enables all its extensions, add mesa memory 
extension entry points
 2005-02-15 08:40:24 +00:00
Ian Romanick
d24e49f301 Put quotes around the CC and CXX variables passed to mklib. This make 
them work with multi-work compiler names (e.g., "ccache gcc").
 2005-01-11 22:43:45 +00:00
Alan Hourihane
1e21673ea1 support 720x480 and 960x540 modes 2005-01-05 22:40:34 +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
Dave Airlie
23b033ad28 From: Stephane Marchesin <marchesin@icps.u-strasbg.fr> 
Attached is a patch that adds pci init code for mesa solo on radeon. It's been
tested on an itanium 2 with a radeon 7000 and it works here.
The patch adds a new field in the miniglx.conf config file, to choose between
pci and agp.
 2004-12-08 06:15:01 +00:00
Brian Paul
55656a53d4 added __glXFindDRIScreen to glXGetProcAddress (bug 1068879) 2004-11-29 17:26:19 +00:00
Dave Airlie
75672d2e94 Fix mesa solo with doublebuffered apps, the drawable index/stamp weren't 
being updated properly..
 2004-10-01 04:34:01 +00:00
Dave Airlie
e520b72e89 Add a solo-x86 config, and make solo use the x86 glapi 2004-09-07 00:41:40 +00:00
Jon Smirl
521ebf670a Fix from Rogelio Serrano for miniglx double buffering 2004-08-09 22:14:57 +00:00
Jon Smirl
dc8a7603a3 Miniglx clients now authorize with server DRM 2004-07-16 04:27:00 +00:00
Jon Smirl
1e7ce9f6f1 Convert miniglx to use xf86drm from dri/drm/libdrm instead of src/mesa/drivers/dri/dri_client 2004-07-05 23:51:48 +00:00
Jon Smirl
5500094413 Convert miniglx to use Ian's fancy new driver config code. 
This removes the miniglx driver function InitContextModes().
All of the server directories were edited to remove the implementations.
 2004-07-05 23:42:02 +00:00
Jon Smirl
c61c7cb8e4 This should make most linux-solo drivers work again. Mainly a fix 
for changing SAREA size form DRM_PAGE_SIZE to SAREA_MAX. fb driver
is still broken.
 2004-06-29 04:50:29 +00:00
Jon Smirl
c2bffec91a Mesa-solo builds with these changes. There are still more fixups needed to 
get individual drivers working again. This converts miniglx to the new
dri interface. Thanks to Erdi Chen for the new interface code.
 2004-06-26 17:16:42 +00:00
Ian Romanick
9eecb03226 Make sure mklib sees the definition of CC and CXX. Make mklib respect 
the definitions of CC and CXX on Linux.  This fixed build issues with
sunos5-gcc and build issues on GCC 2.x Linux when CC and CXX are set
to a GCC 3.x compiler.
 2004-06-25 22:51:39 +00:00
Jon Smirl
ba3d643c49 kill __driRegisterExtensions(), none of the functions did anything 2004-06-03 01:56:07 +00:00
Eric Anholt
f016e2509e Missed in last commit: 
Build fixing for FreeBSD.  GNU make is installed as gmake, so make a MAKE
variable (defaults to "make") and use that.  Use the MKDEP and MKDEP_OPTIONS
more.  Our shell isn't bash, so change the instances of ">& /dev/null" to a more
compatible "> /dev/null 2>&1".
 2004-06-01 00:39:34 +00:00
Brian Paul
5726a238d4 remove the last line of the previous patch 2004-05-12 14:51:51 +00:00
Brian Paul
86c7541f9b fix red/green/blueBits typos 2004-05-12 14:48:39 +00:00
Brian Paul
751c9d096d obsolete in favor of regular Makefiles 2004-05-12 14:04:29 +00:00
Dave Airlie
377ced2bf1 Add agpmode to the example config file 2004-04-14 02:14:15 +00:00
Dave Airlie
5d8f7b1197 add agpmode to miniglx config file 2004-04-14 01:33:27 +00:00