diff options
| author | Adam Jackson <ajax@redhat.com> | 2012-11-09 16:33:54 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2013-09-11 14:37:31 -0400 |
| commit | 2b181ad0952851f47f23dcb1a36471685313c13e (patch) | |
| tree | e3e201b955e02b8a0a277b724f654f143f61c7ac | |
| parent | b9c489cf13e1ad35b7d9bea9de8d85e929374d17 (diff) | |
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>
| -rw-r--r-- | glx/glxcmds.c | 4 | ||||
| -rw-r--r-- | glx/glxscreens.c | 3 | ||||
| -rw-r--r-- | glx/glxscreens.h | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/glx/glxcmds.c b/glx/glxcmds.c index 5b7a628cc..cbbdae8e8 100644 --- a/glx/glxcmds.c +++ b/glx/glxcmds.c @@ -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 diff --git a/glx/glxscreens.c b/glx/glxscreens.c index 61d590cc8..3724d1924 100644 --- a/glx/glxscreens.c +++ b/glx/glxscreens.c @@ -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); diff --git a/glx/glxscreens.h b/glx/glxscreens.h index 0a7b6043e..7a0a5155d 100644 --- a/glx/glxscreens.h +++ b/glx/glxscreens.h @@ -145,7 +145,6 @@ struct __GLXscreen { char *GLextensions; - char *GLXvendor; char *GLXextensions; /** |