From b81685eb32d7fd51f12cfdbac8b5f6046c416304 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 7 Jun 2016 17:33:41 +0100 Subject: [PATCH] mesa: kill off _mesa_do_init_remap_table() ... and inline its contents in _mesa_init_remap_table(). Signed-off-by: Emil Velikov Reviewed-by: Ian Romanick --- src/mesa/main/remap.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/src/mesa/main/remap.c b/src/mesa/main/remap.c index a756057605f..6dc4235cba0 100644 --- a/src/mesa/main/remap.c +++ b/src/mesa/main/remap.c @@ -98,10 +98,8 @@ map_function_spec(const char *spec) * The remap table needs to be initialized before calling the * CALL/GET/SET macros defined in main/dispatch.h. */ -static void -_mesa_do_init_remap_table(const char *pool, - int size, - const struct gl_function_pool_remap *remap) +void +_mesa_init_remap_table(void) { static bool initialized = false; GLint i; @@ -110,17 +108,17 @@ _mesa_do_init_remap_table(const char *pool, return; initialized = true; - /* initialize the remap table */ - for (i = 0; i < size; i++) { + /* initialize the MESA_remap_table_functions table */ + for (i = 0; i < driDispatchRemapTable_size; i++) { int offset; const char *spec; /* sanity check */ - assert(i == remap[i].remap_index); - spec = _mesa_function_pool + remap[i].pool_index; + assert(i == MESA_remap_table_functions[i].remap_index); + spec = _mesa_function_pool + MESA_remap_table_functions[i].pool_index; offset = map_function_spec(spec); - /* store the dispatch offset in the remap table */ + /* store the dispatch offset in the MESA_remap_table_functions table */ driDispatchRemapTable[i] = offset; if (offset < 0) { const char *name = spec + strlen(spec) + 1; @@ -128,12 +126,3 @@ _mesa_do_init_remap_table(const char *pool, } } } - - -void -_mesa_init_remap_table(void) -{ - _mesa_do_init_remap_table(_mesa_function_pool, - driDispatchRemapTable_size, - MESA_remap_table_functions); -} -- 2.30.2