diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2010-07-22 21:24:14 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2010-07-22 22:16:32 -0400 |
| commit | 31819830b66a49f1b62e09090cc65aefc657aeb8 (patch) | |
| tree | 4f818e5a2151cb673b73f901454b1d126227eb64 /src/glx/glxclient.h | |
| parent | ab434f6b7641a64d30725a9ac24929240362d466 (diff) | |
glx: Allocate the __GLXcontext in the DRI drivers
Diffstat (limited to 'src/glx/glxclient.h')
| -rw-r--r-- | src/glx/glxclient.h | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h index 4f833057ff..dcb75d4959 100644 --- a/src/glx/glxclient.h +++ b/src/glx/glxclient.h @@ -126,10 +126,9 @@ struct __GLXDRIscreenRec { void (*destroyScreen)(__GLXscreenConfigs *psc); - __GLXDRIcontext *(*createContext)(__GLXscreenConfigs *psc, - const __GLcontextModes *mode, - GLXContext gc, - GLXContext shareList, int renderType); + __GLXcontext *(*createContext)(__GLXscreenConfigs *psc, + const __GLcontextModes *mode, + GLXContext shareList, int renderType); __GLXDRIdrawable *(*createDrawable)(__GLXscreenConfigs *psc, XID drawable, @@ -155,12 +154,10 @@ struct __GLXDRIscreenRec { struct __GLXDRIcontextRec { - void (*destroyContext) (__GLXDRIcontext * context, - __GLXscreenConfigs * psc, Display * dpy); - Bool(*bindContext) (__GLXDRIcontext * context, __GLXDRIdrawable * pdraw, - __GLXDRIdrawable * pread); - - void (*unbindContext) (__GLXDRIcontext * context); + void (*destroyContext) (__GLXcontext *context); + Bool(*bindContext) (__GLXcontext *context, __GLXDRIdrawable *pdraw, + __GLXDRIdrawable *pread); + void (*unbindContext) (__GLXcontext *context); }; struct __GLXDRIdrawableRec @@ -389,11 +386,6 @@ struct __GLXcontextRec /*@} */ /** - * Record the dpy this context was created on for later freeing - */ - Display *createDpy; - - /** * Maximum small render command size. This is the smaller of 64k and * the size of the above buffer. */ @@ -463,6 +455,10 @@ struct __GLXcontextRec const struct glx_context_vtable *vtable; }; +extern Bool +glx_context_init(__GLXcontext *gc, + __GLXscreenConfigs *psc, const __GLcontextModes *fbconfig); + #define __glXSetError(gc,code) \ if (!(gc)->error) { \ (gc)->error = code; \ @@ -515,11 +511,6 @@ struct __GLXscreenConfigsRec */ char *effectiveGLXexts; - /** - * Context vtable to use for direct contexts on this screen - */ - const struct glx_context_vtable *direct_context_vtable; - __GLXdisplayPrivate *display; #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) |