andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
falling over.
Add @GLX_DEFINES@ so GLcore gets compiled with TLS support if configured.
Only destroy the mesa buffer if it got initialized.
This commit is contained in:
Kristian Høgsberg 2006-03-30 20:08:44 +00:00
parent 08e319091f
commit 8ec42a10ff
14 changed files with 83 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2006-03-30 Kristian Høgsberg <krh@redhat.com>
* GL/glx/glxcmds.c (__glXCreateARGBConfig): Mark the ARGB FBConfig
as nonconforming to prevent drivers and apps from falling over.
* GL/mesa/*/Makefile.am (AM_CFLAGS): Add @GLX_DEFINES@ so GLcore
gets compiled with TLS support if configured.
* GL/mesa/X/xf86glx.c (__glXMesaDrawableDestroy): Only destroy the
mesa buffer if it got initialized.
2006-03-30 Egbert Eich <eich_at_freedesktop_dot_org>
* include/colormapst.h:

4
GL/glx/glxcmds.c
View File

@ -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;
}

9
GL/mesa/X/Makefile.am
View File

@ -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 \

3
GL/mesa/X/xf86glx.c
View File

@ -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);
}

7
GL/mesa/array_cache/Makefile.am
View File

@ -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 \

7
GL/mesa/glapi/Makefile.am
View File

@ -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 \

7
GL/mesa/main/Makefile.am
View File

@ -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 \

7
GL/mesa/math/Makefile.am
View File

@ -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 \

7
GL/mesa/shader/Makefile.am
View File

@ -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 \

7
GL/mesa/shader/grammar/Makefile.am
View File

@ -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 \

7
GL/mesa/shader/slang/Makefile.am
View File

@ -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 \

7
GL/mesa/swrast/Makefile.am
View File

@ -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 \

7
GL/mesa/swrast_setup/Makefile.am
View File

@ -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 \

7
GL/mesa/tnl/Makefile.am
View File

@ -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 \