diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2006-03-12 00:11:34 +0000 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2006-03-12 00:11:34 +0000 |
| commit | c3342c8000f6d2bfb61e2cf95e028d11b59698fa (patch) | |
| tree | 854fa59122eff885f4f5bcf2300bdf69b5bb2b8f /GL/glx/glxserver.h | |
| parent | b1b731c28630965d9e2defe62d1108270dc8264c (diff) | |
Merge accel_indirect branch to HEAD.
Diffstat (limited to 'GL/glx/glxserver.h')
| -rw-r--r-- | GL/glx/glxserver.h | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/GL/glx/glxserver.h b/GL/glx/glxserver.h index 2609b1674..2e273b970 100644 --- a/GL/glx/glxserver.h +++ b/GL/glx/glxserver.h @@ -53,7 +53,6 @@ #include <scrnintstr.h> #include "GL/glx_ansic.h" - /* ** The X header misc.h defines these math functions. */ @@ -66,7 +65,8 @@ #include <GL/glxint.h> /* For glxscreens.h */ -typedef struct __GLXdrawablePrivateRec __GLXdrawablePrivate; +typedef struct __GLXdrawable __GLXdrawable; +typedef struct __GLXcontext __GLXcontext; #include "glxscreens.h" #include "glxdrawable.h" @@ -91,15 +91,19 @@ typedef XID GLXContextID; typedef XID GLXPixmap; typedef XID GLXDrawable; -typedef struct __GLXcontextRec *GLXContext; typedef struct __GLXclientStateRec __GLXclientState; -extern __GLXscreenInfo *__glXActiveScreens; +extern __GLXscreen **__glXActiveScreens; extern GLint __glXNumActiveScreens; -extern __GLXscreenInfo *__glXgetActiveScreen(int num); +extern __GLXscreen *__glXgetActiveScreen(int num); /************************************************************************/ +void GlxSetVisualConfigs(int nconfigs, + __GLXvisualConfig *configs, void **privates); + +void __glXScreenInitVisuals(__GLXscreen *screen); + /* ** The last context used (from the server's persective) is cached. */ @@ -116,6 +120,20 @@ extern __GLXcontext *__glXForceCurrent(__GLXclientState*, GLXContextTag, int*); /************************************************************************/ +typedef struct __GLXprovider __GLXprovider; +struct __GLXprovider { + __GLXscreen *(*screenProbe)(ScreenPtr pScreen); + const char *name; + __GLXprovider *next; +}; + +void GlxPushProvider(__GLXprovider *provider); + +void __glXsetEnterLeaveServerFuncs(void (*enter)(void), + void (*leave)(void)); +void __glXenterServer(void); +void __glXleaveServer(void); + /* ** State kept per client. */ @@ -214,6 +232,8 @@ extern void __glXSwapQueryVersionReply(ClientPtr client, extern void __glXSwapQueryContextInfoEXTReply(ClientPtr client, xGLXQueryContextInfoEXTReply *reply, int *buf); +extern void __glXSwapGetDrawableAttributesReply(ClientPtr client, + xGLXGetDrawableAttributesReply *reply, CARD32 *buf); extern void glxSwapQueryExtensionsStringReply(ClientPtr client, xGLXQueryExtensionsStringReply *reply, char *buf); extern void glxSwapQueryServerStringReply(ClientPtr client, |