GL: drop symbols mangling support

SCons and Meson have never supported that feature, and Autotools was
deleted over 6 months ago and no-one complained yet, so it's pretty
obvious nobody cares about it.

Fixes: 95aefc94a9 ("Delete autotools")
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Acked-by: Dylan Baker <dylan@pnwbakers.com>

include/GL/gl.h

@@ -27,11 +27,6 @@
 #ifndef __gl_h_
 #define __gl_h_
 
-#if defined(USE_MGL_NAMESPACE)
-#include "gl_mangle.h"
-#endif
-
-
 /**********************************************************************
  * Begin system-specific stuff.
  */
@@ -2101,13 +2096,6 @@ typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum t
 #endif
 
 
-/**
- ** NOTE!!!!!  If you add new functions to this file, or update
- ** glext.h be sure to regenerate the gl_mangle.h file.  See comments
- ** in that file for details.
- **/
-
-
 #ifdef __cplusplus
 }
 #endif

include/GL/glx.h

@@ -32,11 +32,6 @@
 #include <GL/gl.h>
 
 
-#if defined(USE_MGL_NAMESPACE)
-#include "glx_mangle.h"
-#endif
-
-
 #ifdef __cplusplus
 extern "C" {
 #endif

include/GL/glx_mangle.h

@@ -1,82 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * 
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#ifndef GLX_MANGLE_H
-#define GLX_MANGLE_H
-
-#define glXChooseVisual mglXChooseVisual
-#define glXCreateContext mglXCreateContext
-#define glXDestroyContext mglXDestroyContext
-#define glXMakeCurrent mglXMakeCurrent
-#define glXCopyContext mglXCopyContext
-#define glXSwapBuffers mglXSwapBuffers
-#define glXCreateGLXPixmap mglXCreateGLXPixmap
-#define glXDestroyGLXPixmap mglXDestroyGLXPixmap
-#define glXQueryExtension mglXQueryExtension
-#define glXQueryVersion mglXQueryVersion
-#define glXIsDirect mglXIsDirect
-#define glXGetConfig mglXGetConfig
-#define glXGetCurrentContext mglXGetCurrentContext
-#define glXGetCurrentDrawable mglXGetCurrentDrawable
-#define glXWaitGL mglXWaitGL
-#define glXWaitX mglXWaitX
-#define glXUseXFont mglXUseXFont
-#define glXQueryExtensionsString mglXQueryExtensionsString
-#define glXQueryServerString mglXQueryServerString
-#define glXGetClientString mglXGetClientString
-#define glXCreateGLXPixmapMESA mglXCreateGLXPixmapMESA
-#define glXReleaseBuffersMESA mglXReleaseBuffersMESA
-#define glXCopySubBufferMESA mglXCopySubBufferMESA
-#define glXGetVideoSyncSGI mglXGetVideoSyncSGI
-#define glXWaitVideoSyncSGI mglXWaitVideoSyncSGI
-
-/* GLX 1.2 */
-#define glXGetCurrentDisplay mglXGetCurrentDisplay 
-
-/* GLX 1.3 */
-#define glXChooseFBConfig mglXChooseFBConfig          
-#define glXGetFBConfigAttrib mglXGetFBConfigAttrib       
-#define glXGetFBConfigs mglXGetFBConfigs            
-#define glXGetVisualFromFBConfig mglXGetVisualFromFBConfig   
-#define glXCreateWindow mglXCreateWindow            
-#define glXDestroyWindow mglXDestroyWindow           
-#define glXCreatePixmap mglXCreatePixmap            
-#define glXDestroyPixmap mglXDestroyPixmap           
-#define glXCreatePbuffer mglXCreatePbuffer           
-#define glXDestroyPbuffer mglXDestroyPbuffer          
-#define glXQueryDrawable mglXQueryDrawable           
-#define glXCreateNewContext mglXCreateNewContext        
-#define glXMakeContextCurrent mglXMakeContextCurrent      
-#define glXGetCurrentReadDrawable mglXGetCurrentReadDrawable  
-#define glXQueryContext mglXQueryContext            
-#define glXSelectEvent mglXSelectEvent             
-#define glXGetSelectedEvent mglXGetSelectedEvent    
-
-/* GLX 1.4 */
-#define glXGetProcAddress mglXGetProcAddress
-#define glXGetProcAddressARB mglXGetProcAddressARB
-
-
-#endif

include/HaikuGL/README

@@ -12,7 +12,6 @@ Normal Haiku Op*enGL layout:
   * headers/os/opengl/GLView.h
   * headers/os/opengl/GLRenderer.h
   * headers/os/opengl/GL/gl.h
-  * headers/os/opengl/GL/gl_mangle.h
   * headers/os/opengl/GL/glext.h
   * headers/os/opengl/GL/osmesa.h (needed?)
 

include/meson.build

@@ -47,13 +47,13 @@ endif
 
 if with_opengl
   install_headers(
-    'GL/gl.h', 'GL/glext.h', 'GL/glcorearb.h', 'GL/gl_mangle.h',
+    'GL/gl.h', 'GL/glext.h', 'GL/glcorearb.h',
     subdir : 'GL',
   )
 endif
 
 if with_glx != 'disabled'
-  install_headers('GL/glx.h', 'GL/glxext.h', 'GL/glx_mangle.h', subdir : 'GL')
+  install_headers('GL/glx.h', 'GL/glxext.h', subdir : 'GL')
 endif
 
 if with_osmesa != 'none'

src/gallium/targets/libgl-xlib/xlib.c

@@ -118,11 +118,7 @@ extern void (*linker_foo(const unsigned char *procName))()
 #include "glapi/glapi.h"
 #include "glapi/glapitable.h"
 
-#if defined(USE_MGL_NAMESPACE)
-#define NAME(func)  mgl##func
-#else
 #define NAME(func)  gl##func
-#endif
 
 #define DISPATCH(FUNC, ARGS, MESSAGE)		\
    GET_DISPATCH()->FUNC ARGS

src/mapi/glapi/gen/gl_procs.py

@@ -113,15 +113,6 @@ typedef struct {
         print('    ;')
         print('')
         print('')
-        print("#ifdef USE_MGL_NAMESPACE")
-        for func in api.functionIterateByOffset():
-            for n in func.entry_points:
-                if (not func.is_static_entry_point(func.name)) or (func.has_different_protocol(n) and not func.is_static_entry_point(n)):
-                    print('#define gl_dispatch_stub_%u mgl_dispatch_stub_%u' % (func.offset, func.offset))
-                    break
-        print("#endif /* USE_MGL_NAMESPACE */")
-        print('')
-        print('')
         print('#if defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING)')
         for func in api.functionIterateByOffset():
             for n in func.entry_points:

src/mapi/glapi/gen/gl_x86-64_asm.py

@@ -134,12 +134,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
         print('#  define HIDDEN(x)')
         print('#endif')
         print('')
-        print('# if defined(USE_MGL_NAMESPACE)')
-        print('#  define GL_PREFIX(n) GLNAME(CONCAT(mgl,n))')
-        print('#  define _glapi_Dispatch _mglapi_Dispatch')
-        print('# else')
         print('#  define GL_PREFIX(n) GLNAME(CONCAT(gl,n))')
-        print('# endif')
         print('')
         print('\t.text')
         print('')

src/mapi/glapi/gen/gl_x86_asm.py

@@ -58,19 +58,10 @@ class PrintGenericStubs(gl_XML.gl_print_base):
         print('#include "x86/assyntax.h"')
         print('')
         print('#if defined(STDCALL_API)')
-        print('# if defined(USE_MGL_NAMESPACE)')
-        print('#  define GL_PREFIX(n,n2) GLNAME(CONCAT(mgl,n2))')
-        print('# else')
         print('#  define GL_PREFIX(n,n2) GLNAME(CONCAT(gl,n2))')
-        print('# endif')
-        print('#else')
-        print('# if defined(USE_MGL_NAMESPACE)')
-        print('#  define GL_PREFIX(n,n2) GLNAME(CONCAT(mgl,n))')
-        print('#  define _glapi_Dispatch _mglapi_Dispatch')
         print('#else')
         print('#  define GL_PREFIX(n,n2) GLNAME(CONCAT(gl,n))')
         print('#endif')
-        print('#endif')
         print('')
         print('#define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))')
         print('')

src/mapi/glapi/glapi.h

@@ -69,16 +69,6 @@ extern "C" {
 #endif /* _GLAPI_NO_EXPORTS */
 
 
-/* Is this needed?  It is incomplete anyway. */
-#ifdef USE_MGL_NAMESPACE
-#define _glapi_set_dispatch _mglapi_set_dispatch
-#define _glapi_get_dispatch _mglapi_get_dispatch
-#define _glapi_set_context _mglapi_set_context
-#define _glapi_get_context _mglapi_get_context
-#define _glapi_Dispatch _mglapi_Dispatch
-#define _glapi_Context _mglapi_Context
-#endif
-
 typedef void (*_glapi_proc)(void);
 
 typedef void (*_glapi_nop_handler_proc)(const char *name);

src/mapi/glapi/glapi_dispatch.c

@@ -51,11 +51,7 @@
 
 #define KEYWORD2 GLAPIENTRY
 
-#if defined(USE_MGL_NAMESPACE)
-#define NAME(func)  mgl##func
-#else
 #define NAME(func)  gl##func
-#endif
 
 #if 0  /* Use this to log GL calls to stdout (for DEBUG only!) */
 

src/mapi/glapi/glapi_getproc.c

@@ -511,11 +511,6 @@ _glapi_get_proc_address(const char *funcName)
 
    init_glapi_relocs_once();
 
-#ifdef USE_MGL_NAMESPACE
-   if (funcName && funcName[0] == 'm')
-      funcName++;
-#endif
-
   if (!funcName || funcName[0] != 'g' || funcName[1] != 'l')
       return NULL;
 

src/mapi/mapi_abi.py

@@ -603,13 +603,8 @@ class GLAPIPrinter(ABIPrinter):
     def _get_c_header(self):
         header = """#ifndef _GLAPI_TMP_H_
 #define _GLAPI_TMP_H_
-#ifdef USE_MGL_NAMESPACE
-#define GLAPI_PREFIX(func)  mgl##func
-#define GLAPI_PREFIX_STR(func)  "mgl"#func
-#else
 #define GLAPI_PREFIX(func)  gl##func
 #define GLAPI_PREFIX_STR(func)  "gl"#func
-#endif /* USE_MGL_NAMESPACE */
 
 typedef int GLclampx;
 #endif /* _GLAPI_TMP_H_ */"""

src/mapi/mapi_glapi.c

@@ -174,11 +174,6 @@ _glapi_get_stub(const char *name, int generate)
 {
    const struct mapi_stub *stub;
 
-#ifdef USE_MGL_NAMESPACE
-   if (name && name[0] == 'm')
-      name++;
-#endif
-
    if (!name || name[0] != 'g' || name[1] != 'l')
       return NULL;
    name += 2;

src/mesa/drivers/osmesa/osmesa.c

@@ -1289,11 +1289,7 @@ OSMesaPostprocess(OSMesaContext osmesa, const char *filter,
 #include "glapi/glapi.h"
 #include "glapitable.h"
 
-#if defined(USE_MGL_NAMESPACE)
-#define NAME(func)  mgl##func
-#else
 #define NAME(func)  gl##func
-#endif
 
 #define DISPATCH(FUNC, ARGS, MESSAGE)		\
    GET_DISPATCH()->FUNC ARGS

src/mesa/drivers/x11/glxapi.c

@@ -59,11 +59,7 @@ struct display_dispatch {
 
 #define KEYWORD1 PUBLIC
 
-#if defined(USE_MGL_NAMESPACE)
-#define NAME(func)  mgl##func
-#else
 #define NAME(func)  gl##func
-#endif
 
 #define DISPATCH(FUNC, ARGS, MESSAGE)		\
    GET_DISPATCH()->FUNC ARGS