Jeremy Huddleston
7ee34a69f3
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-04-24 18:26:09 -07:00
Jeremy Huddleston
c611335dee
XQuartz: Compile in missing glx source that we still need
2008-04-24 18:21:42 -07:00
Dave Airlie
947419bce2
glx: test for valid read and draw privates before using them
...
this should fix a bug where f-spot exiting blows up the X server
(cherry picked from commit ae982a27e4
)
2008-04-24 16:58:14 +10:00
Dave Airlie
d7db6dd1a1
GLcore: make googleearth not crash the server on sw-rendering.
...
I don't think this is the 100% correct answer as I get log spam saying
(EE) DoSwapInterval: cx = 0x98b8998, GLX screen = 0x96dd780
(EE) AIGLX: cx->pGlxScreen->swapInterval == NULL
but thats better than X exiting in my book.
(cherry picked from commit a368ab757e
)
2008-04-24 16:58:03 +10:00
Jeremy Huddleston
c9356f3289
Moved Apple GL bits into our DDX subtree
2008-04-23 10:13:50 -07:00
Ben Byer
85a5796b66
xquartz: build fixes for GLX/DRI2 fallout (note: not guaranteed)
2008-04-23 06:00:57 -07:00
Ben Byer
27545fd37f
glx / xquartz: we still need glxcontentmodes.[ch] kthx
2008-04-23 03:43:51 -07:00
Ben Byer
40bd041e42
xquartz: remove vestigial aglGlx.c
2008-04-23 03:40:31 -07:00
Dave Airlie
32604d0f13
glx: silly nitpick...
...
even though i and j are the same, we use i to derefence visuals everywhere else
(cherry picked from commit 3e12c5bb67
)
2008-04-15 11:48:10 +10:00
Dave Airlie
738aea7a94
glcore: make visualRating GLX_NONE - note GLX_NONE is not == 0
...
Finally glxinfo returns the set of 3 visuals and glxgears works again for me on
sw rendering
(cherry picked from commit 97565c0f39
)
2008-04-15 11:48:03 +10:00
Dave Airlie
d6916b149d
glcore: zero fbconfigs before filling them in.
...
I'm not sure this the complete proper solution, perhaps it should explicitly fill
in ever field.
This at least makes glxinfo on glcore return sensible information, it doesn't make
gears work yet though.
(cherry picked from commit c61087c827
)
2008-04-15 11:47:56 +10:00
Kristian Høgsberg
ff886a66de
Convert __DRIconfigs after we've made sure createNewScreen succeeded.
...
(cherry picked from commit ec17900f52
)
2008-04-04 11:47:09 -04:00
Kristian Høgsberg
856d9dd615
Send the GLX_EXT_texture_from_pixmap attributes to the client.
2008-04-02 19:06:40 -04:00
Kristian Høgsberg
2478122793
dri2: Unbreak glcore visual setup.
2008-04-02 12:59:25 -04:00
Kristian Høgsberg
2156bdf3b7
Implement DRI2 direct rendering and update AIGLX to DRI interface changes.
...
Get rid of glcontextmodes.[ch] from build, rename __GlcontextModes to
__GLXcontext. Drop all #includes of glcontextmodes.h and glcore.h.
Drop the DRI context modes extension.
Add protocol code to DRI2 module and load DRI2 extension by default.
(cherry picked from commit c40e0b51f0
)
2008-04-01 11:58:27 -04:00
Eamon Walsh
c6ac4d4f4d
Apply __glXDisp_GetVisualConfigs message patch
...
From http://bugs.freedesktop.org/show_bug.cgi?id=13863
Problem was that the glxcmds.c __glXDisp_GetVisualConfigs
function left garbage in the tail end of the message used for extensions.
(cherry picked from commit edad0a9dfe
)
2008-03-18 18:06:37 -04:00
Kristian Høgsberg
02feb14a67
GLX: Track changes to DRI_TEX_BUFFER extension.
...
We now just pass in the __DRIdrawable.
(cherry picked from commit 01c2e01f2a
)
2008-03-10 18:18:17 -04:00
Kristian Høgsberg
12829f1e91
DRI2: Return event buffer head index in DRI2CreateDrawable.
...
And pass it to the DRI driver in AIGLX.
(cherry picked from commit acedc03367
)
2008-03-10 18:18:14 -04:00
Kristian Høgsberg
4aaf048b5a
Fix DRI2 texture target for GLX_EXT_texture_from_pixmap.
...
Thanks to Dennis Kasprzyk for pointing it out and for reminding me to
commit it.
(cherry picked from commit 9abaad115c
)
2008-03-10 18:18:11 -04:00
Adam Jackson
2a47accff8
Fix distcheck.
2008-03-05 23:56:49 -05:00
George Sapountzis
b0b9c811cd
fix typo
2008-03-01 20:24:50 +02:00
George Sapountzis
e7a6f79754
glcore: split mesa and X in build system
2008-03-01 19:49:23 +02:00
Kristian Høgsberg
13bfa5937d
GLX: Adjust to changes in DRI driver interface.
2008-02-29 15:11:13 -05:00
Eamon Walsh
27bcf40cda
XACE: Fix instances of DixUnknownAccess at hook callsites.
2008-02-28 16:43:43 -05:00
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