Mark the ARGB FBConfig as nonconforming to prevent drivers and apps from

    falling over.
Add @GLX_DEFINES@ so GLcore gets compiled with TLS support if configured.
Only destroy the mesa buffer if it got initialized.

13 files changed, 72 insertions, 14 deletions

diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c
index 3a3b43027..0b7525eb9 100644
--- a/GL/glx/glxcmds.c
+++ b/GL/glx/glxcmds.c
@@ -1034,10 +1034,10 @@ __glXCreateARGBConfig(__GLXscreen *screen)
     if (visual == NULL || visual->class != TrueColor)
 	return;
 
+    /* Stop now if we already added the mode. */
     if (_gl_context_modes_find_visual (screen->modes, visual->vid))
 	return;
 
-    /* Stop now if we already added the mode. */
     modes = _gl_context_modes_create(1, sizeof(__GLcontextModes));
     if (modes == NULL)
 	return;
@@ -1073,6 +1073,8 @@ __glXCreateARGBConfig(__GLXscreen *screen)
     modes->depthBits = 0;
     modes->haveStencilBuffer = FALSE;
     modes->stencilBits = 0;
+
+    modes->visualRating = GLX_NON_CONFORMANT_CONFIG;
 }
 
 
diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am
index e51f9e8f3..1f740ee90 100644
--- a/GL/mesa/X/Makefile.am
+++ b/GL/mesa/X/Makefile.am
@@ -18,8 +18,13 @@ INCLUDES = -I@MESA_SOURCE@/include \
 
 # -DXFree86Server is required because the X11 driver in Mesa thinks that
 # symbol means "being built in the server"
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \
-            -DXFree86Server
+AM_CFLAGS = \
+	$(DIX_CFLAGS) \
+	@SERVER_DEFINES@ \
+	@MODULE_DEFINES@ \
+	@LOADER_DEFINES@ \
+	@GLX_DEFINES@ \
+	-DXFree86Server
 
 libX_la_SOURCES = xf86glx.c \
                   xf86glx_util.c \
diff --git a/GL/mesa/X/xf86glx.c b/GL/mesa/X/xf86glx.c
index abecb3d2a..b1125a733 100644
--- a/GL/mesa/X/xf86glx.c
+++ b/GL/mesa/X/xf86glx.c
@@ -101,7 +101,8 @@ __glXMesaDrawableDestroy(__GLXdrawable *base)
 {
     __GLXMESAdrawable *glxPriv = (__GLXMESAdrawable *) base;
 
-    XMesaDestroyBuffer(glxPriv->xm_buf);
+    if (glxPriv->xm_buf != NULL)
+      XMesaDestroyBuffer(glxPriv->xm_buf);
     xfree(glxPriv);
 }
 
diff --git a/GL/mesa/array_cache/Makefile.am b/GL/mesa/array_cache/Makefile.am
index 0f4aec5b2..4169f3df3 100644
--- a/GL/mesa/array_cache/Makefile.am
+++ b/GL/mesa/array_cache/Makefile.am
@@ -1,6 +1,11 @@
 noinst_LTLIBRARIES = libac.la
 
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = \
+	$(DIX_CFLAGS) \
+	@SERVER_DEFINES@ \
+	@MODULE_DEFINES@ \
+	@LOADER_DEFINES@ \
+	@GLX_DEFINES@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff --git a/GL/mesa/glapi/Makefile.am b/GL/mesa/glapi/Makefile.am
index ae881452c..223f0c213 100644
--- a/GL/mesa/glapi/Makefile.am
+++ b/GL/mesa/glapi/Makefile.am
@@ -1,6 +1,11 @@
 noinst_LTLIBRARIES = libglapi.la
 
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = \
+	$(DIX_CFLAGS) \
+	@SERVER_DEFINES@ \
+	@MODULE_DEFINES@ \
+	@LOADER_DEFINES@ \
+	@GLX_DEFINES@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am
index f78a3aad7..867fe57bd 100644
--- a/GL/mesa/main/Makefile.am
+++ b/GL/mesa/main/Makefile.am
@@ -1,6 +1,11 @@
 noinst_LTLIBRARIES = libmain.la
 
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = \
+	$(DIX_CFLAGS) \
+	@SERVER_DEFINES@ \
+	@MODULE_DEFINES@ \
+	@LOADER_DEFINES@ \
+	@GLX_DEFINES@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff --git a/GL/mesa/math/Makefile.am b/GL/mesa/math/Makefile.am
index 119959c6f..4b157c394 100644
--- a/GL/mesa/math/Makefile.am
+++ b/GL/mesa/math/Makefile.am
@@ -1,6 +1,11 @@
 noinst_LTLIBRARIES = libmath.la
 
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = \
+	$(DIX_CFLAGS) \
+	@SERVER_DEFINES@ \
+	@MODULE_DEFINES@ \
+	@LOADER_DEFINES@ \
+	@GLX_DEFINES@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff --git a/GL/mesa/shader/Makefile.am b/GL/mesa/shader/Makefile.am
index 2449b6cda..dd0ed712f 100644
--- a/GL/mesa/shader/Makefile.am
+++ b/GL/mesa/shader/Makefile.am
@@ -2,7 +2,12 @@ SUBDIRS = grammar slang
 
 noinst_LTLIBRARIES = libshader.la
 
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = \
+	$(DIX_CFLAGS) \
+	@SERVER_DEFINES@ \
+	@MODULE_DEFINES@ \
+	@LOADER_DEFINES@ \
+	@GLX_DEFINES@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff --git a/GL/mesa/shader/grammar/Makefile.am b/GL/mesa/shader/grammar/Makefile.am
index 51ebb8c55..9f9e5f61e 100644
--- a/GL/mesa/shader/grammar/Makefile.am
+++ b/GL/mesa/shader/grammar/Makefile.am
@@ -1,6 +1,11 @@
 noinst_LTLIBRARIES = libgrammar.la
 
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = \
+	$(DIX_CFLAGS) \
+	@SERVER_DEFINES@ \
+	@MODULE_DEFINES@ \
+	@LOADER_DEFINES@ \
+	@GLX_DEFINES@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../../X \
diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am
index 4a00c9920..7088ee15c 100644
--- a/GL/mesa/shader/slang/Makefile.am
+++ b/GL/mesa/shader/slang/Makefile.am
@@ -1,6 +1,11 @@
 noinst_LTLIBRARIES = libslang.la
 
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = \
+	$(DIX_CFLAGS) \
+	@SERVER_DEFINES@ \
+	@MODULE_DEFINES@ \
+	@LOADER_DEFINES@ \
+	@GLX_DEFINES@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../grammar \
diff --git a/GL/mesa/swrast/Makefile.am b/GL/mesa/swrast/Makefile.am
index 973de3ac2..904b772dc 100644
--- a/GL/mesa/swrast/Makefile.am
+++ b/GL/mesa/swrast/Makefile.am
@@ -1,6 +1,11 @@
 noinst_LTLIBRARIES = libswrast.la
 
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = \
+	$(DIX_CFLAGS) \
+	@SERVER_DEFINES@ \
+	@MODULE_DEFINES@ \
+	@LOADER_DEFINES@ \
+	@GLX_DEFINES@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff --git a/GL/mesa/swrast_setup/Makefile.am b/GL/mesa/swrast_setup/Makefile.am
index 3d77f8f8a..c52575d1e 100644
--- a/GL/mesa/swrast_setup/Makefile.am
+++ b/GL/mesa/swrast_setup/Makefile.am
@@ -1,6 +1,11 @@
 noinst_LTLIBRARIES = libss.la
 
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = \
+	$(DIX_CFLAGS) \
+	@SERVER_DEFINES@ \
+	@MODULE_DEFINES@ \
+	@LOADER_DEFINES@ \
+	@GLX_DEFINES@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \
diff --git a/GL/mesa/tnl/Makefile.am b/GL/mesa/tnl/Makefile.am
index 0f28ceeb5..cbf46fda3 100644
--- a/GL/mesa/tnl/Makefile.am
+++ b/GL/mesa/tnl/Makefile.am
@@ -1,6 +1,11 @@
 noinst_LTLIBRARIES = libtnl.la
 
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = \
+	$(DIX_CFLAGS) \
+	@SERVER_DEFINES@ \
+	@MODULE_DEFINES@ \
+	@LOADER_DEFINES@ \
+	@GLX_DEFINES@
 
 INCLUDES = -I@MESA_SOURCE@/include \
            -I../X \