<div dir="ltr">2016-06-07 18:33 GMT+02:00 Emil Velikov <span dir="ltr"><<a href="mailto:emil.l.velikov@gmail.com" target="_blank">emil.l.velikov@gmail.com</a>></span>:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">From: Emil Velikov <<a href="mailto:emil.velikov@collabora.com">emil.velikov@collabora.com</a>><br>
<br>
... and inline its contents in _mesa_do_init_remap_table().<br></blockquote><div><br> <br> in _mesa_init_remap_table().<br><br><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
Signed-off-by: Emil Velikov <<a href="mailto:emil.velikov@collabora.com">emil.velikov@collabora.com</a>><br>
---<br>
src/mesa/main/remap.c | 25 +++++++------------------<br>
1 file changed, 7 insertions(+), 18 deletions(-)<br>
<br>
diff --git a/src/mesa/main/remap.c b/src/mesa/main/remap.c<br>
index a756057..6dc4235 100644<br>
--- a/src/mesa/main/remap.c<br>
+++ b/src/mesa/main/remap.c<br>
@@ -98,10 +98,8 @@ map_function_spec(const char *spec)<br>
* The remap table needs to be initialized before calling the<br>
* CALL/GET/SET macros defined in main/dispatch.h.<br>
*/<br>
-static void<br>
-_mesa_do_init_remap_table(const char *pool,<br>
- int size,<br>
- const struct gl_function_pool_remap *remap)<br>
+void<br>
+_mesa_init_remap_table(void)<br>
{<br>
static bool initialized = false;<br>
GLint i;<br>
@@ -110,17 +108,17 @@ _mesa_do_init_remap_table(const char *pool,<br>
return;<br>
initialized = true;<br>
<br>
- /* initialize the remap table */<br>
- for (i = 0; i < size; i++) {<br>
+ /* initialize the MESA_remap_table_functions table */<br>
+ for (i = 0; i < driDispatchRemapTable_size; i++) {<br>
int offset;<br>
const char *spec;<br>
<br>
/* sanity check */<br>
- assert(i == remap[i].remap_index);<br>
- spec = _mesa_function_pool + remap[i].pool_index;<br>
+ assert(i == MESA_remap_table_functions[i].remap_index);<br>
+ spec = _mesa_function_pool + MESA_remap_table_functions[i].pool_index;<br>
<br>
offset = map_function_spec(spec);<br>
- /* store the dispatch offset in the remap table */<br>
+ /* store the dispatch offset in the MESA_remap_table_functions table */<br>
driDispatchRemapTable[i] = offset;<br>
if (offset < 0) {<br>
const char *name = spec + strlen(spec) + 1;<br>
@@ -128,12 +126,3 @@ _mesa_do_init_remap_table(const char *pool,<br>
}<br>
}<br>
}<br>
-<br>
-<br>
-void<br>
-_mesa_init_remap_table(void)<br>
-{<br>
- _mesa_do_init_remap_table(_mesa_function_pool,<br>
- driDispatchRemapTable_size,<br>
- MESA_remap_table_functions);<br>
-}<br>
<span class=""><font color="#888888">--<br>
2.8.2<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div></div>