From aaeea91bd045f5693d822085adf5322b022bd092 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 10 Dec 1999 15:13:57 +0000 Subject: [PATCH] removed gl_get_proc_address() --- src/mesa/main/extensions.c | 185 +------------------------------------ src/mesa/main/extensions.h | 6 +- 2 files changed, 3 insertions(+), 188 deletions(-) diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 459cdb2c4a5..102bb51599a 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -1,4 +1,4 @@ -/* $Id: extensions.c,v 1.14 1999/11/12 23:38:42 brianp Exp $ */ +/* $Id: extensions.c,v 1.15 1999/12/10 15:13:57 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -219,186 +219,3 @@ const char *gl_extensions_get_string( GLcontext *ctx ) return ctx->Extensions.ext_string; } - - - -/* - * Return the address of an extension function. - * This is meant to be called by glXGetProcAddress(), wglGetProcAddress(), - * or similar function. - * NOTE: this function could be optimized to binary search a sorted - * list of function names. - */ -void (*gl_get_proc_address( const GLubyte *procName ))() -{ - typedef void (*gl_function)(); - struct proc { - const char *name; - gl_function address; - }; - static struct proc procTable[] = { - /* OpenGL 1.1 functions */ - { "glEnableClientState", (gl_function) glEnableClientState }, - { "glDisableClientState", (gl_function) glDisableClientState }, - { "glPushClientAttrib", (gl_function) glPushClientAttrib }, - { "glPopClientAttrib", (gl_function) glPopClientAttrib }, - { "glIndexub", (gl_function) glIndexub }, - { "glIndexubv", (gl_function) glIndexubv }, - { "glVertexPointer", (gl_function) glVertexPointer }, - { "glNormalPointer", (gl_function) glNormalPointer }, - { "glColorPointer", (gl_function) glColorPointer }, - { "glIndexPointer", (gl_function) glIndexPointer }, - { "glTexCoordPointer", (gl_function) glTexCoordPointer }, - { "glEdgeFlagPointer", (gl_function) glEdgeFlagPointer }, - { "glGetPointerv", (gl_function) glGetPointerv }, - { "glArrayElement", (gl_function) glArrayElement }, - { "glDrawArrays", (gl_function) glDrawArrays }, - { "glDrawElements", (gl_function) glDrawElements }, - { "glInterleavedArrays", (gl_function) glInterleavedArrays }, - { "glGenTextures", (gl_function) glGenTextures }, - { "glDeleteTextures", (gl_function) glDeleteTextures }, - { "glBindTexture", (gl_function) glBindTexture }, - { "glPrioritizeTextures", (gl_function) glPrioritizeTextures }, - { "glAreTexturesResident", (gl_function) glAreTexturesResident }, - { "glIsTexture", (gl_function) glIsTexture }, - { "glTexSubImage1D", (gl_function) glTexSubImage1D }, - { "glTexSubImage2D", (gl_function) glTexSubImage2D }, - { "glCopyTexImage1D", (gl_function) glCopyTexImage1D }, - { "glCopyTexImage2D", (gl_function) glCopyTexImage2D }, - { "glCopyTexSubImage1D", (gl_function) glCopyTexSubImage1D }, - { "glCopyTexSubImage2D", (gl_function) glCopyTexSubImage2D }, - - /* OpenGL 1.2 functions */ - { "glDrawRangeElements", (gl_function) glDrawRangeElements }, - { "glTexImage3D", (gl_function) glTexImage3D }, - { "glTexSubImage3D", (gl_function) glTexSubImage3D }, - { "glCopyTexSubImage3D", (gl_function) glCopyTexSubImage3D }, - /* NOTE: 1.2 imaging subset functions not implemented in Mesa */ - - /* GL_EXT_blend_minmax */ - { "glBlendEquationEXT", (gl_function) glBlendEquationEXT }, - - /* GL_EXT_blend_color */ - { "glBlendColorEXT", (gl_function) glBlendColorEXT }, - - /* GL_EXT_polygon_offset */ - { "glPolygonOffsetEXT", (gl_function) glPolygonOffsetEXT }, - - /* GL_EXT_vertex_arrays */ - { "glVertexPointerEXT", (gl_function) glVertexPointerEXT }, - { "glNormalPointerEXT", (gl_function) glNormalPointerEXT }, - { "glColorPointerEXT", (gl_function) glColorPointerEXT }, - { "glIndexPointerEXT", (gl_function) glIndexPointerEXT }, - { "glTexCoordPointerEXT", (gl_function) glTexCoordPointerEXT }, - { "glEdgeFlagPointerEXT", (gl_function) glEdgeFlagPointerEXT }, - { "glGetPointervEXT", (gl_function) glGetPointervEXT }, - { "glArrayElementEXT", (gl_function) glArrayElementEXT }, - { "glDrawArraysEXT", (gl_function) glDrawArraysEXT }, - - /* GL_EXT_texture_object */ - { "glGenTexturesEXT", (gl_function) glGenTexturesEXT }, - { "glDeleteTexturesEXT", (gl_function) glDeleteTexturesEXT }, - { "glBindTextureEXT", (gl_function) glBindTextureEXT }, - { "glPrioritizeTexturesEXT", (gl_function) glPrioritizeTexturesEXT }, - { "glAreTexturesResidentEXT", (gl_function) glAreTexturesResidentEXT }, - { "glIsTextureEXT", (gl_function) glIsTextureEXT }, - - /* GL_EXT_texture3D */ - { "glTexImage3DEXT", (gl_function) glTexImage3DEXT }, - { "glTexSubImage3DEXT", (gl_function) glTexSubImage3DEXT }, - { "glCopyTexSubImage3DEXT", (gl_function) glCopyTexSubImage3DEXT }, - - /* GL_EXT_paletted_texture */ - { "glColorTableEXT", (gl_function) glColorTableEXT }, - { "glColorSubTableEXT", (gl_function) glColorSubTableEXT }, - { "glGetColorTableEXT", (gl_function) glGetColorTableEXT }, - { "glGetColorTableParameterfvEXT", (gl_function) glGetColorTableParameterfvEXT }, - { "glGetColorTableParameterivEXT", (gl_function) glGetColorTableParameterivEXT }, - - /* GL_ARB_multitexture */ - { "glActiveTextureARB", (gl_function) glActiveTextureARB }, - { "glClientActiveTextureARB", (gl_function) glClientActiveTextureARB }, - { "glMultiTexCoord1dARB", (gl_function) glMultiTexCoord1dARB }, - { "glMultiTexCoord1dvARB", (gl_function) glMultiTexCoord1dvARB }, - { "glMultiTexCoord1fARB", (gl_function) glMultiTexCoord1fARB }, - { "glMultiTexCoord1fvARB", (gl_function) glMultiTexCoord1fvARB }, - { "glMultiTexCoord1iARB", (gl_function) glMultiTexCoord1iARB }, - { "glMultiTexCoord1ivARB", (gl_function) glMultiTexCoord1ivARB }, - { "glMultiTexCoord1sARB", (gl_function) glMultiTexCoord1sARB }, - { "glMultiTexCoord1svARB", (gl_function) glMultiTexCoord1svARB }, - { "glMultiTexCoord2dARB", (gl_function) glMultiTexCoord2dARB }, - { "glMultiTexCoord2dvARB", (gl_function) glMultiTexCoord2dvARB }, - { "glMultiTexCoord2fARB", (gl_function) glMultiTexCoord2fARB }, - { "glMultiTexCoord2fvARB", (gl_function) glMultiTexCoord2fvARB }, - { "glMultiTexCoord2iARB", (gl_function) glMultiTexCoord2iARB }, - { "glMultiTexCoord2ivARB", (gl_function) glMultiTexCoord2ivARB }, - { "glMultiTexCoord2sARB", (gl_function) glMultiTexCoord2sARB }, - { "glMultiTexCoord2svARB", (gl_function) glMultiTexCoord2svARB }, - { "glMultiTexCoord3dARB", (gl_function) glMultiTexCoord3dARB }, - { "glMultiTexCoord3dvARB", (gl_function) glMultiTexCoord3dvARB }, - { "glMultiTexCoord3fARB", (gl_function) glMultiTexCoord3fARB }, - { "glMultiTexCoord3fvARB", (gl_function) glMultiTexCoord3fvARB }, - { "glMultiTexCoord3iARB", (gl_function) glMultiTexCoord3iARB }, - { "glMultiTexCoord3ivARB", (gl_function) glMultiTexCoord3ivARB }, - { "glMultiTexCoord3sARB", (gl_function) glMultiTexCoord3sARB }, - { "glMultiTexCoord3svARB", (gl_function) glMultiTexCoord3svARB }, - { "glMultiTexCoord4dARB", (gl_function) glMultiTexCoord4dARB }, - { "glMultiTexCoord4dvARB", (gl_function) glMultiTexCoord4dvARB }, - { "glMultiTexCoord4fARB", (gl_function) glMultiTexCoord4fARB }, - { "glMultiTexCoord4fvARB", (gl_function) glMultiTexCoord4fvARB }, - { "glMultiTexCoord4iARB", (gl_function) glMultiTexCoord4iARB }, - { "glMultiTexCoord4ivARB", (gl_function) glMultiTexCoord4ivARB }, - { "glMultiTexCoord4sARB", (gl_function) glMultiTexCoord4sARB }, - { "glMultiTexCoord4svARB", (gl_function) glMultiTexCoord4svARB }, - - /* GL_EXT_point_parameters */ - { "glPointParameterfEXT", (gl_function) glPointParameterfEXT }, - { "glPointParameterfvEXT", (gl_function) glPointParameterfvEXT }, - - /* GL_INGR_blend_func_separate */ - { "glBlendFuncSeparateINGR", (gl_function) glBlendFuncSeparateINGR }, - - /* GL_MESA_window_pos */ - { "glWindowPos2iMESA", (gl_function) glWindowPos2iMESA }, - { "glWindowPos2sMESA", (gl_function) glWindowPos2sMESA }, - { "glWindowPos2fMESA", (gl_function) glWindowPos2fMESA }, - { "glWindowPos2dMESA", (gl_function) glWindowPos2dMESA }, - { "glWindowPos2ivMESA", (gl_function) glWindowPos2ivMESA }, - { "glWindowPos2svMESA", (gl_function) glWindowPos2svMESA }, - { "glWindowPos2fvMESA", (gl_function) glWindowPos2fvMESA }, - { "glWindowPos2dvMESA", (gl_function) glWindowPos2dvMESA }, - { "glWindowPos3iMESA", (gl_function) glWindowPos3iMESA }, - { "glWindowPos3sMESA", (gl_function) glWindowPos3sMESA }, - { "glWindowPos3fMESA", (gl_function) glWindowPos3fMESA }, - { "glWindowPos3dMESA", (gl_function) glWindowPos3dMESA }, - { "glWindowPos3ivMESA", (gl_function) glWindowPos3ivMESA }, - { "glWindowPos3svMESA", (gl_function) glWindowPos3svMESA }, - { "glWindowPos3fvMESA", (gl_function) glWindowPos3fvMESA }, - { "glWindowPos3dvMESA", (gl_function) glWindowPos3dvMESA }, - { "glWindowPos4iMESA", (gl_function) glWindowPos4iMESA }, - { "glWindowPos4sMESA", (gl_function) glWindowPos4sMESA }, - { "glWindowPos4fMESA", (gl_function) glWindowPos4fMESA }, - { "glWindowPos4dMESA", (gl_function) glWindowPos4dMESA }, - { "glWindowPos4ivMESA", (gl_function) glWindowPos4ivMESA }, - { "glWindowPos4svMESA", (gl_function) glWindowPos4svMESA }, - { "glWindowPos4fvMESA", (gl_function) glWindowPos4fvMESA }, - { "glWindowPos4dvMESA", (gl_function) glWindowPos4dvMESA }, - - /* GL_MESA_resize_buffers */ - { "glResizeBuffersMESA", (gl_function) glResizeBuffersMESA }, - - /* GL_EXT_compiled_vertex_array */ - { "glLockArraysEXT", (gl_function) glLockArraysEXT }, - { "glUnlockArraysEXT", (gl_function) glUnlockArraysEXT }, - - { NULL, NULL } /* end of list token */ - }; - GLuint i; - - for (i = 0; procTable[i].address; i++) { - if (strcmp((const char *) procName, procTable[i].name) == 0) - return procTable[i].address; - } - - return NULL; -} diff --git a/src/mesa/main/extensions.h b/src/mesa/main/extensions.h index 1ff8e2702aa..4834a1398e2 100644 --- a/src/mesa/main/extensions.h +++ b/src/mesa/main/extensions.h @@ -1,8 +1,8 @@ -/* $Id: extensions.h,v 1.6 1999/11/12 02:05:46 brianp Exp $ */ +/* $Id: extensions.h,v 1.7 1999/12/10 15:13:57 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.1 + * Version: 3.3 * * Copyright (C) 1999 Brian Paul All Rights Reserved. * @@ -47,8 +47,6 @@ extern void gl_extensions_dtr( struct gl_context *ctx ); extern void gl_extensions_ctr( struct gl_context *ctx ); extern const char *gl_extensions_get_string( struct gl_context *ctx ); -extern void (*gl_get_proc_address( const GLubyte *procName ))(); - #endif -- 2.30.2