xorg-server: Changes to 'upstream-experimental'
GL/Makefile.am | 14
GL/apple/Makefile.am | 24
GL/apple/aglGlx.c | 1354 ------
GL/apple/indirect.c | 1938 --------
GL/glx/.gitignore | 13
GL/glx/Makefile.am | 83
GL/glx/extension_string.c | 165
GL/glx/extension_string.h | 63
GL/glx/g_disptab.h | 51
GL/glx/glxbyteorder.h | 61
GL/glx/glxcmds.c | 2383 ----------
GL/glx/glxcmdsswap.c | 778 ---
GL/glx/glxcontext.h | 150
GL/glx/glxdrawable.h | 101
GL/glx/glxdri.c | 1183 -----
GL/glx/glxdri2.c | 762 ---
GL/glx/glxext.c | 501 --
GL/glx/glxext.h | 92
GL/glx/glxglcore.c | 451 --
GL/glx/glxscreens.c | 601 --
GL/glx/glxscreens.h | 184
GL/glx/glxserver.h | 266 -
GL/glx/glxutil.c | 154
GL/glx/glxutil.h | 63
GL/glx/indirect_program.c | 150
GL/glx/indirect_table.h | 106
GL/glx/indirect_texture_compression.c | 120
GL/glx/indirect_util.c | 310 -
GL/glx/indirect_util.h | 53
GL/glx/render2.c | 264 -
GL/glx/render2swap.c | 375 -
GL/glx/renderpix.c | 75
GL/glx/renderpixswap.c | 93
GL/glx/rensize.c | 423 -
GL/glx/single2.c | 394 -
GL/glx/single2swap.c | 272 -
GL/glx/singlepix.c | 533 --
GL/glx/singlepixswap.c | 584 --
GL/glx/singlesize.c | 198
GL/glx/singlesize.h | 59
GL/glx/swap_interval.c | 92
GL/glx/unpack.h | 239 -
GL/glx/xfont.c | 201
GL/mesa/.gitignore | 32
GL/mesa/Makefile.am | 18
GL/mesa/X/Makefile.am | 27
GL/mesa/glapi/Makefile.am | 20
GL/mesa/main/Makefile.am | 86
GL/mesa/math/Makefile.am | 27
GL/mesa/shader/Makefile.am | 39
GL/mesa/shader/grammar/Makefile.am | 20
GL/mesa/shader/slang/Makefile.am | 41
GL/mesa/swrast/Makefile.am | 50
GL/mesa/swrast_setup/Makefile.am | 20
GL/mesa/tnl/Makefile.am | 37
GL/mesa/vbo/Makefile.am | 35
GL/symlink-mesa.sh | 342 -
GL/windows/ChangeLog | 64
GL/windows/glwindows.h | 64
GL/windows/glwrap.c | 583 --
GL/windows/indirect.c | 1605 -------
Makefile.am | 4
XTrap/xtrapdi.c | 2
Xext/security.c | 10
Xext/shm.c | 13
Xext/xselinux.c | 2
Xi/exevents.c | 11
composite/compalloc.c | 3
config/hal.c | 275 -
config/x11-input.fdi | 62
configure.ac | 71
dbe/dbe.c | 53
dix/Makefile.am | 14
dix/privates.c | 65
dix/protocol.txt | 28
dix/registry.c | 44
dix/window.c | 1
exa/exa.c | 79
exa/exa.h | 2
exa/exa_accel.c | 66
exa/exa_migration.c | 2
exa/exa_offscreen.c | 49
exa/exa_priv.h | 9
exa/exa_unaccel.c | 18
fb/fb24_32.c | 10
glx/Makefile.am | 91
glx/dispatch.h | 3829 +++++++++++++++++
glx/extension_string.c | 165
glx/extension_string.h | 63
glx/g_disptab.h | 51
glx/glapi.c | 1064 ++++
glx/glapi.h | 160
glx/glapioffsets.h | 1174 +++++
glx/glapitable.h | 816 +++
glx/glapitemp.h | 6655 ++++++++++++++++++++++++++++++
glx/glprocs.h | 2260 ++++++++++
glx/glthread.c | 378 +
glx/glthread.h | 319 +
glx/glxbyteorder.h | 61
glx/glxcmds.c | 2383 ++++++++++
glx/glxcmdsswap.c | 778 +++
glx/glxcontext.h | 150
glx/glxdrawable.h | 101
glx/glxdri.c | 1160 +++++
glx/glxdri2.c | 584 ++
glx/glxdricommon.c | 209
glx/glxdricommon.h | 40
glx/glxdriswrast.c | 544 ++
glx/glxext.c | 501 ++
glx/glxext.h | 92
glx/glxscreens.c | 604 ++
glx/glxscreens.h | 184
glx/glxserver.h | 266 +
glx/glxutil.c | 148
glx/glxutil.h | 63
glx/indirect_dispatch.c | 5889 ++++++++++++++++++++++++++
glx/indirect_dispatch.h | 1047 ++++
glx/indirect_dispatch_swap.c | 6051 +++++++++++++++++++++++++++
glx/indirect_program.c | 150
glx/indirect_reqsize.c | 832 +++
glx/indirect_reqsize.h | 121
glx/indirect_size.h | 88
glx/indirect_size_get.c | 1210 +++++
glx/indirect_size_get.h | 102
glx/indirect_table.c | 1596 +++++++
glx/indirect_table.h | 106
glx/indirect_texture_compression.c | 120
glx/indirect_util.c | 310 +
glx/indirect_util.h | 53
glx/render2.c | 264 +
glx/render2swap.c | 375 +
glx/renderpix.c | 75
glx/renderpixswap.c | 93
glx/rensize.c | 423 +
glx/single2.c | 394 +
glx/single2swap.c | 272 +
glx/singlepix.c | 533 ++
glx/singlepixswap.c | 584 ++
glx/singlesize.c | 198
glx/singlesize.h | 59
glx/swap_interval.c | 92
glx/unpack.h | 239 +
glx/xfont.c | 201
hw/dmx/glxProxy/glxcmds.c | 15
hw/dmx/glxProxy/glxext.c | 2
hw/kdrive/ati/Makefile.am | 4
hw/kdrive/chips/Makefile.am | 4
hw/kdrive/ephyr/ephyrglxext.c | 8
hw/kdrive/epson/Makefile.am | 4
hw/kdrive/i810/Makefile.am | 4
hw/kdrive/mach64/Makefile.am | 4
hw/kdrive/mga/Makefile.am | 4
hw/kdrive/neomagic/Makefile.am | 4
hw/kdrive/nvidia/Makefile.am | 4
hw/kdrive/pm2/Makefile.am | 4
hw/kdrive/r128/Makefile.am | 4
hw/kdrive/sis300/Makefile.am | 4
hw/kdrive/smi/Makefile.am | 4
hw/kdrive/via/Makefile.am | 4
hw/xfree86/common/extramodes | 6
hw/xfree86/common/xf86Module.h | 10
hw/xfree86/common/xf86VidMode.c | 10
hw/xfree86/dixmods/GLcoremodule.c | 63
hw/xfree86/dixmods/Makefile.am | 12
hw/xfree86/dixmods/glxmodule.c | 37
hw/xfree86/dri/Makefile.am | 3
hw/xfree86/dri2/Makefile.am | 2
hw/xfree86/int10/xf86int10.c | 12
hw/xfree86/loader/dixsym.c | 3
hw/xfree86/modes/xf86Crtc.c | 2
hw/xfree86/os-support/bsd/bsd_init.c | 2
hw/xfree86/os-support/bus/Makefile.am | 4
hw/xfree86/os-support/bus/Pci.h | 71
hw/xfree86/os-support/bus/axpPci.c | 415 -
hw/xfree86/os-support/linux/int10/linux.c | 4
hw/xfree86/os-support/shared/sigio.c | 3
hw/xfree86/x86emu/ops2.c | 63
hw/xfree86/xaa/Makefile.am | 2
hw/xfree86/xaa/xaaInitAccel.c | 9
hw/xgl/Makefile.am | 2
hw/xgl/glx/Makefile.am | 2
hw/xgl/glxext/Makefile.am | 2
hw/xgl/glxext/module/Makefile.am | 2
hw/xnest/Makefile.am | 1
hw/xprint/Makefile.am | 3
hw/xprint/ddxInit.c | 6
hw/xquartz/GL/Makefile.am | 13
hw/xquartz/GL/indirect.c | 1938 ++++++++
hw/xquartz/Makefile.am | 4
hw/xwin/glx/ChangeLog | 64
hw/xwin/glx/glwindows.h | 64
hw/xwin/glx/glwrap.c | 583 ++
hw/xwin/glx/indirect.c | 1605 +++++++
include/Makefile.am | 4
include/dix-config.h.in | 3
include/privates.h | 61
include/xorg-config.h.in | 3
mi/miinitext.c | 4
miext/damage/damage.c | 53
miext/damage/damagestr.h | 1
record/record.c | 16
render/picture.c | 21
render/render.c | 29
xkb/ddxLoad.c | 2
204 files changed, 51585 insertions(+), 20060 deletions(-)
New commits:
commit 0617653277d2e2802c6223fc2a221adfa6b93fc4
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 30 16:11:32 2008 -0400
xserver 1.5RC5
diff --git a/configure.ac b/configure.ac
index 4ef00b4..83892df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.99.904, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.99.905, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
commit bee463bd8a991ef7ba619241237cd06d2fc92558
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 30 16:10:37 2008 -0400
XInput ABI is 2.1, not 3.1.
(cherry picked from commit 76576c87b0de106e006d1cfa59d42d3a483e966c)
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index fdcd567..5ce6e8a 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -84,7 +84,7 @@ typedef enum {
*/
#define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4)
#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(4, 1)
-#define ABI_XINPUT_VERSION SET_ABI_VERSION(3, 1)
+#define ABI_XINPUT_VERSION SET_ABI_VERSION(2, 1)
#define ABI_EXTENSION_VERSION SET_ABI_VERSION(1, 1)
#define ABI_FONT_VERSION SET_ABI_VERSION(0, 6)
commit 795d293d769aa93dddd457e8e200d62044a3921a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 4 12:11:14 2008 -0700
Wrap AddTraps in exa and damage.
This fine (and unused) function wasn't ever wrapped which made it not work
under exa.
(cherry picked from commit 06e7e1d0486e8c516a9b3219a2c86026f88825fc)
diff --git a/exa/exa.c b/exa/exa.c
index 3a6ad98..a35b174 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -753,6 +753,7 @@ exaCloseScreen(int i, ScreenPtr pScreen)
if (ps) {
ps->Composite = pExaScr->SavedComposite;
ps->Trapezoids = pExaScr->SavedTrapezoids;
+ ps->AddTraps = pExaScr->SavedAddTraps;
}
#endif
@@ -919,6 +920,9 @@ exaDriverInit (ScreenPtr pScreen,
pExaScr->SavedTrapezoids = ps->Trapezoids;
ps->Trapezoids = exaTrapezoids;
+
+ pExaScr->SavedAddTraps = ps->AddTraps;
+ ps->AddTraps = ExaCheckAddTraps;
}
#endif
diff --git a/exa/exa_priv.h b/exa/exa_priv.h
index 0138e4a..21e6f0b 100644
--- a/exa/exa_priv.h
+++ b/exa/exa_priv.h
@@ -114,6 +114,7 @@ typedef struct {
TrianglesProcPtr SavedTriangles;
GlyphsProcPtr SavedGlyphs;
TrapezoidsProcPtr SavedTrapezoids;
+ AddTrapsProcPtr SavedAddTraps;
#endif
Bool swappedOut;
@@ -293,6 +294,13 @@ ExaCheckGetSpans (DrawablePtr pDrawable,
int nspans,
char *pdstStart);
+void
+ExaCheckAddTraps (PicturePtr pPicture,
+ INT16 x_off,
+ INT16 y_off,
+ int ntrap,
+ xTrap *traps);
+
/* exa_accel.c */
static _X_INLINE Bool
diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index 8e19886..d7bd06c 100644
--- a/exa/exa_unaccel.c
+++ b/exa/exa_unaccel.c
@@ -350,6 +350,20 @@ ExaCheckComposite (CARD8 op,
REGION_UNINIT(pScreen, ®ion);
}
+void
+ExaCheckAddTraps (PicturePtr pPicture,
+ INT16 x_off,
+ INT16 y_off,
+ int ntrap,
+ xTrap *traps)
+{
+ EXA_FALLBACK(("to pict %p (%c)\n",
+ exaDrawableLocation(pPicture->pDrawable)));
+ exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
+ fbAddTraps (pPicture, x_off, y_off, ntrap, traps);
+ exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
+}
+
/**
* Gets the 0,0 pixel of a pixmap. Used for doing solid fills of tiled pixmaps
* that happen to be 1x1. Pixmap must be at least 8bpp.
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index 56864c5..b9a15ee 100755
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -655,6 +655,58 @@ damageGlyphs (CARD8 op,
damageReportPostOp (pDst->pDrawable);
wrap (pScrPriv, ps, Glyphs, damageGlyphs);
}
+
+static void
+damageAddTraps (PicturePtr pPicture,
+ INT16 x_off,
+ INT16 y_off,
+ int ntrap,
+ xTrap *traps)
+{
+ ScreenPtr pScreen = pPicture->pDrawable->pScreen;
+ PictureScreenPtr ps = GetPictureScreen(pScreen);
+ damageScrPriv(pScreen);
+
+ if (checkPictureDamage (pPicture))
+ {
+ BoxRec box;
+ int i;
+ int x, y;
+ xTrap *t = traps;
+
+ box.x1 = 32767;
+ box.y1 = 32767;
+ box.x2 = -32767;
+ box.y2 = -32767;
+ x = pPicture->pDrawable->x + x_off;
+ y = pPicture->pDrawable->y + y_off;
+ for (i = 0; i < ntrap; i++)
+ {
+ pixman_fixed_t l = min (t->top.l, t->bot.l);
+ pixman_fixed_t r = max (t->top.r, t->bot.r);
+ int x1 = x + pixman_fixed_to_int (l);
+ int x2 = x + pixman_fixed_to_int (pixman_fixed_ceil (r));
+ int y1 = y + pixman_fixed_to_int (t->top.y);
+ int y2 = y + pixman_fixed_to_int (pixman_fixed_ceil (t->bot.y));
+
+ if (x1 < box.x1)
+ box.x1 = x1;
+ if (x2 > box.x2)
+ box.x2 = x2;
+ if (y1 < box.y1)
+ box.y1 = y1;
+ if (y2 > box.y2)
+ box.y2 = y2;
+ }
+ TRIM_PICTURE_BOX (box, pPicture);
+ if (BOX_NOT_EMPTY(box))
+ damageDamageBox (pPicture->pDrawable, &box, pPicture->subWindowMode);
+ }
+ unwrap (pScrPriv, ps, AddTraps);
+ (*ps->AddTraps) (pPicture, x_off, y_off, ntrap, traps);
+ damageReportPostOp (pPicture->pDrawable);
+ wrap (pScrPriv, ps, AddTraps, damageAddTraps);
+}
#endif
/**********************************************************/
@@ -1767,6 +1819,7 @@ DamageSetup (ScreenPtr pScreen)
if (ps) {
wrap (pScrPriv, ps, Glyphs, damageGlyphs);
wrap (pScrPriv, ps, Composite, damageComposite);
+ wrap (pScrPriv, ps, AddTraps, damageAddTraps);
}
#endif
diff --git a/miext/damage/damagestr.h b/miext/damage/damagestr.h
index 2f6d538..7ee40ce 100755
--- a/miext/damage/damagestr.h
+++ b/miext/damage/damagestr.h
@@ -70,6 +70,7 @@ typedef struct _damageScrPriv {
#ifdef RENDER
CompositeProcPtr Composite;
GlyphsProcPtr Glyphs;
+ AddTrapsProcPtr AddTraps;
#endif
} DamageScrPrivRec, *DamageScrPrivPtr;
commit 32cd2c510939498e94ae2aaec40fe48b2850a321
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 30 11:18:27 2008 -0400
xserver 1.5RC4.
Remember kids, distcheck before you tag.
diff --git a/configure.ac b/configure.ac
index 64aab85..4ef00b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.99.903, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.99.904, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
commit 6ec12077ef0fd712ef97682deab751aac5c39d6d
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 30 10:47:34 2008 -0400
Distcheck fixes.
diff --git a/glx/Makefile.am b/glx/Makefile.am
index f62d2ed..39b96d7 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -40,12 +40,15 @@ glapi_sources = \
glapitemp.h \
glapi.c \
glapi.h \
+ glapioffsets.h \
glthread.c \
- glthread.h
+ glthread.h \
+ glprocs.h
libglxdri_la_SOURCES = \
glxdri.c \
glxdri2.c \
+ glxdricommon.h \
extension_string.c \
extension_string.h
diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index a885289..5ffba12 100644
--- a/hw/xwin/Makefile.am
+++ b/hw/xwin/Makefile.am
@@ -167,14 +167,7 @@ AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
dist_man1_MANS = XWin.man XWinrc.man
-GLX_EXTRAS = \
- windows/ChangeLog \
- windows/glwindows.h \
- windows/glwrap.c \
- windows/indirect.c
-
EXTRA_DIST = \
- $(GLX_EXTRAS) \
_usr_X11R6_lib_X11_system.XWinrc \
X-boxed.ico \
X.ico \
commit 6a2ee7e0bb416e82004510edd97bebe94596a858
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 30 10:40:50 2008 -0400
xserver 1.5RC3.
diff --git a/configure.ac b/configure.ac
index 9d39364..64aab85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.99.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.99.903, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
commit 6e8ed1398dd68426d45c20c05a10640c22f7d104
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 30 10:29:17 2008 -0400
Bump ABI minor numbers for the devPrivate ABI functions.
(cherry picked from commit 211e2bdcc677122145998829a7f26610c7c567e6)
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 240155c..fdcd567 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -82,11 +82,11 @@ typedef enum {
* changed. The minor revision mask is 0x0000FFFF and the major revision
* mask is 0xFFFF0000.
*/
-#define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 3)
-#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(4, 0)
-#define ABI_XINPUT_VERSION SET_ABI_VERSION(2, 0)
-#define ABI_EXTENSION_VERSION SET_ABI_VERSION(1, 0)
-#define ABI_FONT_VERSION SET_ABI_VERSION(0, 5)
+#define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4)
+#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(4, 1)
+#define ABI_XINPUT_VERSION SET_ABI_VERSION(3, 1)
+#define ABI_EXTENSION_VERSION SET_ABI_VERSION(1, 1)
+#define ABI_FONT_VERSION SET_ABI_VERSION(0, 6)
#define MODINFOSTRING1 0xef23fdc5
#define MODINFOSTRING2 0x10dc023a
commit 39cc11b005b2f462bca9004c8e0fa290377687ce
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 26 21:23:31 2008 -0400
Fix a leak of window devPrivates in window.c/CrushTree().
(cherry picked from commit 7ddfb2f1587da3ec1cd27ae270e42700adf4f560)
diff --git a/dix/window.c b/dix/window.c
index 9975b5e..834c26b 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -884,6 +884,7 @@ CrushTree(WindowPtr pWin)
(*UnrealizeWindow)(pChild);
}
FreeWindowResources(pChild);
+ dixFreePrivates(pChild->devPrivates);
xfree(pChild);
if ( (pChild = pSib) )
break;
commit 8017c999013b79fd30cb74eaf8ca0970e9b1bd4a
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed May 21 16:14:55 2008 -0700
Actually enable building GLX without Mesa source
(cherry picked from commit e837244947fbb18192e9056c070ce439ef24d1a3)
diff --git a/configure.ac b/configure.ac
index 05d4b78..9d39364 100644
--- a/configure.ac
+++ b/configure.ac
@@ -822,7 +822,7 @@ if test "x$RES" = xyes; then
REQUIRED_MODULES="$REQUIRED_MODULES resourceproto"
fi
-if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
+if test "x$GLX" = xyes; then
PKG_CHECK_MODULES([XLIB], [x11])
PKG_CHECK_MODULES([GL], [glproto >= 1.4.9 gl >= 7.1.0])
AC_SUBST(XLIB_CFLAGS)
commit 90f2a82ba5aa6480d2299f99816a2ba351e24bee
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri May 23 22:39:09 2008 +0300
glx: fix forgotten swrast -> SWRast
(cherry picked from commit 21a8052fdca2115668dfc747b0b58db437b4eb6d)
diff --git a/hw/dmx/glxProxy/glxext.c b/hw/dmx/glxProxy/glxext.c
index 4825831..c40150d 100644
--- a/hw/dmx/glxProxy/glxext.c
+++ b/hw/dmx/glxProxy/glxext.c
@@ -40,7 +40,7 @@
** Stubs to satisfy miinitext.c references.
*/
typedef int __GLXprovider;
-__GLXprovider __glXDRIswrastProvider;
+__GLXprovider __glXDRISWRastProvider;
void GlxPushProvider(__GLXprovider *provider) { }
/*
diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c
index 35ba74b..f6fda4b 100644
--- a/hw/xfree86/dixmods/glxmodule.c
+++ b/hw/xfree86/dixmods/glxmodule.c
@@ -85,7 +85,7 @@ glxSetup(pointer module, pointer opts, int *errmaj, int *errmin)
setupDone = TRUE;
- provider = LoaderSymbol("__glXDRIswrastProvider");
+ provider = LoaderSymbol("__glXDRISWRastProvider");
if (provider == NULL)
return NULL;
GlxPushProvider(provider);
commit 6e278e3944cc32d165829f6ef64cbafbf9b513b7
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri May 23 22:38:36 2008 +0300
glx: missing swrast is fatal
(cherry picked from commit 877e6c35ff1f0f110627590ac0f12fddf47de506)
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index 50dee51..9d987c2 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -532,7 +532,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
xfree(screen);
- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n");
+ FatalError("GLX: could not load software renderer\n");
return NULL;
}
diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c
index 026a936..35ba74b 100644
--- a/hw/xfree86/dixmods/glxmodule.c
+++ b/hw/xfree86/dixmods/glxmodule.c
@@ -86,8 +86,9 @@ glxSetup(pointer module, pointer opts, int *errmaj, int *errmin)
setupDone = TRUE;
provider = LoaderSymbol("__glXDRIswrastProvider");
- if (provider)
- GlxPushProvider(provider);
+ if (provider == NULL)
+ return NULL;
+ GlxPushProvider(provider);
xf86Msg(xf86Info.aiglxFrom, "AIGLX %s\n",
xf86Info.aiglx ? "enabled" : "disabled");
commit 0845476521f5b9e9b477197d96d7ffe64be7ae3a
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri May 23 22:38:11 2008 +0300
glx: drop stray glcore.h include
(cherry picked from commit 1345c93ad4be875951256dae87bc4fd9a1b5e08a)
diff --git a/glx/glxutil.c b/glx/glxutil.c
index aa23a95..fc73a02 100644
--- a/glx/glxutil.c
+++ b/glx/glxutil.c
@@ -42,13 +42,7 @@
#include <string.h>
#include "glxserver.h"
-#include <GL/glxtokens.h>
-#include <unpack.h>
-#include <pixmapstr.h>
-#include <windowstr.h>
#include "glxutil.h"
-#include "GL/internal/glcore.h"
-#include "GL/glxint.h"
/************************************************************************/
/* Context stuff */
commit 6f18c5d7039be3c03185aee61fb74ac4cf593532
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri May 23 22:40:03 2008 +0300
kdrive: need not export symbols for glx anymore
(cherry picked from commit ae0504d34d245f15b2f098a63ad1a9e1c4daef35)
diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
index 7ef22a3..81d3d69 100644
--- a/hw/kdrive/ephyr/Makefile.am
+++ b/hw/kdrive/ephyr/Makefile.am
@@ -67,10 +67,6 @@ libxephyr_a_CFLAGS = \
Xephyr_SOURCES = \
ephyrinit.c
-if GLX
-Xephyr_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
-endif
-
Xephyr_LDADD = \
libxephyr.a \
libxephyr-hostx.a \
diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am
index 0f88656..09d179e 100644
--- a/hw/kdrive/fake/Makefile.am
+++ b/hw/kdrive/fake/Makefile.am
@@ -16,10 +16,6 @@ libfake_a_SOURCES = \
Xfake_SOURCES = \
fakeinit.c
-if GLX
-Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
-endif
-
Xfake_LDADD = \
libfake.a \
@KDRIVE_LIBS@ \
diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am
index c77f146..420855b 100644
--- a/hw/kdrive/fbdev/Makefile.am
+++ b/hw/kdrive/fbdev/Makefile.am
@@ -14,10 +14,6 @@ bin_PROGRAMS = Xfbdev
Xfbdev_SOURCES = \
fbinit.c
-if GLX
-Xfbdev_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
-endif
-
Xfbdev_LDADD = \
libfbdev.a \
@KDRIVE_LIBS@
diff --git a/hw/kdrive/sdl/Makefile.am b/hw/kdrive/sdl/Makefile.am
index a70d147..fe9309e 100644
--- a/hw/kdrive/sdl/Makefile.am
+++ b/hw/kdrive/sdl/Makefile.am
@@ -7,10 +7,6 @@ bin_PROGRAMS = Xsdl
Xsdl_SOURCES = sdl.c
-if GLX
-Xsdl_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
-endif
-
Xsdl_LDADD = \
@KDRIVE_LIBS@ \
@XSDL_LIBS@
diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am
index ec35c1e..ac50d2b 100644
--- a/hw/kdrive/vesa/Makefile.am
+++ b/hw/kdrive/vesa/Makefile.am
@@ -19,10 +19,6 @@ libvesa_a_SOURCES = \
Xvesa_SOURCES = \
vesainit.c
-if GLX
-Xvesa_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
-endif
-
Xvesa_LDADD = \
libvesa.a \
@KDRIVE_LIBS@
commit a194718e9d83b488f21226332b8b5b250f48e274
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed May 21 13:33:36 2008 -0400
Move GL/glx on level up now that it's the only thing left under GL.
(cherry picked from commit c3eb5b80d8cc7ca6a425ccf359718d1ef3d5af55)
diff --git a/GL/Makefile.am b/GL/Makefile.am
deleted file mode 100644
index c3ac155..0000000
--- a/GL/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-SUBDIRS = glx
-
-WINDOWS_EXTRAS = \
- windows/ChangeLog \
- windows/glwindows.h \
- windows/glwrap.c \
- windows/indirect.c
-
-EXTRA_DIST = symlink-mesa.sh $(WINDOWS_EXTRAS)
diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am
deleted file mode 100644
index f62d2ed..0000000
--- a/GL/glx/Makefile.am
+++ /dev/null
@@ -1,88 +0,0 @@
-if AIGLX
-GLXDRI_LIBRARY = libglxdri.la
-endif
-
-noinst_LTLIBRARIES = libglx.la $(GLXDRI_LIBRARY)
-
-AM_CFLAGS = \
- @DIX_CFLAGS@ \
- @GL_CFLAGS@ \
- @XLIB_CFLAGS@ \
- @LIBDRM_CFLAGS@ \
- @DRIPROTO_CFLAGS@ \
- -DXFree86Server \
- @GLX_DEFINES@ \
- @GLX_ARCH_DEFINES@
-
-# none yet
-#sdk_HEADERS =
-
-INCLUDES = \
- -I$(top_srcdir)/hw/xfree86/os-support \
- -I$(top_srcdir)/hw/xfree86/os-support/bus \
- -I$(top_srcdir)/hw/xfree86/common \
- -I$(top_srcdir)/hw/xfree86/dri \
- -I$(top_srcdir)/hw/xfree86/dri2 \
- -I$(top_srcdir)/mi
-
-glapi_sources = \
- indirect_dispatch.c \
- indirect_dispatch.h \
- indirect_dispatch_swap.c \
- indirect_reqsize.c \
- indirect_reqsize.h \
- indirect_size.h \
- indirect_size_get.c \
- indirect_size_get.h \
- indirect_table.c \
- dispatch.h \
- glapitable.h \
- glapitemp.h \
- glapi.c \
- glapi.h \
- glthread.c \
- glthread.h
-
-libglxdri_la_SOURCES = \
- glxdri.c \
- glxdri2.c \
- extension_string.c \
- extension_string.h
-
-libglx_la_SOURCES = \
- $(indirect_sources) \
- $(glapi_sources) \
- indirect_util.c \
- indirect_util.h \
- indirect_program.c \
- indirect_table.h \
- indirect_texture_compression.c \
- g_disptab.h \
- glxbyteorder.h \
- glxcmds.c \
- glxcmdsswap.c \
- glxcontext.h \
- glxdrawable.h \
- glxext.c \
- glxext.h \
- glxdriswrast.c \
- glxdricommon.c \
- glxscreens.c \
- glxscreens.h \
- glxserver.h \
- glxutil.c \
- glxutil.h \
- render2.c \
- render2swap.c \
- renderpix.c \
- renderpixswap.c \
- rensize.c \
- single2.c \
- single2swap.c \
- singlepix.c \
- singlepixswap.c \
- singlesize.c \
- singlesize.h \
- swap_interval.c \
- unpack.h \
- xfont.c
diff --git a/GL/glx/dispatch.h b/GL/glx/dispatch.h
deleted file mode 100644
index 7123156..0000000
--- a/GL/glx/dispatch.h
+++ /dev/null
@@ -1,3829 +0,0 @@
-/* DO NOT EDIT - This file generated automatically by gl_table.py (from Mesa) script */
-
-/*
- * (C) Copyright IBM Corporation 2005
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * IBM,
- * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#if !defined( _DISPATCH_H_ )
-# define _DISPATCH_H_
-
-/**
- * \file dispatch.h
- * Macros for handling GL dispatch tables.
- *
- * For each known GL function, there are 3 macros in this file. The first
- * macro is named CALL_FuncName and is used to call that GL function using
- * the specified dispatch table. The other 2 macros, called GET_FuncName
- * can SET_FuncName, are used to get and set the dispatch pointer for the
- * named function in the specified dispatch table.
- */
-
-#define CALL_by_offset(disp, cast, offset, parameters) \
- (*(cast (GET_by_offset(disp, offset)))) parameters
-#define GET_by_offset(disp, offset) \
- (offset >= 0) ? (((_glapi_proc *)(disp))[offset]) : NULL
-#define SET_by_offset(disp, offset, fn) \
- do { \
- if ( (offset) < 0 ) { \
- /* fprintf( stderr, "[%s:%u] SET_by_offset(%p, %d, %s)!\n", */ \
- /* __func__, __LINE__, disp, offset, # fn); */ \
- /* abort(); */ \
- } \
- else { \
- ( (_glapi_proc *) (disp) )[offset] = (_glapi_proc) fn; \
- } \
- } while(0)
-
-#define CALL_NewList(disp, parameters) (*((disp)->NewList)) parameters
-#define GET_NewList(disp) ((disp)->NewList)
-#define SET_NewList(disp, fn) ((disp)->NewList = fn)
-#define CALL_EndList(disp, parameters) (*((disp)->EndList)) parameters
-#define GET_EndList(disp) ((disp)->EndList)
-#define SET_EndList(disp, fn) ((disp)->EndList = fn)
-#define CALL_CallList(disp, parameters) (*((disp)->CallList)) parameters
-#define GET_CallList(disp) ((disp)->CallList)
-#define SET_CallList(disp, fn) ((disp)->CallList = fn)
-#define CALL_CallLists(disp, parameters) (*((disp)->CallLists)) parameters
-#define GET_CallLists(disp) ((disp)->CallLists)
-#define SET_CallLists(disp, fn) ((disp)->CallLists = fn)
-#define CALL_DeleteLists(disp, parameters) (*((disp)->DeleteLists)) parameters
-#define GET_DeleteLists(disp) ((disp)->DeleteLists)
-#define SET_DeleteLists(disp, fn) ((disp)->DeleteLists = fn)
-#define CALL_GenLists(disp, parameters) (*((disp)->GenLists)) parameters
-#define GET_GenLists(disp) ((disp)->GenLists)
-#define SET_GenLists(disp, fn) ((disp)->GenLists = fn)
-#define CALL_ListBase(disp, parameters) (*((disp)->ListBase)) parameters
-#define GET_ListBase(disp) ((disp)->ListBase)
-#define SET_ListBase(disp, fn) ((disp)->ListBase = fn)
-#define CALL_Begin(disp, parameters) (*((disp)->Begin)) parameters
-#define GET_Begin(disp) ((disp)->Begin)
-#define SET_Begin(disp, fn) ((disp)->Begin = fn)
-#define CALL_Bitmap(disp, parameters) (*((disp)->Bitmap)) parameters
-#define GET_Bitmap(disp) ((disp)->Bitmap)
-#define SET_Bitmap(disp, fn) ((disp)->Bitmap = fn)
-#define CALL_Color3b(disp, parameters) (*((disp)->Color3b)) parameters
-#define GET_Color3b(disp) ((disp)->Color3b)
-#define SET_Color3b(disp, fn) ((disp)->Color3b = fn)
-#define CALL_Color3bv(disp, parameters) (*((disp)->Color3bv)) parameters
-#define GET_Color3bv(disp) ((disp)->Color3bv)
-#define SET_Color3bv(disp, fn) ((disp)->Color3bv = fn)
-#define CALL_Color3d(disp, parameters) (*((disp)->Color3d)) parameters
-#define GET_Color3d(disp) ((disp)->Color3d)
-#define SET_Color3d(disp, fn) ((disp)->Color3d = fn)
-#define CALL_Color3dv(disp, parameters) (*((disp)->Color3dv)) parameters
-#define GET_Color3dv(disp) ((disp)->Color3dv)
-#define SET_Color3dv(disp, fn) ((disp)->Color3dv = fn)
-#define CALL_Color3f(disp, parameters) (*((disp)->Color3f)) parameters
-#define GET_Color3f(disp) ((disp)->Color3f)
-#define SET_Color3f(disp, fn) ((disp)->Color3f = fn)
-#define CALL_Color3fv(disp, parameters) (*((disp)->Color3fv)) parameters
-#define GET_Color3fv(disp) ((disp)->Color3fv)
-#define SET_Color3fv(disp, fn) ((disp)->Color3fv = fn)
-#define CALL_Color3i(disp, parameters) (*((disp)->Color3i)) parameters
-#define GET_Color3i(disp) ((disp)->Color3i)
-#define SET_Color3i(disp, fn) ((disp)->Color3i = fn)
-#define CALL_Color3iv(disp, parameters) (*((disp)->Color3iv)) parameters
-#define GET_Color3iv(disp) ((disp)->Color3iv)
-#define SET_Color3iv(disp, fn) ((disp)->Color3iv = fn)
-#define CALL_Color3s(disp, parameters) (*((disp)->Color3s)) parameters
-#define GET_Color3s(disp) ((disp)->Color3s)
-#define SET_Color3s(disp, fn) ((disp)->Color3s = fn)
-#define CALL_Color3sv(disp, parameters) (*((disp)->Color3sv)) parameters
-#define GET_Color3sv(disp) ((disp)->Color3sv)
-#define SET_Color3sv(disp, fn) ((disp)->Color3sv = fn)
-#define CALL_Color3ub(disp, parameters) (*((disp)->Color3ub)) parameters
-#define GET_Color3ub(disp) ((disp)->Color3ub)
-#define SET_Color3ub(disp, fn) ((disp)->Color3ub = fn)
-#define CALL_Color3ubv(disp, parameters) (*((disp)->Color3ubv)) parameters
-#define GET_Color3ubv(disp) ((disp)->Color3ubv)
-#define SET_Color3ubv(disp, fn) ((disp)->Color3ubv = fn)
-#define CALL_Color3ui(disp, parameters) (*((disp)->Color3ui)) parameters
-#define GET_Color3ui(disp) ((disp)->Color3ui)
-#define SET_Color3ui(disp, fn) ((disp)->Color3ui = fn)
-#define CALL_Color3uiv(disp, parameters) (*((disp)->Color3uiv)) parameters
Reply to: