xserver: Branch 'master' - 5 commits
George Sapountzis
gsap7 at kemper.freedesktop.org
Fri May 23 12:42:10 PDT 2008
glx/glxdriswrast.c | 2 +-
glx/glxscreens.c | 7 +++++--
glx/glxutil.c | 6 ------
hw/dmx/glxProxy/glxext.c | 2 +-
hw/kdrive/ephyr/Makefile.am | 4 ----
hw/kdrive/fake/Makefile.am | 4 ----
hw/kdrive/fbdev/Makefile.am | 4 ----
hw/kdrive/sdl/Makefile.am | 4 ----
hw/kdrive/vesa/Makefile.am | 4 ----
hw/xfree86/dixmods/glxmodule.c | 7 ++++---
10 files changed, 11 insertions(+), 33 deletions(-)
New commits:
commit 6c72961d8fa1ab1543f1b3e2cc7d34ff6d254bf8
Author: George Sapountzis <gsap7 at yahoo.gr>
Date: Fri May 23 22:39:35 2008 +0300
glx: fix memory corruption with r5g6b5
should cherry-pick to xserver-1.5
diff --git a/glx/glxscreens.c b/glx/glxscreens.c
index 5859de0..cc7054a 100644
--- a/glx/glxscreens.c
+++ b/glx/glxscreens.c
@@ -420,10 +420,13 @@ findFirstSet(unsigned int v)
static void
initGlxVisual(VisualPtr visual, __GLXconfig *config)
{
+ int maxBits;
+ maxBits = max(config->redBits, max(config->greenBits, config->blueBits));
+
config->visualID = visual->vid;
visual->class = glxConvertToXVisualType(config->visualType);
- visual->bitsPerRGBValue = config->redBits;
- visual->ColormapEntries = 1 << config->redBits;
+ visual->bitsPerRGBValue = maxBits;
+ visual->ColormapEntries = 1 << maxBits;
visual->nplanes = config->redBits + config->greenBits + config->blueBits;
visual->redMask = config->redMask;
commit 21a8052fdca2115668dfc747b0b58db437b4eb6d
Author: George Sapountzis <gsap7 at yahoo.gr>
Date: Fri May 23 22:39:09 2008 +0300
glx: fix forgotten swrast -> SWRast
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 877e6c35ff1f0f110627590ac0f12fddf47de506
Author: George Sapountzis <gsap7 at yahoo.gr>
Date: Fri May 23 22:38:36 2008 +0300
glx: missing swrast is fatal
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 1345c93ad4be875951256dae87bc4fd9a1b5e08a
Author: George Sapountzis <gsap7 at yahoo.gr>
Date: Fri May 23 22:38:11 2008 +0300
glx: drop stray glcore.h include
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 ae0504d34d245f15b2f098a63ad1a9e1c4daef35
Author: George Sapountzis <gsap7 at yahoo.gr>
Date: Fri May 23 22:40:03 2008 +0300
kdrive: need not export symbols for glx anymore
diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
index 5269876..140cccb 100644
--- a/hw/kdrive/ephyr/Makefile.am
+++ b/hw/kdrive/ephyr/Makefile.am
@@ -62,10 +62,6 @@ libxephyr_a_SOURCES = $(XEPHYR_SRCS)
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@
More information about the xorg-commit
mailing list