glx: Pull GLX vendor string out of __GLXscreen
Given how we're currently implementing GLX this can't meaningfully vary per-screen. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
parent
b9c489cf13
commit
2b181ad095
|
@ -50,6 +50,8 @@
|
|||
#include "indirect_table.h"
|
||||
#include "indirect_util.h"
|
||||
|
||||
static char GLXServerVendorName[] = "SGI";
|
||||
|
||||
_X_HIDDEN int
|
||||
validGlxScreen(ClientPtr client, int screen, __GLXscreen ** pGlxScreen,
|
||||
int *err)
|
||||
|
@ -2384,7 +2386,7 @@ __glXDisp_QueryServerString(__GLXclientState * cl, GLbyte * pc)
|
|||
|
||||
switch (req->name) {
|
||||
case GLX_VENDOR:
|
||||
ptr = pGlxScreen->GLXvendor;
|
||||
ptr = GLXServerVendorName;
|
||||
break;
|
||||
case GLX_VERSION:
|
||||
/* Return to the server version rather than the screen version
|
||||
|
|
|
@ -160,7 +160,6 @@ static const char GLServerExtensions[] =
|
|||
** We have made the simplifying assuption that the same extensions are
|
||||
** supported across all screens in a multi-screen system.
|
||||
*/
|
||||
static char GLXServerVendorName[] = "SGI";
|
||||
unsigned glxMajorVersion = SERVER_GLX_MAJOR_VERSION;
|
||||
unsigned glxMinorVersion = SERVER_GLX_MINOR_VERSION;
|
||||
static char GLXServerExtensions[] =
|
||||
|
@ -330,7 +329,6 @@ __glXScreenInit(__GLXscreen * pGlxScreen, ScreenPtr pScreen)
|
|||
|
||||
pGlxScreen->pScreen = pScreen;
|
||||
pGlxScreen->GLextensions = strdup(GLServerExtensions);
|
||||
pGlxScreen->GLXvendor = strdup(GLXServerVendorName);
|
||||
pGlxScreen->GLXextensions = strdup(GLXServerExtensions);
|
||||
|
||||
/* All GLX providers must support all of the functionality required for at
|
||||
|
@ -420,7 +418,6 @@ __glXScreenInit(__GLXscreen * pGlxScreen, ScreenPtr pScreen)
|
|||
void
|
||||
__glXScreenDestroy(__GLXscreen * screen)
|
||||
{
|
||||
free(screen->GLXvendor);
|
||||
free(screen->GLXextensions);
|
||||
free(screen->GLextensions);
|
||||
free(screen->visuals);
|
||||
|
|
|
@ -145,7 +145,6 @@ struct __GLXscreen {
|
|||
|
||||
char *GLextensions;
|
||||
|
||||
char *GLXvendor;
|
||||
char *GLXextensions;
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue
Block a user