Commit Graph

295 Commits

Author SHA1 Message Date
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
Kevin E Martin
86529c07d6 Fix distcheck for server 2005-07-28 23:28:34 +00:00
Adam Jackson
f331a32544 Add the symlink script for the Mesa source. 2005-07-23 19:29:58 +00:00
Adam Jackson
525d663ec5 glapi build (forgot this one somehow) 2005-07-23 02:02:18 +00:00
Adam Jackson
6aaceef323 Fix the build system to reflect the rest of the Mesa core. Almost links,
needs a code fix to Mesa though.
2005-07-23 02:00:52 +00:00
Adam Jackson
d7e2cadb13 GLX needs gl.h from Mesa too 2005-07-21 02:29:05 +00:00
Adam Jackson
4913316f25 Switch to MESA_SOURCE which we're already AC_SUBSTing 2005-07-16 04:29:28 +00:00
Adam Jackson
7facb209a7 Hook in the GLcore build 2005-07-16 04:24:21 +00:00
Adam Jackson
2f9a7c6ee1 Hey look, GLcore links 2005-07-16 04:13:33 +00:00
Adam Jackson
6ce3743948 start the GLcore build system 2005-07-16 00:51:14 +00:00
Adam Jackson
419448ea7b Pull libdri out of the build for now until I get something better worked
out
2005-07-12 03:03:16 +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
Adam Jackson
377e3bddd4 Forgot to add these for some reason 2005-07-12 00:55:43 +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
Alexander Gottwald
db5bd04097 Fix includes right throughout the Xserver tree:
apply changes to windows specific includes
Fix includes right throughout the Xserver tree:
apply changes to Xdmcp.h
2005-04-20 16:40:52 +00:00
Alexander Gottwald
9af443f597 Fix passing of non-RGB visuals. The old code did not initialize the
structure properly which lead to a crash in 8bpp mode
2005-04-09 19:20:03 +00:00
Alexander Gottwald
6c6151b233 If a context is already attached copy it instead of reattaching to keep
displaylists and share displaylists Enable tracing of often called
    functions with GLWIN_ENABLE_TRACE ForceCurrent is a no-op now
2005-03-01 18:58:17 +00:00
Alexander Gottwald
e8d3da3c75 Bugzilla #1866 (https://bugs.freedesktop.org/show_bug.cgi?id=1866)
attachment #1819 (https://bugs.freedesktop.org/attachment.cgi?id=1819):
    Define APIENTRY on windows to prevent <GL/gl.h> from loading
    <windows.h> removed leftovers from attachment #1818
2005-02-02 17:17:56 +00:00
Alexander Gottwald
81b862509c Bugzilla #1866 (https://bugs.freedesktop.org/show_bug.cgi?id=1866)
attachment #1818 (https://bugs.freedesktop.org/attachment.cgi?id=1818):
    Include Xwindows.h before GL/gl.h on windows to prevent loading
    windows.h which pollutes our namespace with some symbols.
2005-02-02 15:03:44 +00:00
Alexander Gottwald
1562ec5cc3 Functions like glGenTextures and glBindTexture are in OpenGL 1.1 and can be
resolved at linktime. Fixes tuxkart (at least with wine)
2005-01-27 20:33:34 +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
Alexander Gottwald
9826b83826 Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added
mingw (Win32) port
2004-11-15 15:06:51 +00:00
Torrey Lyons
269012e601 Add offscreen GLX direct rendering with XDarwin's xpr backend (John
Harper).
2004-09-21 22:01:14 +00:00
Kevin E Martin
0e56515aa3 Fix AGL display problems (Bug #1210, Torrey T. Lyons). 2004-09-02 01:38:17 +00:00
Alexander Gottwald
922fd3a2e5 Added $(MESASRCDIR)/src/mesa/glapi to INCLUDES. Removed $(SERVERSRC)/mi
from INCLUDES. Rearranged INCLUDES for better readability.
Removed mipointrst.h and miscstruct.h from #include since they are not used
    anymore.
2004-08-13 19:18:29 +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
Eric Anholt
f45c46c630 Initial revision 2004-06-16 09:25:15 +00:00
Eric Anholt
22bad9474b DRI XFree86-4_3_99_12-merge import 2004-06-16 09:22:17 +00:00
Egbert Eich
0664db19bf Merging XORG-CURRENT into trunk 2004-04-23 18:54:16 +00:00
Egbert Eich
dae90c3af9 Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 2004-03-14 08:34:49 +00:00
Egbert Eich
867451f1ab Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 2004-03-03 12:12:50 +00:00
Egbert Eich
df0313d35b readding XFree86's cvs IDs 2004-02-26 13:36:15 +00:00
Egbert Eich
147aae87fd Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 2004-02-26 09:23:53 +00:00
Kaleb Keithley
4ee0a53de8 Import most of XFree86 4.4RC3. This import excludes files which have the
new license. If we want to, later we can import 4.4RC3 again and pick
    up the files that have the new license, but for now the vendor branch
    is "pure."
2004-02-23 20:35:22 +00:00
Kaleb Keithley
adc7f9a4eb XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks 2003-11-25 19:29:01 +00:00
Kaleb Keithley
90f1536dd3 Initial revision 2003-11-25 19:29:01 +00:00
Kaleb Keithley
9508a382f8 Initial revision 2003-11-14 16:48:57 +00:00