diff options
| author | Emil Velikov <[email protected]> | 2017-08-26 02:37:11 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-08-29 13:40:44 +0100 |
| commit | 0ac78dc92582a59d4319ebce019b4caa41fb432d (patch) | |
| tree | 63fd4ff2e5a3b9f8d86a8474352e37cf9eca874f /src/mesa/state_tracker/st_glsl_to_nir.cpp | |
| parent | 79674066b6f98be96cb63a0332ac421858544a20 (diff) | |
util: move string_to_uint_map to glsl
The functionality is used by glsl and mesa. With the latter already
depending on the former.
With this in place the src/util/ static library libmesautil.la no longer
has a C++ dependency. Thus objects which use it (like libEGL) don't need
the C++ link.
Cc: "17.2" <[email protected]>
Fixes: 02cc35937277 ("egl/wayland: Use linux-dmabuf interface for buffers")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101851
Signed-off-by: Emil Velikov <[email protected]>
Suggested-by: Jason Ekstrand <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Tested-by: Mike Lothian <[email protected]>
Tested-by: James Harvey <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker/st_glsl_to_nir.cpp')
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_nir.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index 38d6c7068c2..06a8ee8c612 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -35,7 +35,6 @@ #include "main/errors.h" #include "main/shaderapi.h" #include "main/uniforms.h" -#include "util/string_to_uint_map.h" #include "st_context.h" #include "st_program.h" @@ -44,6 +43,7 @@ #include "compiler/glsl_types.h" #include "compiler/glsl/glsl_to_nir.h" #include "compiler/glsl/ir.h" +#include "compiler/glsl/string_to_uint_map.h" static int |