diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2009-10-01 10:39:19 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-10-01 23:13:40 -0700 |
| commit | 4c6bfa2c09ae2b0cffdf9211a6dfbcaefe0366b5 (patch) | |
| tree | f6e73408541d675d96ed8fd4a192d5fd4ef73af9 /glx/glxscreens.c | |
| parent | 45f447dafded5adfe11b7df3325c2d8f6ae0639b (diff) | |
GLX: More clearly document the GLX protocol version handling
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'glx/glxscreens.c')
| -rw-r--r-- | glx/glxscreens.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/glx/glxscreens.c b/glx/glxscreens.c index 6ce24b2b4..674e2c681 100644 --- a/glx/glxscreens.c +++ b/glx/glxscreens.c @@ -42,6 +42,7 @@ #include "glxserver.h" #include "glxutil.h" #include "glxext.h" +#include "protocol-versions.h" static int glxScreenPrivateKeyIndex; static DevPrivateKey glxScreenPrivateKey = &glxScreenPrivateKeyIndex; @@ -162,8 +163,8 @@ static const char GLServerExtensions[] = ** supported across all screens in a multi-screen system. */ static char GLXServerVendorName[] = "SGI"; -unsigned glxMajorVersion = 1; -unsigned glxMinorVersion = 4; +unsigned glxMajorVersion = SERVER_GLX_MAJOR_VERSION; +unsigned glxMinorVersion = SERVER_GLX_MINOR_VERSION; static char GLXServerExtensions[] = "GLX_ARB_multisample " "GLX_EXT_visual_info " @@ -380,6 +381,13 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen) pGlxScreen->GLextensions = xstrdup(GLServerExtensions); pGlxScreen->GLXvendor = xstrdup(GLXServerVendorName); pGlxScreen->GLXextensions = xstrdup(GLXServerExtensions); + + /* All GLX providers must support all of the functionality required for at + * least GLX 1.2. If the provider supports a higher version, the GLXminor + * version can be changed in the provider's screen-probe routine. For + * most providers, the screen-probe routine is the caller of this + * function. + */ pGlxScreen->GLXmajor = 1; pGlxScreen->GLXminor = 2; |