diff options
| author | Jeremy Huddleston <[email protected]> | 2010-04-01 11:01:31 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <[email protected]> | 2010-04-27 11:26:50 -0700 |
| commit | ad503c41557606d15b0420c824369456f6d20a8f (patch) | |
| tree | 7155272412f9b20b559fa172a1718fd8dfe6e98a /src/glx/glxclient.h | |
| parent | f1381880a8e0e0cdd96c4c725ff35a28b250b09d (diff) | |
apple: Initial import of libGL for OSX from AppleSGLX svn repository.
Signed-off-by: Jeremy Huddleston <[email protected]>
Diffstat (limited to 'src/glx/glxclient.h')
| -rw-r--r-- | src/glx/glxclient.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h index 8e5dc785dd9..3519c20a7f3 100644 --- a/src/glx/glxclient.h +++ b/src/glx/glxclient.h @@ -54,7 +54,9 @@ #include "GL/glxint.h" #include "GL/glxproto.h" #include "GL/internal/glcore.h" +#ifndef GLX_USE_APPLEGL #include "glapi/glapitable.h" +#endif #include "glxhash.h" #if defined( PTHREADS ) # include <pthread.h> @@ -197,6 +199,10 @@ extern const char *glXGetDriverConfig(const char *driverName); #endif +#ifdef GLX_USE_APPLEGL +extern void DRI_glXUseXFont( Font font, int first, int count, int listbase ); +#endif + /************************************************************************/ #define __GL_CLIENT_ATTRIB_STACK_DEPTH 16 @@ -449,6 +455,11 @@ struct __GLXcontextRec unsigned long thread_id; char gl_extension_bits[__GL_EXT_BYTES]; + +#ifdef GLX_USE_APPLEGL + void *apple; + Bool do_destroy; +#endif }; #define __glXSetError(gc,code) \ @@ -627,12 +638,14 @@ struct __GLXdisplayPrivateRec extern GLubyte *__glXFlushRenderBuffer(__GLXcontext *, GLubyte *); +#ifndef GLX_USE_APPLEGL extern void __glXSendLargeChunk(__GLXcontext * gc, GLint requestNumber, GLint totalRequests, const GLvoid * data, GLint dataLen); extern void __glXSendLargeCommand(__GLXcontext *, const GLvoid *, GLint, const GLvoid *, GLint); +#endif /* Initialize the GLX extension for dpy */ extern __GLXdisplayPrivate *__glXInitialize(Display *); |