<div dir="ltr">Feel free to add my tested by for this<div><br></div><div>Thanks for the fix</div></div><br><div class="gmail_quote"><div dir="ltr">On Sat, 26 Aug 2017 at 17:35 Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net" target="_blank">jason@jlekstrand.net</a>><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Aug 25, 2017 at 7:10 PM, Jason Ekstrand <span dir="ltr"><<a href="mailto:jason@jlekstrand.net" target="_blank">jason@jlekstrand.net</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Ack.  Not a review though.<div class="m_-7195827003035930454HOEnZb"><div class="m_-7195827003035930454h5"><br>
<br>
<br>
On August 25, 2017 6:38:46 PM Emil Velikov <<a href="mailto:emil.l.velikov@gmail.com" target="_blank">emil.l.velikov@gmail.com</a>> wrote:<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
From: Emil Velikov <<a href="mailto:emil.velikov@collabora.com" target="_blank">emil.velikov@collabora.com</a>><br>
<br>
The functionality is used by glsl and mesa. With the latter already<br>
depending on the former.<br>
<br>
With this in place the src/util/ static library <a href="http://libmesautil.la" rel="noreferrer" target="_blank">libmesautil.la</a> no longer<br>
has a C++ dependency. Thus objects which use it (like libEGL) don't need<br>
the C++ link.<br>
<br>
Cc: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net" target="_blank">jason@jlekstrand.net</a>><br>
Suggested-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net" target="_blank">jason@jlekstrand.net</a>><br>
Cc: "17.2" <<a href="mailto:mesa-stable@lists.freedesktop.org" target="_blank">mesa-stable@lists.freedesktop.org</a>><br>
Fixes: 02cc35937277 ("egl/wayland: Use linux-dmabuf interface for buffers")<br>
Bugzilla: <a href="https://bugs.freedesktop.org/show_bug.cgi?id=101851" rel="noreferrer" target="_blank">https://bugs.freedesktop.org/show_bug.cgi?id=101851</a><br>
Signed-off-by: Emil Velikov <<a href="mailto:emil.velikov@collabora.com" target="_blank">emil.velikov@collabora.com</a>><br>
---<br>
 src/compiler/Makefile.sources                             | 4 +++-<br>
 src/compiler/glsl/link_uniform_initializers.cpp           | 2 +-<br>
 src/compiler/glsl/link_uniforms.cpp                       | 2 +-<br>
 src/compiler/glsl/linker.cpp                              | 2 +-<br>
 src/compiler/glsl/shader_cache.cpp                        | 2 +-<br>
 src/compiler/glsl/standalone.cpp                          | 2 +-<br>
 src/{util => compiler/glsl}/string_to_uint_map.cpp        | 0<br>
 src/{util => compiler/glsl}/string_to_uint_map.h          | 0<br>
 src/compiler/glsl/tests/set_uniform_initializer_tests.cpp | 2 +-<br>
 src/mesa/main/shader_query.cpp                            | 2 +-<br>
 src/mesa/main/shaderobj.c                                 | 2 +-<br>
 src/mesa/program/ir_to_mesa.cpp                           | 2 +-<br>
 src/mesa/state_tracker/st_glsl_to_nir.cpp                 | 2 +-<br>
 src/util/Makefile.sources                                 | 2 --<br>
 14 files changed, 13 insertions(+), 13 deletions(-)<br>
 rename src/{util => compiler/glsl}/string_to_uint_map.cpp (100%)<br>
 rename src/{util => compiler/glsl}/string_to_uint_map.h (100%)<br>
<br>
diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources<br>
index 6e08dfb8448..a8309a1c592 100644<br>
--- a/src/compiler/Makefile.sources<br>
+++ b/src/compiler/Makefile.sources<br>
@@ -140,7 +140,9 @@ LIBGLSL_FILES = \<br>
        glsl/program.h \<br>
        glsl/propagate_invariance.cpp \<br>
        glsl/s_expression.cpp \<br>
-       glsl/s_expression.h<br>
+       glsl/s_expression.h \<br>
+       glsl/string_to_uint_map.cpp \<br>
+       glsl/string_to_uint_map.h<br>
<br>
 LIBGLSL_SHADER_CACHE_FILES = \<br>
        glsl/shader_cache.cpp \<br>
diff --git a/src/compiler/glsl/link_uniform_initializers.cpp b/src/compiler/glsl/link_uniform_initializers.cpp<br>
index e7f9c9d8ac0..84a38793f64 100644<br>
--- a/src/compiler/glsl/link_uniform_initializers.cpp<br>
+++ b/src/compiler/glsl/link_uniform_initializers.cpp<br>
@@ -25,7 +25,7 @@<br>
 #include "ir.h"<br>
 #include "linker.h"<br>
 #include "ir_uniform.h"<br>
-#include "util/string_to_uint_map.h"<br>
+#include "string_to_uint_map.h"<br>
<br>
 /* These functions are put in a "private" namespace instead of being marked<br>
  * static so that the unit tests can access them.  See<br>
diff --git a/src/compiler/glsl/link_uniforms.cpp b/src/compiler/glsl/link_uniforms.cpp<br>
index 1b87c5860b6..99b171d7881 100644<br>
--- a/src/compiler/glsl/link_uniforms.cpp<br>
+++ b/src/compiler/glsl/link_uniforms.cpp<br>
@@ -27,7 +27,7 @@<br>
 #include "ir_uniform.h"<br>
 #include "glsl_symbol_table.h"<br>
 #include "program.h"<br>
-#include "util/string_to_uint_map.h"<br>
+#include "string_to_uint_map.h"<br>
 #include "ir_array_refcount.h"<br>
<br>
 /**<br>
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp<br>
index b4784c51199..90c1084c50f 100644<br>
--- a/src/compiler/glsl/linker.cpp<br>
+++ b/src/compiler/glsl/linker.cpp<br>
@@ -75,7 +75,7 @@<br>
 #include "program/program.h"<br>
 #include "util/mesa-sha1.h"<br>
 #include "util/set.h"<br>
-#include "util/string_to_uint_map.h"<br>
+#include "string_to_uint_map.h"<br>
 #include "linker.h"<br>
 #include "link_varyings.h"<br>
 #include "ir_optimization.h"<br>
diff --git a/src/compiler/glsl/shader_cache.cpp b/src/compiler/glsl/shader_cache.cpp<br>
index cc4d24482d9..887b8954c51 100644<br>
--- a/src/compiler/glsl/shader_cache.cpp<br>
+++ b/src/compiler/glsl/shader_cache.cpp<br>
@@ -59,7 +59,7 @@<br>
 #include "program.h"<br>
 #include "shader_cache.h"<br>
 #include "util/mesa-sha1.h"<br>
-#include "util/string_to_uint_map.h"<br>
+#include "string_to_uint_map.h"<br>
<br>
 extern "C" {<br>
 #include "main/enums.h"<br>
diff --git a/src/compiler/glsl/standalone.cpp b/src/compiler/glsl/standalone.cpp<br>
index 52554bb92a2..7a84ca72212 100644<br>
--- a/src/compiler/glsl/standalone.cpp<br>
+++ b/src/compiler/glsl/standalone.cpp<br>
@@ -36,7 +36,7 @@<br>
 #include "loop_analysis.h"<br>
 #include "standalone_scaffolding.h"<br>
 #include "standalone.h"<br>
-#include "util/string_to_uint_map.h"<br>
+#include "string_to_uint_map.h"<br>
 #include "util/set.h"<br>
 #include "linker.h"<br>
 #include "glsl_parser_extras.h"<br>
diff --git a/src/util/string_to_uint_map.cpp b/src/compiler/glsl/string_to_uint_map.cpp<br>
similarity index 100%<br>
rename from src/util/string_to_uint_map.cpp<br>
rename to src/compiler/glsl/string_to_uint_map.cpp<br>
diff --git a/src/util/string_to_uint_map.h b/src/compiler/glsl/string_to_uint_map.h<br>
similarity index 100%<br>
rename from src/util/string_to_uint_map.h<br>
rename to src/compiler/glsl/string_to_uint_map.h<br>
diff --git a/src/compiler/glsl/tests/set_uniform_initializer_tests.cpp b/src/compiler/glsl/tests/set_uniform_initializer_tests.cpp<br>
index d30abc320b3..94a6d270ec4 100644<br>
--- a/src/compiler/glsl/tests/set_uniform_initializer_tests.cpp<br>
+++ b/src/compiler/glsl/tests/set_uniform_initializer_tests.cpp<br>
@@ -25,7 +25,7 @@<br>
 #include "main/mtypes.h"<br>
 #include "main/macros.h"<br>
 #include "util/ralloc.h"<br>
-#include "util/string_to_uint_map.h"<br>
+#include "string_to_uint_map.h"<br>
 #include "uniform_initializer_utils.h"<br>
<br>
 namespace linker {<br>
diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp<br>
index f2bdcaab121..64e68b4a26d 100644<br>
--- a/src/mesa/main/shader_query.cpp<br>
+++ b/src/mesa/main/shader_query.cpp<br>
@@ -37,7 +37,7 @@<br>
 #include "compiler/glsl/glsl_symbol_table.h"<br>
 #include "compiler/glsl/ir.h"<br>
 #include "compiler/glsl/program.h"<br>
-#include "util/string_to_uint_map.h"<br>
+#include "compiler/glsl/string_to_uint_map.h"<br>
<br>
<br>
 static GLint<br>
diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c<br>
index 8a5fa5e2dfc..b9d1079a35a 100644<br>
--- a/src/mesa/main/shaderobj.c<br>
+++ b/src/mesa/main/shaderobj.c<br>
@@ -30,6 +30,7 @@<br>
  */<br>
<br>
<br>
+#include "compiler/glsl/string_to_uint_map.h"<br>
 #include "main/glheader.h"<br>
 #include "main/context.h"<br>
 #include "main/hash.h"<br>
@@ -40,7 +41,6 @@<br>
 #include "program/program.h"<br>
 #include "program/prog_parameter.h"<br>
 #include "util/ralloc.h"<br>
-#include "util/string_to_uint_map.h"<br>
 #include "util/u_atomic.h"<br>
<br>
 /**********************************************************************/<br>
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp<br>
index 775211cefb5..eb87fc5e04b 100644<br>
--- a/src/mesa/program/ir_to_mesa.cpp<br>
+++ b/src/mesa/program/ir_to_mesa.cpp<br>
@@ -47,12 +47,12 @@<br>
 #include "compiler/glsl/linker.h"<br>
 #include "compiler/glsl/program.h"<br>
 #include "compiler/glsl/shader_cache.h"<br>
+#include "compiler/glsl/string_to_uint_map.h"<br>
 #include "program/prog_instruction.h"<br>
 #include "program/prog_optimize.h"<br>
 #include "program/prog_print.h"<br>
 #include "program/program.h"<br>
 #include "program/prog_parameter.h"<br>
-#include "util/string_to_uint_map.h"<br>
<br>
<br>
 static int swizzle_for_size(int size);<br>
diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp<br>
index 89f78884389..6b6e3dbd08c 100644<br>
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp<br>
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp<br>
@@ -35,7 +35,6 @@<br>
 #include "main/errors.h"<br>
 #include "main/shaderapi.h"<br>
 #include "main/uniforms.h"<br>
-#include "util/string_to_uint_map.h"<br>
<br>
 #include "st_context.h"<br>
 #include "st_program.h"<br>
@@ -45,6 +44,7 @@<br>
 #include "compiler/glsl_types.h"<br>
 #include "compiler/glsl/glsl_to_nir.h"<br>
 #include "compiler/glsl/ir.h"<br>
+#include "compiler/glsl/string_to_uint_map.h"<br>
<br>
<br>
 /* Depending on PIPE_CAP_TGSI_TEXCOORD (st->needs_texcoord_semantic) we<br>
diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources<br>
index 8ea5f29533b..8a8c3b359f3 100644<br>
--- a/src/util/Makefile.sources<br>
+++ b/src/util/Makefile.sources<br>
@@ -37,8 +37,6 @@ MESA_UTIL_FILES := \<br>
        simple_list.h \<br>
        slab.c \<br>
        slab.h \<br>
-       string_to_uint_map.cpp \<br>
-       string_to_uint_map.h \<br>
        strndup.h \<br>
        strtod.c \<br>
        strtod.h \<br>
--<br>
2.13.3<br>
<br>
</blockquote>
<br>
<br>
</div></div></blockquote></div><br></div>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">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>
</blockquote></div>