Commit Graph

202 Commits

Author SHA1 Message Date
George Sapountzis 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
Daniel Stone 8522044635 GL: Update for Mesa changes
Added s_fragprog.c to fix the build.
2007-03-28 13:03:32 +03:00
Michel Dänzer 6a0bed16e8 Fix typo in GL/mesa/shader/slang/Makefile.am. 2007-03-27 16:51:12 +02:00
Dave Airlie b8f846a9df gl: oops dodgy s appeared pointed out by jcristau on irc.. 2007-03-27 14:17:40 +10:00
Dave Airlie a63ee90bc2 gl: update for latest mesa glsl-compiler merge 2007-03-27 11:05:52 +10:00
Alan Hourihane 4bf1b280f7 Set pScreen on context 2007-03-09 14:18:14 +00:00
Jens Granseuer 689d52b624 Bugzilla #7145: fix build with gcc 2.95
Bugzilla #7145: <http://bugs.freedesktop.org/show_bug.cgi?id=7145>
Patch #8987: <http://bugs.freedesktop.org/attachment.cgi?id=8987>
2007-03-05 15:31:44 -08:00
Ben Byer ed7ccc481a AIGLX support for Darwin -- works well enough to run
glxgears and glxinfo, but still needs more testing.
2007-03-01 00:51:10 -08:00
Ben Byer 00b0657b81 glx fixes for XDarwin 2007-02-17 00:55:32 -08:00
Dave Airlie 236f04b638 remove array_cache from everywhere 2007-02-05 09:10:08 +11:00
Dave Airlie fb1bc1c65b add vbo to .gitignore 2007-02-04 18:39:58 +11:00
Dave Airlie d8e148ec84 update xserver for vbo code in mesa 2007-02-04 18:39:04 +11:00
Alan Hourihane 170a55022e remove file 2007-02-02 20:56:12 +00:00
Dan Nicholson 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
Alan Hourihane af20485ec3 Remove array_cache for recent Mesa changes 2007-02-02 19:16:34 +00:00
Michel Dänzer 65f4690ecb __glXDRIscreenProbe: Use drmOpen/CloseOnce.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=9275 . Based on patch from
Alan Swanson.
2007-01-19 17:56:06 +01:00
Ian Romanick dfb2c10413 Add missing #else from previous commits. 2007-01-05 10:15:09 -08:00
Ian Romanick f90c3e226b Re-regenerate from Mesa scripts.
DO NOT HAND EDIT THESE FILES!  For cryin' out loud, there's even a
comment to that effect in the file's header...
2007-01-04 15:38:16 -08:00
Ian Romanick b7ca5d14ce Incorporate new byte-order related configure changes. 2007-01-04 15:37:33 -08:00
Ian Romanick 8dd5771a1b Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:

	GL/glx/indirect_dispatch_swap.c
	GL/glx/swap_interval.c
2007-01-04 15:01:38 -08:00
Ian Romanick 45aa26ccb4 Regenerate from Mesa scripts.
Regenerate source files from Mesa scripts.  This causes the generated
files to use glxbyteorder.h.
2007-01-04 14:55:51 -08:00
Ian Romanick 6d603bb47f Add new header file containing byte-order wrappers.
Move the byte-order related wrappers out of the individual source
files into a dedicated header file.  Modify the single hand-coded
source file that uses the byte-order wrappers to use the new header
file.
2007-01-04 14:49:26 -08:00
Eric Anholt 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
Alan Coopersmith 2fd4626fa6 Make GLX byteswap macros more portable
- Use autoconf tests instead of platform-specific #ifdef's to decide
  which macros to use.
- Provide fallbacks for platforms like Solaris that don't provide any
  of the existing known forms.
2007-01-03 15:44:55 -08:00
Eamon Walsh 10aabb729d Convert callers of LookupDrawable() to dixLookupDrawable(). 2006-12-15 16:36:29 -05:00
Drew Parsons 9423ac134a GNU/FreeBSD support in GLX: include byteswap.h for FreeBSD systems
defining __GLIBC__, as done already for Linux and Hurd (cf. bug #5613).
Also includes some more __GNU__ checks on top of those made in
commit ade4bf0907.
Thanks Petr Salinger (Debian bug #400869).
2006-12-01 15:21:05 +11:00
Brian 61832cb94c Regenerated from Mesa w/ latest gl_API.xml file 2006-11-22 09:16:43 -07:00
Brian 61863f09d2 Regenerated from Mesa, fixes glMap* protocol problem (bug 8899) 2006-11-22 09:16:17 -07:00
George Sapountzis f17e3c34df Fix GL context destruction with AIGLX.
The logic for freeing GL contexts introduced by "Fix AIGLX VT switching." is
inverted. As it is now, GL context destruction is deferred for glxDRIEnterVT().
2006-11-16 22:14:53 +02:00
Alan Coopersmith ca09468419 Correct symlink-mesa.sh usage message 2006-11-10 18:02:05 -08:00
Adam Jackson 0409e1627a 'make dist' fixes. 2006-11-08 16:17:20 -05:00
Samuel Thibault ade4bf0907 mesa/indirect: include byteswap.h on GNU userland (bug #5613)
Include byteswap.h on all GNU-userland systems (including with the Hurd
and FreeBSD kernels), not just Linux.
2006-11-04 19:08:24 +02:00
Eamon Walsh a34446f5b3 Add missing file to list in Makefile.am 2006-10-27 13:43:43 -04:00
Michel Dänzer 3ad1642f1b Fix __glXDRIbindTexImage() for 32 bpp on big endian platforms. 2006-10-15 16:57:09 +02:00
Ian Romanick a6df780e4d Fix bug #8608.
Regenerate files based on recent commits to Mesa (that fix Mesa bug
that return pixel data.
2006-10-11 15:41:22 -07:00
Daniel Stone d7c89c7c1c symlink-mesa.sh: expand *.{c,h} 2006-10-02 02:19:51 +03:00
Brian 84eb2c0a06 Replace hard-coded filesnames with loops (all .c and .h files).
Should fix problems with Mesa adding/removing source files, for the most part.
Patch by Dan Nicholson.
2006-09-28 15:09:40 -06:00
Jeff Smith cf6e9687ff Bug #8449: Yet another Mesa symlink script resync. 2006-09-28 15:34:17 -04:00
Ian Romanick 05231e336d Use correct opcodes for GLX_EXT_texture_from_pixmap.
Regenerate from glX_API.xml 1.3 from Mesa.  The glproto package and libGL
(from Mesa) must also be updated.
2006-09-14 14:13:39 -07:00
Kristian Høgsberg 86450998da Fix AIGLX VT switching.
See https://bugs.freedesktop.org/show_bug.cgi?id=7916

There may be a simpler, less intrusive fix that involves just rearranging
DRI locking between 2D and 3D drivers around VT switch.
2006-09-07 15:35:16 -04:00
Ian Romanick 64479fffa2 Remove prototypes and externs for non-existant functions and variables. 2006-09-06 16:13:21 -07:00
Ian Romanick a0179281a6 Remove prototypes for non-existant functions. 2006-09-06 15:45:48 -07:00
Ian Romanick c2813514cf Add missing file from previous commit. 2006-08-31 15:36:13 -07:00
Ian Romanick 0f9cfb2f75 Implement GLX_SGI_swap_control.
Regenerate from glX_API.xml 1.2.  Add infrastructure to support
GLX_SGI_swap_control for AIGLX when the DRI driver enables it.  Tested
with R300.
2006-08-31 13:54:10 -07:00
Ian Romanick a9ef586291 Fix problems with vertex program protocol
There were two sets of bugs in the vertex program (ARB and NV)
protocol.  First, several of the ARB functions were missing the
'doubles_in_order="true"' annotation.  Second, after the ARB decided
that glVertexAttrib*ARB functions must not alias fixed-function state
for GLSL, Nvidia re-assigned GLX protocol opcodes for
glVertexAttrib*NV (circa Septeber 2004).  For some reason gl_API.xml
was never updated to reflect this, and the updated version of the
GL_NV_vertex_program spec never made into the registry.

This is just a server-side regeneration from gl_API.xml version 1.68.
2006-08-31 13:47:50 -07:00
Ian Romanick 2fb7b8795a Minor extension tweaks.
GLX_EXT_texture_from_pixmap should always be enabled.
GLX_SGI_video_sync is only for direct rendering and should never
appear in the server's string.
2006-08-29 16:35:32 -07:00
Ian Romanick d59b52fc08 Make sure unsupported extensions are disabled.
GLX protocol isn't supported for GLX_SGI_swap_control or
GLX_SGI_video_sync.  Remove them from the list of available extensions
until they are supported.
2006-08-29 14:40:13 -07:00
Ian Romanick db6d04d4b8 Add support for AIGLX drivers to enable GLX extensions that they support. 2006-08-29 14:35:08 -07:00
Ian Romanick 77d315bd2f Remove __glXNoSuchRenderOpcode because it is no longer used. 2006-08-29 13:30:20 -07:00
Ian Romanick 2fde560bbb Enable GL_EXT_texture_filter_anisotropic and GL_EXT_blend_equation_separate.
Re-generate from gl_API.xml 1.65.  This provides the missing bits for
GL_EXT_texture_filter_anisotropic and GL_EXT_blend_equation_separate.
Enable those extensions.
2006-08-25 13:01:51 -07:00