cd2c1714eb
add slang_mem.c
2007-04-21 12:40:51 -06:00
67545333ec
replace occlude.c w/ queryobj.c
2007-04-21 12:40:33 -06:00
deda7791df
remove sources deleted in Mesa
2007-04-16 11:35:22 -06:00
eba81a0a01
glx: move __glXMesaProvider from GLcore module to glx module.
...
This treats the GLcore provider similar to DRI provider, using a subset of
XMesa as the GLcore interface.
2007-04-14 18:30:09 +03:00
6b040b79f0
glx: drop xmesaP.h include from xf86glx.c
...
The declarations for the xfree86-specific XMesa functions were moved up to
xmesa.h, requires Mesa as of 2007-04-13.
2007-04-14 18:29:52 +03:00
7e38559861
GLcore: fix after moving xf86glx_util.[hc] to Mesa.
2007-04-06 13:38:12 +03:00
76756f2756
Make xf86glx.c unaware of Mesa internals
...
Use newly added XMesaCopyContext() and drop the GlxSetRenderTables() call
for Xgl, as this is now done inside XMesaForceCurrent(). This leaves xmesaP.h
but only for the declarations of the three XMesa/XFree86 functions. Also,
GlxSetRenderTables() stays but is only used in hw/xgl/glxext/ .
Also drop xf86glxint.h, no longer used.
Depends on mesa commit 7439a36785b6a2783e80a40a96c09db8f56dc2bc of 2007-03-30.
2007-03-30 20:06:35 +03:00
8522044635
GL: Update for Mesa changes
...
Added s_fragprog.c to fix the build.
2007-03-28 13:03:32 +03:00
6a0bed16e8
Fix typo in GL/mesa/shader/slang/Makefile.am.
2007-03-27 16:51:12 +02:00
b8f846a9df
gl: oops dodgy s appeared pointed out by jcristau on irc..
2007-03-27 14:17:40 +10:00
a63ee90bc2
gl: update for latest mesa glsl-compiler merge
2007-03-27 11:05:52 +10:00
236f04b638
remove array_cache from everywhere
2007-02-05 09:10:08 +11:00
fb1bc1c65b
add vbo to .gitignore
2007-02-04 18:39:58 +11:00
d8e148ec84
update xserver for vbo code in mesa
2007-02-04 18:39:04 +11:00
170a55022e
remove file
2007-02-02 20:56:12 +00:00
e6a505be84
The array_cache sources don't exist anymore in the Mesa tree,
...
so we shouldn't try to build them.
2007-02-02 20:53:01 +00:00
7d2ec92170
Keep track of how many visuals we set up for GLcore, to avoid an invalid free.
...
The proper fix would involve actually setting up the ARGB visual for GLcore,
but I just want the server to not crash at exit.
2007-01-04 12:24:48 -08:00
a34446f5b3
Add missing file to list in Makefile.am
2006-10-27 13:43:43 -04:00
0aaac95b0d
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
84683f19b4
get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
...
Get rid of almost all uses of these definitions. They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build. As well as
for miinitext.c. But largely gone.
2006-07-18 18:17:38 -04:00
28b95fd9d1
Drop unused GL/include subtree.
...
Woo, less Makefile's to generate.
2006-07-06 03:25:38 -04:00
7cf3ec7b59
Move createDrawable from __GLXcontext to __GLXscreen.
2006-07-06 00:28:53 -04:00
21ef7e17ef
Add some missing .gitignore stuff for Mesa symlinks and other generated files.
2006-06-18 19:47:51 -07:00
b90088321e
Add arrayobj.c to the Makefile as well.
2006-06-12 15:22:31 -07:00
c6b1cff432
update to build against Mesa CVS HEAD (Carlos Eduardo Rodrigues Diogenes).
2006-05-25 13:27:42 +00:00
8ec42a10ff
Mark the ARGB FBConfig as nonconforming to prevent drivers and apps from
...
falling over.
Add @GLX_DEFINES@ so GLcore gets compiled with TLS support if configured.
Only destroy the mesa buffer if it got initialized.
2006-03-30 20:08:44 +00:00
966d93ef6d
Make the server distcheck and tag 1.0.99.1 snapshot.
...
Bump CVS version to 1.0.99.1.
Distcheck fixes.
2006-03-21 22:54:38 +00:00
2d2d38d17c
Check for glproto when building GLX and make sure we have at least 1.4.6.
...
Drop glx_ansic.h wrapper and call xalloc, xrealloc, xfree and str-funcs
directly.
2006-03-17 01:47:25 +00:00
2c11cde336
More patches from David Reveman:
...
Add GL_ARB_texture_non_power_of_two, GL_EXT_framebuffer_object and
GL_NV_texture_env_combine4 extensions.
Add __GLXcontext destructor and flush context cache there and on
loseCurrent.
Chain back to new __GLXcontext destructor. (__glXMesaContextForceCurrent):
Set render table on forceCurrent. (init_screen_visuals): Index pVis
array correctly. (GlxGetMesaProvider): Add this.
Hook up FBO marshalling.
2006-03-17 00:35:18 +00:00
b726aa502a
Update to build against Mesa CVS HEAD.
2006-03-15 18:37:44 +00:00
e5956f49b2
First batch of AIGLX fixes from David Reveman.
...
Add getter for Mesa provider.
Export this for Xgl.
Move resource tracking out of drawable constructor to allow wrapping.
Use corrent reply size #define.
Add this function. (DoGetDrawableAttributes): Fix array length.
2006-03-13 01:54:59 +00:00
c3342c8000
Merge accel_indirect branch to HEAD.
2006-03-12 00:11:34 +00:00
c1a82b9554
added s_blit.c file
2006-03-02 03:43:26 +00:00
088e5768fa
Fixing the Mesa build again, sigh. Add slang_execute_x86.c. Add
...
-I../shader/slang to swrast INCLUDES.
2006-02-27 18:12:24 +00:00
43fbcc28c9
Update to build against Mesa HEAD. (Thank you Felix for feedback on xorg
...
list.)
2006-02-22 02:47:00 +00:00
cc42e153c2
Update to build against Mesa HEAD.
2006-02-20 03:00:09 +00:00
6770f1bdb1
Define NO_LIBCWRAPPER in dix-config.h, and rely on Mesa including
...
dix-config.h if DIX_HAVE_CONFIG_H is defined to get it and _XSERVER64,
instead of defining things like this per directory.
2006-02-15 21:09:14 +00:00
6ad4325b87
Update to build against mesa head.
2006-02-15 18:26:45 +00:00
0446aafa94
Avoid some more libcwrapper damage that prevented kdrive linking.
2006-02-15 03:07:23 +00:00
1132d0e610
update to latest Mesa CVS HEAD
2006-02-14 06:27:59 +00:00
4fafba61d5
Remove libcwrapper damage from GLX (requires fresh Mesa HEAD), and get it
...
compiling in kdrive.
2006-02-11 03:03:45 +00:00
c3d1403672
Remove libcwrapper usage from xorg server modules. The libcwrapper is only
...
of (marginal) use in the drivers, and that usage remains.
2006-02-10 22:00:30 +00:00
701b63cf1d
Update to build against Mesa trunk.
2006-01-30 20:04:56 +00:00
2e28f4104d
Allow current trunk to build against Mesa trunk
2006-01-24 22:05:33 +00:00
847d83ec3c
Bug #2996 : libglx / libGLcore should use a dispatch table
...
Port all changes from the (monolithic) accelerated_indirect-0-0-1 branch to
the modular trunk. This will break the Darwin and cygwin builds. Other
than the changes to symlink-mesa.sh and the various Makefile.am files,
to code is identical to what's in the branch.
Reviewed by: airlied, krh
2006-01-12 00:21:59 +00:00
cf605eb916
Build libglx correctly when not building the Xorg DDX.
2005-12-13 17:35:26 +00:00
7c00afd0ec
Define XFree86Server only where it is required.
2005-12-02 06:02:45 +00:00
924518605b
Fix GL build when srcdir != builddir (Donnie Berkholz).
2005-12-01 23:39:00 +00:00
da5d66f2ff
Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update loadable
...
module builds to reflect this change.
2005-11-29 16:39:33 +00:00
b588bdfe2a
programs/Xserver/GL/mesa/X/xf86glx.c: Missing initializer in xf86glx.c
...
spotted while debugging something else.
2005-10-22 04:38:50 +00:00
Brian
George Sapountzis
Daniel Stone
Michel Dänzer
Dave Airlie
Dave Airlie
Alan Hourihane
Dan Nicholson
Eric Anholt
Eamon Walsh
Adam Jackson
Kristian Høgsberg
Eric Anholt
Ian Romanick
Matthieu Herrb
Felix Kuehling
Brian Paul
Jeremy C. Reed
Donnie Berkholz
Ian Romanick
Adam Jackson
Kevin E Martin