From 487f7a73cbb8534ab163ef8a3549caa71684b607 Mon Sep 17 00:00:00 2001 From: George Sapountzis Date: Thu, 5 Apr 2007 19:01:51 +0300 Subject: Remove SI imports/exports remnants. --- include/GL/gl_mangle.h | 4 -- include/GL/internal/glcore.h | 83 ---------------------------------- src/glx/mini/driver.h | 2 - src/mesa/drivers/dri/common/dri_util.h | 2 - src/mesa/main/imports.c | 8 ---- src/mesa/main/mtypes.h | 2 +- 6 files changed, 1 insertion(+), 100 deletions(-) diff --git a/include/GL/gl_mangle.h b/include/GL/gl_mangle.h index 7416d5372c..e9c1c8a658 100644 --- a/include/GL/gl_mangle.h +++ b/include/GL/gl_mangle.h @@ -27,10 +27,6 @@ #define MANGLE(x) mgl##x #endif /*MANGLE*/ -/* Internal symbols which may collide with other OpenGL implementations. */ -#define __glCoreCreateContext __mglCoreCreateContext -#define __glCoreNopDispatch __mglCoreNopDispatch - /*REGENERATE_TO_END-----------ALL LINES BELOW HERE GET REPLACED ON REGENERATION */ #define glAccum MANGLE(Accum) diff --git a/include/GL/internal/glcore.h b/include/GL/internal/glcore.h index 3cb792f393..fc0aaf3d5e 100644 --- a/include/GL/internal/glcore.h +++ b/include/GL/internal/glcore.h @@ -38,17 +38,11 @@ #include -#ifdef CAPI -#undef CAPI -#endif -#define CAPI - #define GL_CORE_SGI 1 #define GL_CORE_MESA 2 #define GL_CORE_APPLE 4 typedef struct __GLcontextRec __GLcontext; -typedef struct __GLinterfaceRec __GLinterface; /* ** This file defines the interface between the GL core and the surrounding @@ -186,81 +180,4 @@ typedef struct __GLcontextModesRec { #define GLX_TEXTURE_2D_BIT_EXT 0x00000002 #define GLX_TEXTURE_RECTANGLE_BIT_EXT 0x00000004 - -/************************************************************************/ - -/* -** Procedures which are imported by the GL from the surrounding -** "operating system". Math functions are not considered part of the -** "operating system". -*/ -typedef struct __GLimportsRec { - /* Memory management */ - void * (*malloc)(__GLcontext *gc, size_t size); - void *(*calloc)(__GLcontext *gc, size_t numElem, size_t elemSize); - void *(*realloc)(__GLcontext *gc, void *oldAddr, size_t newSize); - void (*free)(__GLcontext *gc, void *addr); - - /* Error handling */ - void (*warning)(__GLcontext *gc, char *fmt); - void (*fatal)(__GLcontext *gc, char *fmt); - - /* other system calls */ - char *(CAPI *getenv)(__GLcontext *gc, const char *var); - int (CAPI *atoi)(__GLcontext *gc, const char *str); - int (CAPI *sprintf)(__GLcontext *gc, char *str, const char *fmt, ...); - void *(CAPI *fopen)(__GLcontext *gc, const char *path, const char *mode); - int (CAPI *fclose)(__GLcontext *gc, void *stream); - int (CAPI *fprintf)(__GLcontext *gc, void *stream, const char *fmt, ...); - - /* Drawing surface management */ - void *(*getDrawablePrivate)(__GLcontext *gc); - void *(*getReadablePrivate)(__GLcontext *gc); - - /* Operating system dependent data goes here */ - void *other; -} __GLimports; - -/************************************************************************/ - -/* -** Procedures which are exported by the GL to the surrounding "operating -** system" so that it can manage multiple GL context's. -*/ -typedef struct __GLexportsRec { - /* Context management (return GL_FALSE on failure) */ - GLboolean (*destroyContext)(__GLcontext *gc); - GLboolean (*loseCurrent)(__GLcontext *gc); - /* oldglPriv isn't used anymore, kept for backwards compatibility */ - GLboolean (*makeCurrent)(__GLcontext *gc); - GLboolean (*shareContext)(__GLcontext *gc, __GLcontext *gcShare); - GLboolean (*copyContext)(__GLcontext *dst, const __GLcontext *src, GLuint mask); - GLboolean (*forceCurrent)(__GLcontext *gc); - - /* Drawing surface notification callbacks */ - GLboolean (*notifyResize)(__GLcontext *gc); - void (*notifyDestroy)(__GLcontext *gc); - void (*notifySwapBuffers)(__GLcontext *gc); - - /* Dispatch table override control for external agents like libGLS */ - struct __GLdispatchStateRec* (*dispatchExec)(__GLcontext *gc); - void (*beginDispatchOverride)(__GLcontext *gc); - void (*endDispatchOverride)(__GLcontext *gc); -} __GLexports; - -/************************************************************************/ - -/* -** This must be the first member of a __GLcontext structure. This is the -** only part of a context that is exposed to the outside world; everything -** else is opaque. -*/ -struct __GLinterfaceRec { - __GLimports imports; - __GLexports exports; -}; - -extern __GLcontext *__glCoreCreateContext(__GLimports *, __GLcontextModes *); -extern void __glCoreNopDispatch(void); - #endif /* __gl_core_h_ */ diff --git a/src/glx/mini/driver.h b/src/glx/mini/driver.h index 9e8bf6fa7c..39c0f9b5fa 100644 --- a/src/glx/mini/driver.h +++ b/src/glx/mini/driver.h @@ -47,8 +47,6 @@ #ifndef _driver_H_ #define _driver_H_ -#define CAPI /* XXX this should be globally defined somewhere */ - #include "GL/gl.h" #include "GL/internal/glcore.h" diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h index e43e653250..8639535abb 100644 --- a/src/mesa/drivers/dri/common/dri_util.h +++ b/src/mesa/drivers/dri/common/dri_util.h @@ -49,8 +49,6 @@ #ifndef _DRI_UTIL_H_ #define _DRI_UTIL_H_ -#define CAPI /* XXX this should be globally defined somewhere */ - #include #include "drm.h" #include "drm_sarea.h" diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c index 2a13250238..9de7a89c99 100644 --- a/src/mesa/main/imports.c +++ b/src/mesa/main/imports.c @@ -12,14 +12,6 @@ * * Eventually, I want to move roll the glheader.h file into this. * - * The OpenGL SI's __GLimports structure allows per-context specification of - * replacements for the standard C lib functions. In practice that's probably - * never needed; compile-time replacements are far more likely. - * - * The _mesa_*() functions defined here don't in general take a context - * parameter. I guess we can change that someday, if need be. - * So for now, the __GLimports stuff really isn't used. - * * \todo Functions still needed: * - scanf * - qsort diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 58efa0b4f5..89cdc79089 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -36,7 +36,7 @@ #include "glheader.h" -#include /* GLimports/GLexports/GLcontextModes */ +#include /* __GLcontextModes (GLvisual) */ #include "config.h" /* Hardwired parameters */ #include "glapitable.h" #include "glthread.h" -- cgit v1.2.3