Commit Graph

282 Commits

Author SHA1 Message Date
Alan Hourihane
41aea6194b More checking for failed contexts/drawables 2008-02-27 17:06:27 +00:00
Alan Hourihane
43e46a654f Fix context sharing between direct/indirect contexts 2008-02-27 16:58:21 +00:00
Michel Dänzer
dcc077c753 AIGLX: Switch to server context for calling DamageDamageRegion().
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=14518 .
2008-02-26 12:20:04 +01:00
Dan Nicholson
45d00433e7 glx: Use glapi sources from the mesa tree
With recent mesa HEAD, the glapi sources used only in the xserver glx
module are carried in the mesa tree. Previously, these were generated
separately and committed to the xserver tree.

The build is changed to symlink these files like the other mesa sources.
This reduces the chance for mismatches between mesa's glX API and the
xserver's glX API.
2008-02-17 17:37:33 -08:00
Kristian Høgsberg
0ffb6a3ad0 GLX: Implement support for TTM BO based TFP when available. 2008-02-14 22:20:56 -05:00
Kristian Høgsberg
879515b139 Add GLX provider for DRI2. 2008-02-14 19:53:49 -05:00
Michel Dänzer
005e31d3de AIGLX: Refactor code common between __glXDRI{drawableDestroy,releaseTexImage}. 2008-02-15 00:01:32 +00:00
Pierre Willenbrock
cd78f0d0fc AIGLX: Fix crash after client using GLX_EXT_texture_from_pixmap died. 2008-02-14 23:48:46 +00:00
Michel Dänzer
94a21d757c AIGLX: Fix GLX_EXT_texture_from_pixmap fallback with EXA.
Use pScreen->GetImage to obtain the pixmap contents instead of dereferencing
pPixmap->devPrivate.ptr directly.
2008-01-19 13:25:02 +01:00
Brian
306fde4082 regenerated to add framebuffer object tokens (bug 13800) 2008-01-01 09:27:44 -07:00
Brian
5c362c2eb2 regenerated, adds GL_MAX_3D_TEXTURE_SIZE (see bug 13811) 2008-01-01 09:08:01 -07:00
Jurij Smakov
36ff05771b GL: Add GLX compile flags lost in modular X server changes
RISC chips that trap on unaligned loads and stores need to
define __GLX_ALIGN64.  This used to get added to the cflags
in the old *.cf files but it no longer does in the modular
X server.

Also, Alpha needs to pass -mieee to the compiler as well.

This is a simple backport of a patch that debian, and probably other
distributions, have been applying forever.  To the best of my
knowledge the patch was written by Jurij Smakov.  See Debian bug
number #388125.

I just checked and this has been rotting for more than a year in
freedesktop bugzilla as #8392.

Signed-off-by: David S. Miller <davem@davemloft.net>
2007-12-29 00:00:04 +02:00
Eamon Walsh
c8feb73f58 Merge branch 'master' into XACE-SELINUX
Conflicts:

	Xext/EVI.c
	Xext/bigreq.c
	Xext/cup.c
	Xext/dpms.c
	Xext/fontcache.c
	Xext/mitmisc.c
	Xext/xcmisc.c
	Xext/xf86bigfont.c
	Xext/xtest.c
	configure.ac
	dbe/dbe.c
	hw/darwin/darwin.h
	hw/darwin/darwinEvents.c
	hw/darwin/iokit/xfIOKit.h
	hw/darwin/iokit/xfIOKitCursor.c
	hw/darwin/quartz/fullscreen/fullscreen.c
	hw/darwin/quartz/fullscreen/quartzCursor.c
	hw/darwin/quartz/quartz.c
	hw/darwin/quartz/quartzCommon.h
	hw/darwin/quartz/quartzCursor.c
	hw/darwin/quartz/xpr/dri.c
	hw/darwin/quartz/xpr/dristruct.h
	hw/darwin/quartz/xpr/xprCursor.c
	hw/darwin/quartz/xpr/xprFrame.c
	hw/xfree86/modes/xf86RandR12.c
	include/cursor.h
	miext/rootless/rootlessCommon.h
	miext/rootless/rootlessScreen.c
	miext/rootless/rootlessWindow.c
	render/picturestr.h

Trying to pick up the pieces from the darwin churn here...
2007-12-13 18:38:25 -05:00
Jeremy Huddleston
0ad1c359c5 Darwin: Use __APPLE__ instead of __DARWIN__
(cherry picked from commit 54654815fa)
2007-12-07 18:54:58 -08:00
Ben Byer
67907904f0 fixed pathname in GL/apple/Makefile.am
(cherry picked from commit b6357cec6d)
2007-12-07 14:10:15 -08:00
Jeremy Huddleston
601307615e Darwin,Rootless: Makefile cleanup
(cherry picked from commit 9c6d8a035b)
2007-11-26 14:49:32 -08:00
Jeremy Huddleston
bcbaf2a0ce Darwin: Dead code removal, Code cleanup, Added launcher
Imported changes from xorg-server-1.2-apple to make master more current wrt
file layout, build system changes, and dead code removal.
2007-11-21 19:52:11 -08:00
Eamon Walsh
1603130236 Merge branch 'master' into XACE-SELINUX
Conflicts:

	Xext/xace.c
	Xext/xace.h
2007-11-14 13:35:50 -05:00
Kristian Høgsberg
f48087b6c3 Regenerate GLX dispatch code for recent gl_API.xml changes (#12935). 2007-11-09 05:49:26 -05:00
Eamon Walsh
a52c9b2a59 Merge branch 'master' into XACE-SELINUX
Conflicts:

	dix/dispatch.c
	dix/property.c
	hw/xfree86/common/xf86VidMode.c
	include/xkbsrv.h
	render/glyph.c
	xkb/xkbActions.c
2007-11-05 19:08:36 -05:00
Dodji Seketeli
4113f040c5 GL: fix crash at mesa destruction time
* GL/glx/glxglcore.c:
         (_glXMesaScreenDestroy): delete the same amount of visuals
         that those which were created in createMesaVisuals().
2007-11-05 17:33:01 +01:00
Aaron Plattner
f2e310132f Add CreatePixmap allocation hints.
These hints allow an acceleration architecture to optimize allocation of certain
types of pixmaps, such as pixmaps that will serve as backing pixmaps for
redirected windows.
2007-11-04 16:11:28 -08:00
Kristian Høgsberg
692654b430 Set up visuals for the existing X visuals.
This makes the root visual a GLX capable visual again and adds a GLX visual
for the COMPOSITE ARGB visual cleanly (as opposed to the hack we had before).
2007-10-29 18:14:18 -04:00
Kristian Høgsberg
497aba8949 Weed out some unused fluff from __GLXcontext. 2007-10-26 11:25:57 -04:00
Kristian Høgsberg
80d8a3e176 Quiet glx visual debug info. 2007-10-26 10:20:50 -04:00
Kristian Høgsberg
f62277d421 Clean up unused pVisual part of __GLXcontext. 2007-10-25 18:49:02 -04:00
Kristian Høgsberg
30bcaa966d Make glx destroy path handle cases where the X window goes away first. 2007-10-25 18:49:02 -04:00
Eamon Walsh
b633d54b94 Merge branch 'master' into XACE-SELINUX
Conflicts:

	GL/glx/glxscreens.c
	hw/xnest/Screen.c
	render/glyph.c
	render/glyphstr.h
	render/render.c
2007-10-25 12:19:30 -04:00
Michel Dänzer
fbe19c66c3 GLX: Fix leak of X pixmaps associated with GLX pixmaps. 2007-10-22 18:28:03 +02:00
Michel Dänzer
c6d36b1cee GLX: Don't crash on unused client array members when switching to/from console. 2007-10-22 18:28:03 +02:00
Kristian Høgsberg
89c6108531 Fix software GL to provide a list of supported fbconfigs like the DRI case. 2007-10-19 16:22:33 -04:00
Kristian Høgsberg
8e3c1dfc48 Introduce a new "GlxVisuals" option that controls which visuals are added.
Right now we default to "all" which gives us a situation much like before,
but when the "typical" option is implemented, we can change the default and
reduce the number of visuals the GLX module bloats the X server with.
2007-10-18 21:03:43 -04:00
Kristian Høgsberg
9e3cfd950d Add code to set up GLX visuals and add one for the first double buffered FBConfig. 2007-10-18 21:03:43 -04:00
Kristian Høgsberg
8fc635e6a8 Separate handling of GLX visuals and GLX FBConfigs.
XIDs for GLX visuals and FBConfigs used to be interchangable and the list of
GLX visuals was identical to the list for FBConfigs.  This patch splits handling
of these two data types and allows the X server to pick and choose the FBConfigs
that are exposed as visuals.
2007-10-18 21:03:43 -04:00
Kristian Høgsberg
7d74690536 Simplify and clean up GLX visual initialization.
Instead of the fragile setup where we filter the modes common between the
DDX generated GLX visuals and the DRI driver generated fbconfigs, we now
just take the fbconfigs returned by the DRI driver to be our supported set.
2007-10-18 21:03:43 -04:00
Eamon Walsh
50b27e1ad2 devPrivates rework: update new GL/glxext code.
Need to merge so this type of thing stops happening.
2007-10-17 16:09:40 -04:00
Alan Hourihane
9dde53ed17 Fix walking of GLX providers. 2007-10-16 19:55:56 +01:00
Michel Dänzer
70a5d33c9e Always check the return value of __glXGetDrawable first.
Fixes spurious GLX protocol errors because __glXGetDrawable doesn't set the
error code in case of success. Maybe it should, though.
2007-10-16 12:46:07 +02:00
Kristian Høgsberg
8b5078b7d9 Fix byte swapping for GetFBConfigs. 2007-10-15 13:11:30 -04:00
George Sapountzis
c922d2eebe glx: drop duplicate GetDrawableAttributesSGIX declarations.
They are officially autogenerated in indirect_dispatch.h now.
2007-10-15 11:32:08 +03:00
Kristian Høgsberg
ec0fc012e9 Fix GLX byteswapping. 2007-10-14 14:59:12 -04:00
Kristian Høgsberg
ccda4b66bd Implement ChangeDrawableAttributes so we can support GLX_EVENT_MASK.
We never need to actually send out the clobber event, so this should be
sufficient for GLX 1.3.
2007-10-12 19:15:05 -04:00
Kristian Høgsberg
695eb8b2e8 Implement GLX pbuffers. 2007-10-12 19:12:26 -04:00
Kristian Høgsberg
516c181f57 Add dispatching for GLX_SGIX_pbuffer. 2007-10-12 18:48:38 -04:00
Kristian Høgsberg
d7ded953c4 Implment GLXPixmaps. 2007-10-12 18:26:55 -04:00
Kristian Høgsberg
2b0847c7aa Implement damage reporting for AIGLX. 2007-10-12 16:19:19 -04:00
Kristian Høgsberg
600028305c Move hyperpipe and swapbarrier extension funcs to screen private struct.
This gets rid of a couple more global arrays and gets the two extensions
more in line with the general extension mechanism.
2007-10-12 16:18:23 -04:00
Kristian Høgsberg
781515bb63 Convert GLX module to use screen private indexes like everything else. 2007-10-12 16:18:19 -04:00
Kristian Høgsberg
72a3d68a2f Update the AIGLX DRI loader to use the new DRI interface.
This lets us drop a bunch of workarounds and use the new DRI extension
mechanism.
2007-10-12 15:51:47 -04:00
Dodji Seketeli
6307ee7709 GLX: allow skipping of visual init wrapping
* GL/glx/glxvisuals.c: added boolean to disable
	  calling init_visuals(). This gives a chance to Xephyr
	  to take over visuals manipulation and avoid a crash at
	  server shutdown in __glXMesaScreenDestroy(), due to the fact
	  that mesa might sees more visual than what it has actually created in
	  init_visuals(). It might see more visuals because Xephyr can augment
	  the number of visuals, dynamically.
	* os/utils.c: the boolean is actually defined here.
2007-10-02 16:55:17 +02:00