GLX: Insert swrast provider from GlxExtensionInit
Rather than making poor old miinitext.c do it, including making DMX have fake symbols just to keep it happy. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Stéphane Marchesin <stephane.marchesin@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
13552a5c47
commit
b86aa74caf
|
@ -322,9 +322,15 @@ GlxExtensionInit(void)
|
||||||
ExtensionEntry *extEntry;
|
ExtensionEntry *extEntry;
|
||||||
ScreenPtr pScreen;
|
ScreenPtr pScreen;
|
||||||
int i;
|
int i;
|
||||||
__GLXprovider *p;
|
__GLXprovider *p, **stack;
|
||||||
Bool glx_provided = False;
|
Bool glx_provided = False;
|
||||||
|
|
||||||
|
if (serverGeneration == 1) {
|
||||||
|
for (stack = &__glXProviderStack; *stack; stack = &(*stack)->next)
|
||||||
|
;
|
||||||
|
*stack = &__glXDRISWRastProvider;
|
||||||
|
}
|
||||||
|
|
||||||
__glXContextRes = CreateNewResourceType((DeleteType) ContextGone,
|
__glXContextRes = CreateNewResourceType((DeleteType) ContextGone,
|
||||||
"GLXContext");
|
"GLXContext");
|
||||||
__glXDrawableRes = CreateNewResourceType((DeleteType) DrawableGone,
|
__glXDrawableRes = CreateNewResourceType((DeleteType) DrawableGone,
|
||||||
|
|
|
@ -99,6 +99,7 @@ struct __GLXprovider {
|
||||||
const char *name;
|
const char *name;
|
||||||
__GLXprovider *next;
|
__GLXprovider *next;
|
||||||
};
|
};
|
||||||
|
__GLXprovider __glXDRISWRastProvider;
|
||||||
|
|
||||||
void GlxPushProvider(__GLXprovider * provider);
|
void GlxPushProvider(__GLXprovider * provider);
|
||||||
|
|
||||||
|
|
|
@ -45,16 +45,6 @@
|
||||||
#include "micmap.h"
|
#include "micmap.h"
|
||||||
#include "glxswap.h"
|
#include "glxswap.h"
|
||||||
|
|
||||||
/*
|
|
||||||
** Stubs to satisfy miinitext.c references.
|
|
||||||
*/
|
|
||||||
typedef int __GLXprovider;
|
|
||||||
__GLXprovider __glXDRISWRastProvider;
|
|
||||||
void
|
|
||||||
GlxPushProvider(__GLXprovider * provider)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Forward declarations.
|
** Forward declarations.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -84,11 +84,6 @@ glxSetup(pointer module, pointer opts, int *errmaj, int *errmin)
|
||||||
|
|
||||||
setupDone = TRUE;
|
setupDone = TRUE;
|
||||||
|
|
||||||
provider = LoaderSymbol("__glXDRISWRastProvider");
|
|
||||||
if (provider == NULL)
|
|
||||||
return NULL;
|
|
||||||
GlxPushProvider(provider);
|
|
||||||
|
|
||||||
xf86Msg(xf86Info.aiglxFrom, "AIGLX %s\n",
|
xf86Msg(xf86Info.aiglxFrom, "AIGLX %s\n",
|
||||||
xf86Info.aiglx ? "enabled" : "disabled");
|
xf86Info.aiglx ? "enabled" : "disabled");
|
||||||
if (xf86Info.aiglx) {
|
if (xf86Info.aiglx) {
|
||||||
|
|
|
@ -172,9 +172,6 @@ extern void XFree86VidModeExtensionInit(void);
|
||||||
extern void XFree86DGAExtensionInit(void);
|
extern void XFree86DGAExtensionInit(void);
|
||||||
#endif
|
#endif
|
||||||
#ifdef GLXEXT
|
#ifdef GLXEXT
|
||||||
typedef struct __GLXprovider __GLXprovider;
|
|
||||||
extern __GLXprovider __glXDRISWRastProvider;
|
|
||||||
extern void GlxPushProvider(__GLXprovider *impl);
|
|
||||||
extern void GlxExtensionInit(void);
|
extern void GlxExtensionInit(void);
|
||||||
#endif
|
#endif
|
||||||
#ifdef XF86DRI
|
#ifdef XF86DRI
|
||||||
|
@ -449,8 +446,6 @@ InitExtensions(int argc, char *argv[])
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef GLXEXT
|
#ifdef GLXEXT
|
||||||
if (serverGeneration == 1)
|
|
||||||
GlxPushProvider(&__glXDRISWRastProvider);
|
|
||||||
if (!noGlxExtension)
|
if (!noGlxExtension)
|
||||||
GlxExtensionInit();
|
GlxExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue
Block a user