summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/shaderobj.c
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2017-08-26 02:37:11 +0100
committerEmil Velikov <[email protected]>2017-08-29 13:40:44 +0100
commit0ac78dc92582a59d4319ebce019b4caa41fb432d (patch)
tree63fd4ff2e5a3b9f8d86a8474352e37cf9eca874f /src/mesa/main/shaderobj.c
parent79674066b6f98be96cb63a0332ac421858544a20 (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/main/shaderobj.c')
-rw-r--r--src/mesa/main/shaderobj.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c
index 8a5fa5e2dfc..b9d1079a35a 100644
--- a/src/mesa/main/shaderobj.c
+++ b/src/mesa/main/shaderobj.c
@@ -30,6 +30,7 @@
*/
+#include "compiler/glsl/string_to_uint_map.h"
#include "main/glheader.h"
#include "main/context.h"
#include "main/hash.h"
@@ -40,7 +41,6 @@
#include "program/program.h"
#include "program/prog_parameter.h"
#include "util/ralloc.h"
-#include "util/string_to_uint_map.h"
#include "util/u_atomic.h"
/**********************************************************************/