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

GLX: Insert swrast provider from GlxExtensionInit

Browse Source 
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:
Daniel Stone 2012-07-10 02:02:55 +01:00 committed by Keith Packard
parent 13552a5c47
commit b86aa74caf
5 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glx/glxext.c
View File

@ -322,9 +322,15 @@ GlxExtensionInit(void)
ExtensionEntry *extEntry;
ScreenPtr pScreen;
int i;
__GLXprovider *p;
__GLXprovider *p, **stack;
Bool glx_provided = False;
if (serverGeneration == 1) {
for (stack = &__glXProviderStack; *stack; stack = &(*stack)->next)
;
*stack = &__glXDRISWRastProvider;
}
__glXContextRes = CreateNewResourceType((DeleteType) ContextGone,
"GLXContext");
__glXDrawableRes = CreateNewResourceType((DeleteType) DrawableGone,

1
glx/glxserver.h
View File

@ -99,6 +99,7 @@ struct __GLXprovider {
const char *name;
__GLXprovider *next;
};
__GLXprovider __glXDRISWRastProvider;
void GlxPushProvider(__GLXprovider * provider);

10
hw/dmx/glxProxy/glxext.c
View File

@ -45,16 +45,6 @@
#include "micmap.h"
#include "glxswap.h"
/*
** Stubs to satisfy miinitext.c references.
*/
typedef int __GLXprovider;
__GLXprovider __glXDRISWRastProvider;
void
GlxPushProvider(__GLXprovider * provider)
{
}
/*
** Forward declarations.
*/

5
hw/xfree86/dixmods/glxmodule.c
View File

@ -84,11 +84,6 @@ glxSetup(pointer module, pointer opts, int *errmaj, int *errmin)
setupDone = TRUE;
provider = LoaderSymbol("__glXDRISWRastProvider");
if (provider == NULL)
return NULL;
GlxPushProvider(provider);
xf86Msg(xf86Info.aiglxFrom, "AIGLX %s\n",
xf86Info.aiglx ? "enabled" : "disabled");
if (xf86Info.aiglx) {

5
mi/miinitext.c
View File

@ -172,9 +172,6 @@ extern void XFree86VidModeExtensionInit(void);
extern void XFree86DGAExtensionInit(void);
#endif
#ifdef GLXEXT
typedef struct __GLXprovider __GLXprovider;
extern __GLXprovider __glXDRISWRastProvider;
extern void GlxPushProvider(__GLXprovider *impl);
extern void GlxExtensionInit(void);
#endif
#ifdef XF86DRI
@ -449,8 +446,6 @@ InitExtensions(int argc, char *argv[])
#endif
#ifdef GLXEXT
if (serverGeneration == 1)
GlxPushProvider(&__glXDRISWRastProvider);
if (!noGlxExtension)
GlxExtensionInit();
#endif