Commit graph

114 commits

Author SHA1 Message Date
David Reveman
1c38237d7d sync to mesa head 2006-06-18 19:32:58 -04:00
David Reveman
c363f4212d Sync to mesa head 2006-05-23 08:59:18 +00:00
David Reveman
844147f263 Fix GLX drawable destruction 2006-05-11 14:37:03 +00:00
David Reveman
54bf65fcbd Use final EXT_tfp tokens 2006-05-02 08:56:52 +00:00
David Reveman
66c9a6f344 Sync with mesa head 2006-04-13 13:21:30 +00:00
David Reveman
8f965d63a8 Handle usage of context with a destroyed drawable current 2006-04-09 15:49:52 +00:00
David Reveman
dd75fbade4 EXT_tfp updates 2006-04-09 11:24:06 +00:00
David Reveman
5e2b6cd89c sync to head 2006-03-30 16:39:31 +00:00
David Reveman
133c7afadd Update to mesa head 2006-03-20 18:00:37 +00:00
David Reveman
a0b5fb9d35 Fix so that using mesa for software rendering works again 2006-03-15 00:26:51 +00:00
Matthias Hopf
fca1974b8c Real fix for glapi: Remove Makefile generation, don't distribute. 2006-03-13 17:56:43 +00:00
David Reveman
5339591e28 CopySubBufferMESA support 2006-03-13 15:53:26 +00:00
Matthias Hopf
ba679a269e Needed for 'make distcheck':
Add glapi to DIST_SUBDIRS.
Sync to trunk branch.
2006-03-13 14:28:36 +00:00
David Reveman
b99d93c846 Add GL_ARB_vertex_program and GL_ARB_fragment_program support 2006-03-10 11:52:19 +00:00
David Reveman
3e6411d182 Fix glx screen wrapping 2006-03-09 19:47:51 +00:00
David Reveman
cf4788317f Fix so that Xgl builds 2006-03-09 18:06:20 +00:00
Matthias Hopf
062c61dcf3 find xf86dristr.h again. 2006-03-09 15:16:55 +00:00
Matthias Hopf
c73da7bc63 added missing glapi to SUBDIRS.
Added missing -I$(top_srcdir)/hw/xfree86/common.
2006-03-09 14:26:37 +00:00
David Reveman
9ef5e9800e Fix building of glxdri.c and update configure.ac 2006-03-09 10:01:19 +00:00
David Reveman
9fb911fe06 Update to new GLX interface 2006-03-08 18:32:32 +00:00
David Reveman
ad89f1032a Add s_blit.c 2006-03-06 15:26:53 +00:00
David Reveman
9ad6fd9b91 Build against mesa head 2006-03-06 14:40:44 +00:00
David Reveman
24bb0886f9 GL_EXT_framebuffer_object support 2006-02-23 01:57:39 +00:00
David Reveman
bde517ea21 Update to build against mesa head 2006-02-20 12:18:32 +00:00
David Reveman
0653020ddf Update to build against mesa head 2006-02-16 03:15:24 +00:00
David Reveman
72d056f02c Remove GLX_CFLAGS and rely on Mesa including dix-config.h 2006-02-16 01:08:36 +00:00
David Reveman
f3fad0337d _XSERVER64 defined correctly when building mesa sources 2006-02-15 04:03:48 +00:00
Dave Airlie
3ae25ff4fd patch from Hanno Böck <ml@hboeck.de> to make xgl build against Mesa HEAD 2006-02-14 02:32:41 +00:00
Eric Anholt
99100d03bb Merge glx-on-FreeBSD fixes from trunk. 2006-02-13 22:39:26 +00:00
David Reveman
6aadae7117 Fix for building with Mesa CVS 2006-02-13 10:52:06 +00:00
Dave Airlie
281e811263 missed some moves to Mesa HEAD 2006-02-10 21:44:43 +00:00
Dave Airlie
53bfe8a6f1 move to Mesa CVS 2006-02-10 20:45:24 +00:00
David Reveman
14cadd5c84 Fix symlink-mesa.sh 2006-02-10 10:46:52 +00:00
David Reveman
fe5943e9e1 GLX_MESA_render_texture -> GLX_EXT_texture_from_pixmap 2006-02-06 19:48:39 +00:00
David Reveman
cbcc1fcd60 Allow support for GL_NV_texture_env_combine4 and
GL_ARB_texture_non_power_of_two
2006-02-02 17:06:48 +00:00
David Reveman
b0466438a9 Fix support for ARGB visuals 2006-02-02 03:47:15 +00:00
Dave Airlie
198ea994a2 initial commits to branch of fb, render, and GLX changes for Xgl some of
the GLX changes stop X.org server from working
2006-01-18 07:21:43 +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