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/program/ir_to_mesa.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/program/ir_to_mesa.cpp')
| -rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 78f24498783..11207dd8289 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -47,12 +47,12 @@ #include "compiler/glsl/linker.h" #include "compiler/glsl/program.h" #include "compiler/glsl/shader_cache.h" +#include "compiler/glsl/string_to_uint_map.h" #include "program/prog_instruction.h" #include "program/prog_optimize.h" #include "program/prog_print.h" #include "program/program.h" #include "program/prog_parameter.h" -#include "util/string_to_uint_map.h" static int swizzle_for_size(int size); |