diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2009-09-29 16:43:43 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-09-29 16:46:39 -0700 |
| commit | ad5c0d9efa47476ed5cf75c82265c73919e468b4 (patch) | |
| tree | 25ac8ca8444b1c9690d2e499cac366df6c5cd32a /glx/glxscreens.c | |
| parent | f11a356bcef1bc0a6440325019d5967b745a42dd (diff) | |
GLX: Enable GLX 1.4 on DRI2
Return the minimum GLX version supported by all screens. Assume that
DRI2 screens have all the required features for GLX 1.4. Assume that
everyone else can only support GLX 1.2.
Reviewed-by: Kristian Høgsberg <krh@redhat.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'glx/glxscreens.c')
| -rw-r--r-- | glx/glxscreens.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/glx/glxscreens.c b/glx/glxscreens.c index 81faddd04..ee3788d4b 100644 --- a/glx/glxscreens.c +++ b/glx/glxscreens.c @@ -162,7 +162,8 @@ static const char GLServerExtensions[] = ** supported across all screens in a multi-screen system. */ static char GLXServerVendorName[] = "SGI"; -static char GLXServerVersion[] = "1.2"; +unsigned glxMajorVersion = 1; +unsigned glxMinorVersion = 4; static char GLXServerExtensions[] = "GLX_ARB_multisample " "GLX_EXT_visual_info " @@ -430,8 +431,9 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen) pGlxScreen->pScreen = pScreen; pGlxScreen->GLextensions = xstrdup(GLServerExtensions); pGlxScreen->GLXvendor = xstrdup(GLXServerVendorName); - pGlxScreen->GLXversion = xstrdup(GLXServerVersion); pGlxScreen->GLXextensions = xstrdup(GLXServerExtensions); + pGlxScreen->GLXmajor = 1; + pGlxScreen->GLXminor = 2; pGlxScreen->CloseScreen = pScreen->CloseScreen; pScreen->CloseScreen = glxCloseScreen; @@ -506,7 +508,6 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen) void __glXScreenDestroy(__GLXscreen *screen) { xfree(screen->GLXvendor); - xfree(screen->GLXversion); xfree(screen->GLXextensions); xfree(screen->GLextensions); } |