Commit graph

59 commits

Author SHA1 Message Date
David Reveman
54bf65fcbd Use final EXT_tfp tokens 2006-05-02 08:56:52 +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
5339591e28 CopySubBufferMESA support 2006-03-13 15:53:26 +00:00
David Reveman
b99d93c846 Add GL_ARB_vertex_program and GL_ARB_fragment_program support 2006-03-10 11:52:19 +00:00
Matthias Hopf
062c61dcf3 find xf86dristr.h again. 2006-03-09 15:16:55 +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
24bb0886f9 GL_EXT_framebuffer_object support 2006-02-23 01:57:39 +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
Eric Anholt
99100d03bb Merge glx-on-FreeBSD fixes from trunk. 2006-02-13 22:39:26 +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
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
Kevin E Martin
7c00afd0ec Define XFree86Server only where it is required. 2005-12-02 06:02:45 +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
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
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
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
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
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
Adam Jackson
d7e2cadb13 GLX needs gl.h from Mesa too 2005-07-21 02:29:05 +00:00
Adam Jackson
f054bf2ff6 build fix 2005-07-12 01:29:41 +00:00
Adam Jackson
3fe6b5bb30 GLX server support 2005-07-12 01:17:39 +00:00
Ian Romanick
baa99be190 Put the correct value in the length field of the reply. Previously, the
number of tag/date pairs was specified. This was incorrect. The correct
    value is the number of values (one for the tag and one for the value).
Xorg bug: #3210
2005-07-06 07:16:19 +00:00
Daniel Stone
b0d80e76d2 Add missing include paths. 2005-07-03 12:17:04 +00:00
Daniel Stone
e03198972c Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
    source files in the xserver/xorg tree, predicated on defines of
    HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
    <X11/fonts/foo.h>.
2005-07-03 07:02:09 +00:00
Daniel Stone
826a6f029f Continuing Makefile cleanup; add DIX_CFLAGS and XORG_CFLAGS everywhere. 2005-07-02 18:59:44 +00:00
Adam Jackson
5e863851a6 Build workaround. Add glcontextmodes.[ch] from Mesa. 2005-06-19 01:30:29 +00:00
Ian Romanick
9f81ce9456 Re-enable GL_HP_occlusion_test. The problems in Mesa that caused this bug
were fixed by Brian Paul in Mesa version 6.1. The current Mesa version
    in the X.org tree is 6.2.1.
Xorg bug: 762
2005-06-09 21:48:45 +00:00
Adam Jackson
547c47aaea Bug #3407: Clean out ancient #ifdef X11R5 conditionals. 2005-05-30 18:36:19 +00:00
Søren Sandmann Pedersen
61b3c3aef5 Thu Jan 13 17:45:13 2005 Søren Sandmann <sandmann@redhat.com>
Make sure the pixmap is a valid new resource
Make sure the context is a legal new resource.
Handle null attrib_list.
Handle null attrib_list; copy attrib_list to data; actually allocate the
    new GLXDrawable.
2005-01-13 23:07:41 +00:00
Eric Anholt
5825e4559e Fix after Mesa 20040812 merge: revert glxext.h to vendor branch, and fix
bug #1022.
2004-08-12 23:14:50 +00:00
Kevin E Martin
21c7c8cdc7 Fix install problem on platforms not using xorg.cf/xfree86.cf (Bug #339,
Harold L. Hunt II, Alexander Gottwald).
Fix crash when using X core font in zh_CN.UTF-8 locale (Bug #368, Yu Shao,
    David Dawes).
Fix glXMakeCurrent(Dpy, None, NULL) crash (Bug #719, Adam Jackson).
HP-PA build fix (Bug #828, Guy Martin, Paul Anderson).
Fix SDK build for GATOS and Wacom driver (Bug #829, Bryan Stine).
Fix attempt to read video ROM before enabling it (Bug #843, Ivan
    Kokshaysky, Mike A. Harris).
Fix detection of primary adapter (Bug #843, Ivan Kokshaysky, Mike A.
    Harris).
Clarify xset man page description of how to use the keyboard repeat rate
    settings (Bug #846, Mike A. Harris).
Fix problem where print-screen key would get remapped to sys-req in certain
    keymaps, which broke GNOME printscreen functionality (Bug #847, Owen
    Taylor).
Fix several render problems:
- MMIO mode support
- Hang on IGP chips
- VT switching hang
- 3D render corruption (Bug #922, Hui Yu).
2004-08-09 22:37:22 +00:00
Kevin E Martin
4da507a03f Fix compiler warning 2004-07-31 00:32:43 +00:00
Kevin E Martin
854c1afa86 Fix "DoLoadableServer NO" build 2004-07-30 04:44:13 +00:00
Torrey Lyons
ddd5835612 Fix XDarwin's broken build of libGL and server side GLX. GL library is only
known to build correctly on Mac OS X 10.3.4 and still needs some work
    for earlier versions.
2004-07-27 20:24:00 +00:00
Adam Jackson
799208dd44 Bug #377: Make lib{glx,GLcore,dri} work when compiled as dlloader modules. 2004-07-26 19:06:04 +00:00
Alexander Gottwald
68d92cca1a Bug 782: Merge native OpenGL for Windows from CYGWIN branch 2004-06-21 13:35:05 +00:00
Eric Anholt
e56e24af25 Merge DRI-trunk-20040613 changes in programs/Xserver/GL. 2004-06-16 09:37:59 +00:00
Eric Anholt
2e1868b560 DRI trunk-20040613 import 2004-06-16 09:25:21 +00:00