xserver: Branch 'glucose-2' - 2 commits
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Thu Sep 13 10:21:57 PDT 2007
hw/xgl/xglglx.c | 7 +------
include/xgl-config.h.in | 3 +++
mi/miinitext.c | 20 +++++++++++---------
3 files changed, 15 insertions(+), 15 deletions(-)
New commits:
diff-tree ade1abeb4ae4f9dfff0ad7c7d29118a320d53430 (from 0bc3ae70521b05287821036d92a94a88b578a227)
Author: José Fonseca <jrfonseca at tungstengraphics.com>
Date: Thu Sep 13 18:16:32 2007 +0100
Add the XGLServer define, per Daniel Stone.
diff --git a/include/xgl-config.h.in b/include/xgl-config.h.in
index 877d179..b708a93 100644
--- a/include/xgl-config.h.in
+++ b/include/xgl-config.h.in
@@ -7,6 +7,9 @@
#include <dix-config.h>
+/* Building XGL server */
+#undef XGLServer
+
/* Use loadable XGL modules. */
#undef XGL_MODULAR
diff-tree 0bc3ae70521b05287821036d92a94a88b578a227 (from d503862a02af8e48fb0690e82029b79dbc943fad)
Author: José Fonseca <jrfonseca at tungstengraphics.com>
Date: Thu Sep 13 18:14:39 2007 +0100
Remove the __glXMesaProvider stub and references to it to avoid symbol clash at run-time.
diff --git a/hw/xgl/xglglx.c b/hw/xgl/xglglx.c
index 09bbc35..e45f34e 100644
--- a/hw/xgl/xglglx.c
+++ b/hw/xgl/xglglx.c
@@ -101,15 +101,10 @@ GlxSetRenderTables (struct _glapi_table
(*__xglGLXFunc.setRenderTables) (table);
}
-/*
-** Stub to satisfy miinitext.c references.
-*/
-__GLXprovider __glXMesaProvider;
-
void
GlxPushProvider (__GLXprovider *provider)
{
- if (glXHandle && provider != &__glXMesaProvider)
+ if (glXHandle)
(*__xglGLXFunc.pushProvider) (provider);
}
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 0fc6d15..5d7f163 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -27,13 +27,13 @@ Copyright 1987 by Digital Equipment Corp
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -588,7 +588,7 @@ InitExtensions(argc, argv)
if (!noXCMiscExtension) XCMiscExtensionInit();
#endif
#ifdef XRECORD
- if (!noTestExtensions) RecordExtensionInit();
+ if (!noTestExtensions) RecordExtensionInit();
#endif
#ifdef DBE
if (!noDbeExtension) DbeExtensionInit();
@@ -637,7 +637,9 @@ InitExtensions(argc, argv)
DarwinGlxPushProvider(__DarwinglXMesaProvider);
if (!noGlxExtension) DarwinGlxExtensionInit();
#else
+#ifndef XGL_MODULAR
GlxPushProvider(&__glXMesaProvider);
+#endif
if (!noGlxExtension) GlxExtensionInit();
#endif // INXDARWINAPP
#endif // GLXEXT
@@ -735,10 +737,10 @@ static ExtensionModule staticExtensions[
#endif
#ifdef XEVIE
{ XevieExtensionInit, "XEVIE", &noXevieExtension, NULL },
-#endif
+#endif
{ NULL, NULL, NULL, NULL, NULL }
};
-
+
/*ARGSUSED*/
void
InitExtensions(argc, argv)
@@ -771,8 +773,8 @@ InitExtensions(argc, argv)
for (i = 0; ExtensionModuleList[i].name != NULL; i++) {
ext = &ExtensionModuleList[i];
- if (ext->initFunc != NULL &&
- (ext->disablePtr == NULL ||
+ if (ext->initFunc != NULL &&
+ (ext->disablePtr == NULL ||
(ext->disablePtr != NULL && !*ext->disablePtr))) {
(ext->initFunc)();
}
More information about the xorg-commit
mailing list