diff options
Diffstat (limited to 'src/mesa/drivers/x11/glxapi.c')
| -rw-r--r-- | src/mesa/drivers/x11/glxapi.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c index 93e5808ddbc..45c5e0f1c99 100644 --- a/src/mesa/drivers/x11/glxapi.c +++ b/src/mesa/drivers/x11/glxapi.c @@ -1,4 +1,4 @@ -/* $Id: glxapi.c,v 1.16 2000/04/10 21:13:19 brianp Exp $ */ +/* $Id: glxapi.c,v 1.17 2000/06/08 22:50:28 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -316,7 +316,7 @@ void glXWaitX(void) -#ifdef _GLXAPI_VERSION_1_1 +#ifdef GLX_VERSION_1_1 const char *glXGetClientString(Display *dpy, int name) { @@ -348,7 +348,7 @@ const char *glXQueryServerString(Display *dpy, int screen, int name) -#ifdef _GLXAPI_VERSION_1_2 +#ifdef GLX_VERSION_1_2 Display *glXGetCurrentDisplay(void) { return CurrentDisplay; @@ -357,7 +357,7 @@ Display *glXGetCurrentDisplay(void) -#ifdef _GLXAPI_VERSION_1_3 +#ifdef GLX_VERSION_1_3 GLXFBConfig *glXChooseFBConfig(Display *dpy, int screen, const int *attribList, int *nitems) { @@ -516,10 +516,10 @@ void glXSelectEvent(Display *dpy, GLXDrawable drawable, unsigned long mask) (t->SelectEvent)(dpy, drawable, mask); } -#endif /* _GLXAPI_VERSION_1_3 */ +#endif /* GLX_VERSION_1_3 */ -#ifdef _GLXAPI_EXT_import_context +#ifdef GLX_EXT_import_context void glXFreeContextEXT(Display *dpy, GLXContext context) { @@ -565,7 +565,7 @@ int glXQueryContextInfoEXT(Display *dpy, GLXContext context, int attribute,int * #endif -#ifdef _GLXAPI_SGI_video_sync +#ifdef GLX_SGI_video_sync int glXGetVideoSyncSGI(unsigned int *count) { @@ -587,7 +587,7 @@ int glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int *count) #endif -#ifdef _GLXAPI_MESA_copy_sub_buffer +#ifdef GLX_MESA_copy_sub_buffer void glXCopySubBufferMESA(Display *dpy, GLXDrawable drawable, int x, int y, int width, int height) { @@ -600,7 +600,7 @@ void glXCopySubBufferMESA(Display *dpy, GLXDrawable drawable, int x, int y, int #endif -#ifdef _GLXAPI_MESA_release_buffers +#ifdef GLX_MESA_release_buffers Bool glXReleaseBuffersMESA(Display *dpy, Window w) { @@ -613,7 +613,7 @@ Bool glXReleaseBuffersMESA(Display *dpy, Window w) #endif -#ifdef _GLXAPI_MESA_pixmap_colormap +#ifdef GLX_MESA_pixmap_colormap GLXPixmap glXCreateGLXPixmapMESA(Display *dpy, XVisualInfo *visinfo, Pixmap pixmap, Colormap cmap) { @@ -626,7 +626,7 @@ GLXPixmap glXCreateGLXPixmapMESA(Display *dpy, XVisualInfo *visinfo, Pixmap pixm #endif -#ifdef _GLXAPI_MESA_set_3dfx_mode +#ifdef GLX_MESA_set_3dfx_mode GLboolean glXSet3DfxModeMESA(GLint mode) { @@ -659,22 +659,22 @@ const char ** _glxapi_get_extensions(void) { static const char *extensions[] = { -#ifdef _GLXAPI_EXT_import_context +#ifdef GLX_EXT_import_context "GLX_EXT_import_context", #endif -#ifdef _GLXAPI_SGI_video_sync +#ifdef GLX_SGI_video_sync "GLX_SGI_video_sync", #endif -#ifdef _GLXAPI_MESA_copy_sub_buffer +#ifdef GLX_MESA_copy_sub_buffer "GLX_MESA_copy_sub_buffer", #endif -#ifdef _GLXAPI_MESA_release_buffers +#ifdef GLX_MESA_release_buffers "GLX_MESA_release_buffers", #endif -#ifdef _GLXAPI_MESA_pixmap_colormap +#ifdef GLX_MESA_pixmap_colormap "GLX_MESA_pixmap_colormap", #endif -#ifdef _GLXAPI_MESA_set_3dfx_mode +#ifdef GLX_MESA_set_3dfx_mode "GLX_MESA_set_3dfx_mode", #endif NULL @@ -740,17 +740,17 @@ static struct name_address_pair GLX_functions[] = { { "glXWaitGL", (GLvoid *) glXWaitGL }, { "glXWaitX", (GLvoid *) glXWaitX }, -#ifdef _GLXAPI_VERSION_1_1 +#ifdef GLX_VERSION_1_1 { "glXGetClientString", (GLvoid *) glXGetClientString }, { "glXQueryExtensionsString", (GLvoid *) glXQueryExtensionsString }, { "glXQueryServerString", (GLvoid *) glXQueryServerString }, #endif -#ifdef _GLXAPI_VERSION_1_2 +#ifdef GLX_VERSION_1_2 { "glXGetCurrentDisplay", (GLvoid *) glXGetCurrentDisplay }, #endif -#ifdef _GLXAPI_VERSION_1_3 +#ifdef GLX_VERSION_1_3 { "glXChooseFBConfig", (GLvoid *) glXChooseFBConfig }, { "glXCreateNewContext", (GLvoid *) glXCreateNewContext }, { "glXCreatePbuffer", (GLvoid *) glXCreatePbuffer }, @@ -769,24 +769,24 @@ static struct name_address_pair GLX_functions[] = { { "glXSelectEvent", (GLvoid *) glXSelectEvent }, #endif -#ifdef _GLXAPI_SGI_video_sync +#ifdef GLX_SGI_video_sync { "glXGetVideoSyncSGI", (GLvoid *) glXGetVideoSyncSGI }, { "glXWaitVideoSyncSGI", (GLvoid *) glXWaitVideoSyncSGI }, #endif -#ifdef _GLXAPI_MESA_copy_sub_buffer +#ifdef GLX_MESA_copy_sub_buffer { "glXCopySubBufferMESA", (GLvoid *) glXCopySubBufferMESA }, #endif -#ifdef _GLXAPI_MESA_release_buffers +#ifdef GLX_MESA_release_buffers { "glXReleaseBuffersMESA", (GLvoid *) glXReleaseBuffersMESA }, #endif -#ifdef _GLXAPI_MESA_pixmap_colormap +#ifdef GLX_MESA_pixmap_colormap { "glXCreateGLXPixmapMESA", (GLvoid *) glXCreateGLXPixmapMESA }, #endif -#ifdef _GLXAPI_MESA_set_3dfx_mode +#ifdef GLX_MESA_set_3dfx_mode { "glXSet3DfxModeMESA", (GLvoid *) glXSet3DfxModeMESA }, #endif |