summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/osmesa/osmesa.c31
1 files changed, 15 insertions, 16 deletions
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index b25f7dca557..b95e446590e 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -1276,35 +1276,34 @@ OSMesaGetColorBuffer( OSMesaContext c, GLint *width,
}
-typedef void (*generic_function)();
-
struct name_function
{
const char *Name;
- generic_function Function;
+ OSMESAproc Function;
};
static struct name_function functions[] = {
- { "OSMesaCreateContext", (generic_function) OSMesaCreateContext },
- { "OSMesaCreateContextExt", (generic_function) OSMesaCreateContextExt },
- { "OSMesaDestroyContext", (generic_function) OSMesaDestroyContext },
- { "OSMesaMakeCurrent", (generic_function) OSMesaMakeCurrent },
- { "OSMesaGetCurrentContext", (generic_function) OSMesaGetCurrentContext },
- { "OSMesaPixelsStore", (generic_function) OSMesaPixelStore },
- { "OSMesaGetIntegerv", (generic_function) OSMesaGetIntegerv },
- { "OSMesaGetDepthBuffer", (generic_function) OSMesaGetDepthBuffer },
- { "OSMesaGetColorBuffer", (generic_function) OSMesaGetColorBuffer },
- { "OSMesaGetProcAddress", (generic_function) OSMesaGetProcAddress },
+ { "OSMesaCreateContext", (OSMESAproc) OSMesaCreateContext },
+ { "OSMesaCreateContextExt", (OSMESAproc) OSMesaCreateContextExt },
+ { "OSMesaDestroyContext", (OSMESAproc) OSMesaDestroyContext },
+ { "OSMesaMakeCurrent", (OSMESAproc) OSMesaMakeCurrent },
+ { "OSMesaGetCurrentContext", (OSMESAproc) OSMesaGetCurrentContext },
+ { "OSMesaPixelsStore", (OSMESAproc) OSMesaPixelStore },
+ { "OSMesaGetIntegerv", (OSMESAproc) OSMesaGetIntegerv },
+ { "OSMesaGetDepthBuffer", (OSMESAproc) OSMesaGetDepthBuffer },
+ { "OSMesaGetColorBuffer", (OSMESAproc) OSMesaGetColorBuffer },
+ { "OSMesaGetProcAddress", (OSMESAproc) OSMesaGetProcAddress },
{ NULL, NULL }
};
-GLAPI void * GLAPIENTRY
+
+GLAPI OSMESAproc GLAPIENTRY
OSMesaGetProcAddress( const char *funcName )
{
int i;
for (i = 0; functions[i].Name; i++) {
if (_mesa_strcmp(functions[i].Name, funcName) == 0)
- return (void *) functions[i].Function;
+ return functions[i].Function;
}
- return (void *) _glapi_get_proc_address(funcName);
+ return _glapi_get_proc_address(funcName);
}