diff options
author | Kristian Høgsberg <krh@hinata.boston.redhat.com> | 2007-05-11 16:11:23 -0400 |
---|---|---|
committer | Kristian Høgsberg <krh@redhat.com> | 2007-10-10 18:00:13 -0400 |
commit | aac367f48afc62176faf67aa6f329fbeae2004b4 (patch) | |
tree | 9afce18cf316c930ca764e27caeadb2b0fb2f0be /src/glx/x11/glxextensions.h | |
parent | fa72013adaab4d0755e852805e2e44d1a879a204 (diff) |
Remove screenConfigs from __DRIscreen.
The screenConfigs field of __DRIscreen points back to the containing
__GLXscreenConfigs struct. This is a serious abstraction violation; it
assumes that the loader is libGL and that there *is* a __GLXscreenConfigs
type in the loader.
Using the containerOf macro, we can get from the __DRIscreen pointer to
the containing __GLXscreenConfigs struct, at a place in the stack
where the above is a valid assumption. Besides, the __DRI* structs shouldn't
hold state other than the private pointer.
Diffstat (limited to 'src/glx/x11/glxextensions.h')
-rw-r--r-- | src/glx/x11/glxextensions.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/glx/x11/glxextensions.h b/src/glx/x11/glxextensions.h index a4241b6b7f9..62bbf116e93 100644 --- a/src/glx/x11/glxextensions.h +++ b/src/glx/x11/glxextensions.h @@ -234,7 +234,14 @@ extern GLboolean __glXExtensionBitIsEnabled( struct __GLXscreenConfigsRec *psc, extern const char * __glXGetClientExtensions( void ); extern void __glXCalculateUsableExtensions( struct __GLXscreenConfigsRec *psc, GLboolean display_is_direct_capable, int server_minor_version ); -extern void __glXScrEnableExtension( struct __GLXscreenConfigsRec *psc, const char * name ); + +#ifdef GLX_DIRECT_RENDERING + +struct __DRIscreenRec; +extern void __glXScrEnableExtension( struct __DRIscreenRec *driScreen, const char * name ); + +#endif + extern void __glXCalculateUsableGLExtensions( struct __GLXcontextRec * gc, const char * server_string, int major_version, int minor_version ); extern void __glXGetGLVersion( int * major_version, int * minor_version ); |