6 files changed, 0 insertions, 42 deletions
diff --git a/src/mapi/glapi/gen/gl_procs.py b/src/mapi/glapi/gen/gl_procs.py
index 4bd33216106..6a950493854 100644
--- a/src/mapi/glapi/gen/gl_procs.py
+++ b/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:
diff --git a/src/mapi/glapi/gen/gl_x86-64_asm.py b/src/mapi/glapi/gen/gl_x86-64_asm.py
index f51f513c5ed..b4149a5f220 100644
--- a/src/mapi/glapi/gen/gl_x86-64_asm.py
+++ b/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('')
diff --git a/src/mapi/glapi/gen/gl_x86_asm.py b/src/mapi/glapi/gen/gl_x86_asm.py
index f373d15db4a..3d262cf5783 100644
--- a/src/mapi/glapi/gen/gl_x86_asm.py
+++ b/src/mapi/glapi/gen/gl_x86_asm.py
@@ -58,18 +58,9 @@ 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))')
diff --git a/src/mapi/glapi/glapi.h b/src/mapi/glapi/glapi.h
index d1082746272..b11fe46107b 100644
--- a/src/mapi/glapi/glapi.h
+++ b/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);
diff --git a/src/mapi/glapi/glapi_dispatch.c b/src/mapi/glapi/glapi_dispatch.c
index 96fd0d6a285..fa59705fbe4 100644
--- a/src/mapi/glapi/glapi_dispatch.c
+++ b/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!) */
 
diff --git a/src/mapi/glapi/glapi_getproc.c b/src/mapi/glapi/glapi_getproc.c
index d3fd3f82dcd..df8b4fa25a3 100644
--- a/src/mapi/glapi/glapi_getproc.c
+++ b/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;