mesa: Allow contexts of different APIs to coexist.

This effectively redoes 1741ddb747ca0be284315adb4b6fe67ddf292d03 in a
way that allows contexts of different APIs to coexist.

First, the changes to the remap table are reverted.  The remap table
(driDispatchRemapTable) is always initialized in the same way regardless
of the context API.

es_generator.py is updated to use a local remap table, whose sole
purpose is to help initialize its dispatch table.  The local remap table
and the global one are always different, as they use different
glapidispatch.h.  But the dispatch tables initialized by both remap
tables are always compatible with glapi (libGL.so).

Finally, the semantics of one_time_init are changed to per-api one-time
initialization.

1 files changed, 0 insertions, 44 deletions

diff --git a/src/mesa/main/remap.h b/src/mesa/main/remap.h
index a2a55f615d..5fee300529 100644
--- a/src/mesa/main/remap.h
+++ b/src/mesa/main/remap.h
@@ -60,25 +60,8 @@ extern void
 _mesa_map_static_functions(void);
 
 extern void
-_mesa_map_static_functions_es1(void);
-
-extern void
-_mesa_map_static_functions_es2(void);
-
-extern void
-_mesa_do_init_remap_table(const char *pool,
-			  int size,
-			  const struct gl_function_pool_remap *remap);
-
-extern void
 _mesa_init_remap_table(void);
 
-extern void
-_mesa_init_remap_table_es1(void);
-
-extern void
-_mesa_init_remap_table_es2(void);
-
 #else /* FEATURE_remap_table */
 
 static INLINE const char *
@@ -105,37 +88,10 @@ _mesa_map_static_functions(void)
 
 
 static INLINE void
-_mesa_map_static_functions_es1(void)
-{
-}
-
-static INLINE void
-_mesa_map_static_functions_es2(void)
-{
-}
-
-static INLINE void
-_mesa_do_init_remap_table(const char *pool,
-			  int size,
-			  const struct gl_function_pool_remap *remap)
-{
-}
-
-static INLINE void
 _mesa_init_remap_table(void)
 {
 }
 
-static INLINE void
-_mesa_init_remap_table_es1(void)
-{
-}
-
-static INLINE void
-_mesa_init_remap_table_es2(void)
-{
-}
-
 #endif /* FEATURE_remap_table */