Commit Graph

101 Commits

Author SHA1 Message Date
Kristian Høgsberg
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
Felix Kuehling
b726aa502a Update to build against Mesa CVS HEAD. 2006-03-15 18:37:44 +00:00
Kristian Høgsberg
01aa209f20 Bail out early if screen doesn't support DRI. 2006-03-14 19:32:27 +00:00
Kristian Høgsberg
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
Kristian Høgsberg
c3342c8000 Merge accel_indirect branch to HEAD. 2006-03-12 00:11:34 +00:00
Matthieu Herrb
b56a1513d2 Definitions for bswapxx() macros on OpenBSD. 2006-03-05 16:32:40 +00:00
Felix Kuehling
054c291b27 Fix build against Mesa CVS HEAD: added s_blit.c to symlink-mesa.sh. 2006-03-02 18:35:08 +00:00
Brian Paul
c1a82b9554 added s_blit.c file 2006-03-02 03:43:26 +00:00
Felix Kuehling
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
Alexander Gottwald
028d6903f6 Bug #5978: Added missing swap of input variables. Added missing cases for
GL_SECONDARY_COLOR_ARRAY and GL_FOG_COORD_ARRAY (Colin McDonald)
2006-02-22 16:29:07 +00:00
Jeremy C. Reed
43fbcc28c9 Update to build against Mesa HEAD. (Thank you Felix for feedback on xorg
list.)
2006-02-22 02:47:00 +00:00
Felix Kuehling
cc42e153c2 Update to build against Mesa HEAD. 2006-02-20 03:00:09 +00:00
Eric Anholt
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
Kristian Høgsberg
6ad4325b87 Update to build against mesa head. 2006-02-15 18:26:45 +00:00
Eric Anholt
0446aafa94 Avoid some more libcwrapper damage that prevented kdrive linking. 2006-02-15 03:07:23 +00:00
Dave Airlie
1132d0e610 update to latest Mesa CVS HEAD 2006-02-14 06:27:59 +00:00
Eric Anholt
4fafba61d5 Remove libcwrapper damage from GLX (requires fresh Mesa HEAD), and get it
compiling in kdrive.
2006-02-11 03:03:45 +00:00
Eric Anholt
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
Eric Anholt
fa3a65e33d Remove the include of X11/misc.h, which fails to compile and isn't
necessary.
2006-02-10 07:47:21 +00:00
Donnie Berkholz
701b63cf1d Update to build against Mesa trunk. 2006-01-30 20:04:56 +00:00
Donnie Berkholz
c5e9318290 Really allow linking against Mesa trunk to work. 2006-01-26 04:32:45 +00:00
Alan Hourihane
2e28f4104d Allow current trunk to build against Mesa trunk 2006-01-24 22:05:33 +00:00
Daniel Stone
03ebd37bab Make error() bomb with exit code 1, not 0. 2006-01-19 12:25:01 +00:00
Eric Anholt
adce1f16e0 Only try to use byteswap.h on linux. Assume that everyone else (thinking of
BSDs here) has sys/endian.h, and use macros as appropriate for the
    names. This should probably be in a gloabl header.
2006-01-19 00:06:57 +00:00
Ian Romanick
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
Adam Jackson
cf605eb916 Build libglx correctly when not building the Xorg DDX. 2005-12-13 17:35:26 +00:00
Kevin E Martin
7c00afd0ec Define XFree86Server only where it is required. 2005-12-02 06:02:45 +00:00
Kevin E Martin
924518605b Fix GL build when srcdir != builddir (Donnie Berkholz). 2005-12-01 23:39:00 +00:00
Kevin E Martin
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
Kevin E Martin
63aa96c08a Update pkgconfig files to separate library build-time dependencies from
application build-time dependencies, and update package deps to work
    with separate build roots.
2005-11-19 07:15:50 +00:00
Kevin E Martin
16b315affa Use glcontextmodes.[ch] from Mesa. 2005-11-14 21:04:12 +00:00
Kevin E Martin
0c110c80e7 Add GL_CFLAGS so that GLX can find its proto headers when using separate
build dirs.
2005-11-14 20:18:03 +00:00
Dave Airlie
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
Ian Romanick
f5a5817834 Make sure that the __gl*_size prototypes are seen in all the places that
they need to be seen.
2005-10-20 23:24:47 +00:00
Kevin E Martin
1859c62607 include/dix-config.h.in Add support for more extensions
Add missing files to EXTRA_DIST
2005-10-17 07:18:59 +00:00
Adam Jackson
61cd478b54 Bug #3652: Server-side GLX support for GLX_SGIX_swap_barrier and
GLX_SGIX_hyperpipe extensions. (Eric Kunze, SGI)
2005-10-05 22:39:41 +00:00
Ian Romanick
2c82429f89 Refactors __glXImageSize and __glXImage3DSize into a single function. It
replaces all calls to the old functions with calls to __glXImageSize
    with the new parameter list.
I have also added 'target' as a parameter. This is a stepping stone to the
    code in patch #2410. Basically, if the texture target is one of
    GL_PROXY_*, the image size is always zero. This gathers all the checks
    for that into a single place. I have *not* modified the existing
    callers to take this into account. They still do their own checks for
    GL_PROXY_*. However, when the generated versions of those functions are
    added to the tree, they *will* rely on that.
The code growth is mainly due to the new 40 line comment before
    __glXImageSize.
I have tested this with a few of the texture using demos and tests from
    Mesa, including tunnel, texdown, and drawpix.
Reviewed by: Adam Jackson, Eric Anholt, and Brian Paul.
2005-10-01 22:25:13 +00:00
Ian Romanick
e27b3e4ea1 Remove some more incorrect prototypes for the __gl*_size functions. 2005-10-01 22:19:04 +00:00
Ian Romanick
940158a6f2 Replace all uses of __glEvalComputeK (and the doubly redundant
EvalComputeK) with calls to one of __glMap[12][df]_size. This was
    tested with progs/samples/eval (from Mesa).
2005-09-28 03:37:22 +00:00
Ian Romanick
30ff9e2619 Fix some problems that caused incorrectly annotated prototypes for
__gl*_size functions to be used. The result was that, on x86, the code
    would be compiled with FASTCALL semantics, but the callers would not.
    This should fix GLX protocol errors that people are seeing. There
    doesn't appear to be a bugzilla associated with this problem.
2005-09-27 00:04:40 +00:00
Daniel Stone
691669c012 xorg-server.h -> dix-config.h (thinko). 2005-09-03 07:08:58 +00:00
Daniel Stone
854010d71d Add -include dix-config.h to GL/mesa/X to catch _XSERVER64, et al. 2005-09-02 03:22:01 +00:00
Alan Hourihane
b47535bd66 programs/Xserver/GL/windows/glwrap.c Wrap PointParameteriNV &
PointParameterivNV for Windows builds.
2005-08-24 08:49:31 +00:00
Daniel Stone
a402c876a4 Make DRI/GLcore builds srcdir != builddir safe, and invoke symlink-mesa.sh
in our builddir, not our srcdir.
2005-08-20 18:11:17 +00:00
Ian Romanick
370b111f48 Use '$(DRMSRCDIR)/shared-core' instead of '$(DRMSRCDIR)/shared' for DRM
includes. This matches the way drivers are built in the Mesa tree and
    fixes a build problem in the Savage driver.
Convert uses of __glPointParameterfvARB_size to
    __glPointParameterfvEXT_size and uses of __glPointParameteriv_size to
    __glPointParameterivNV_size. This eliminates the need to hand-edit
    indirect_size.c after it is generated.
2005-08-12 16:30:57 +00:00
Adam Jackson
39a80312e0 - Bug #3960: Add remaining GLX and pci.ids stuff to DIST (Cha Young-Ho,
Olli Helenius)
- Fix some distcheck problems for non-solaris systems
- Change server version number from the Xorg rev to an independent one
- _POSIX_SOURCE and _XOPEN_SOURCE defined to the right values
2005-08-04 22:31:20 +00:00
Adam Jackson
e62be6d272 - Check for vsnprintf
- Don't build the Xorg DDX on darwin
- Workaround for gcc defining __ppc__ but not __powerpc__
2005-08-04 18:45:46 +00:00
Adam Jackson
9802106864 dist fixes for cw and GL (Donnie Berkholz, me) 2005-08-03 01:41:34 +00:00
Adam Jackson
d31de217e6 distcheck fixes 2005-08-02 03:36:09 +00:00
Adam Jackson
0285804811 GLX fix for loadable servers: indirect_size.c goes in libglx, not libGLcore 2005-08-01 18:41:54 +00:00