frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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:
Adam Jackson 2012-11-09 16:33:54 -05:00
parent b9c489cf13
commit 2b181ad095
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glx/glxcmds.c
View File

@ -50,6 +50,8 @@
#include "indirect_table.h" #include "indirect_table.h"
#include "indirect_util.h" #include "indirect_util.h"
static char GLXServerVendorName[] = "SGI";
_X_HIDDEN int _X_HIDDEN int
validGlxScreen(ClientPtr client, int screen, __GLXscreen ** pGlxScreen, validGlxScreen(ClientPtr client, int screen, __GLXscreen ** pGlxScreen,
int *err) int *err)
@ -2384,7 +2386,7 @@ __glXDisp_QueryServerString(__GLXclientState * cl, GLbyte * pc)
switch (req->name) { switch (req->name) {
case GLX_VENDOR: case GLX_VENDOR:
ptr = pGlxScreen->GLXvendor; ptr = GLXServerVendorName;
break; break;
case GLX_VERSION: case GLX_VERSION:
/* Return to the server version rather than the screen version /* Return to the server version rather than the screen version

3
glx/glxscreens.c
View File

@ -160,7 +160,6 @@ static const char GLServerExtensions[] =
** We have made the simplifying assuption that the same extensions are ** We have made the simplifying assuption that the same extensions are
** supported across all screens in a multi-screen system. ** supported across all screens in a multi-screen system.
*/ */
static char GLXServerVendorName[] = "SGI";
unsigned glxMajorVersion = SERVER_GLX_MAJOR_VERSION; unsigned glxMajorVersion = SERVER_GLX_MAJOR_VERSION;
unsigned glxMinorVersion = SERVER_GLX_MINOR_VERSION; unsigned glxMinorVersion = SERVER_GLX_MINOR_VERSION;
static char GLXServerExtensions[] = static char GLXServerExtensions[] =
@ -330,7 +329,6 @@ __glXScreenInit(__GLXscreen * pGlxScreen, ScreenPtr pScreen)
pGlxScreen->pScreen = pScreen; pGlxScreen->pScreen = pScreen;
pGlxScreen->GLextensions = strdup(GLServerExtensions); pGlxScreen->GLextensions = strdup(GLServerExtensions);
pGlxScreen->GLXvendor = strdup(GLXServerVendorName);
pGlxScreen->GLXextensions = strdup(GLXServerExtensions); pGlxScreen->GLXextensions = strdup(GLXServerExtensions);
/* All GLX providers must support all of the functionality required for at /* All GLX providers must support all of the functionality required for at
@ -420,7 +418,6 @@ __glXScreenInit(__GLXscreen * pGlxScreen, ScreenPtr pScreen)
void void
__glXScreenDestroy(__GLXscreen * screen) __glXScreenDestroy(__GLXscreen * screen)
{ {
free(screen->GLXvendor);
free(screen->GLXextensions); free(screen->GLXextensions);
free(screen->GLextensions); free(screen->GLextensions);
free(screen->visuals); free(screen->visuals);

1
glx/glxscreens.h
View File

@ -145,7 +145,6 @@ struct __GLXscreen {
char *GLextensions; char *GLextensions;
char *GLXvendor;
char *GLXextensions; char *GLXextensions;
/** /**