OSDN Git Service

util: move string_to_uint_map to glsl
authorEmil Velikov <emil.velikov@collabora.com>
Sat, 26 Aug 2017 01:37:11 +0000 (02:37 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Tue, 29 Aug 2017 12:40:44 +0000 (13:40 +0100)
commit0ac78dc92582a59d4319ebce019b4caa41fb432d
tree63fd4ff2e5a3b9f8d86a8474352e37cf9eca874f
parent79674066b6f98be96cb63a0332ac421858544a20
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" <mesa-stable@lists.freedesktop.org>
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 <emil.velikov@collabora.com>
Suggested-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Tested-by: Mike Lothian <mike@fireburn.co.uk>
Tested-by: James Harvey <lothmordor@gmail.com>
15 files changed:
src/compiler/Makefile.sources
src/compiler/glsl/link_uniform_initializers.cpp
src/compiler/glsl/link_uniforms.cpp
src/compiler/glsl/linker.cpp
src/compiler/glsl/shader_cache.cpp
src/compiler/glsl/standalone.cpp
src/compiler/glsl/string_to_uint_map.cpp [moved from src/util/string_to_uint_map.cpp with 100% similarity]
src/compiler/glsl/string_to_uint_map.h [moved from src/util/string_to_uint_map.h with 100% similarity]
src/compiler/glsl/tests/set_uniform_initializer_tests.cpp
src/mesa/main/shader_query.cpp
src/mesa/main/shaderobj.c
src/mesa/program/ir_to_mesa.cpp
src/mesa/state_tracker/st_glsl_to_nir.cpp
src/mesa/state_tracker/st_glsl_to_nir.cpp.orig [new file with mode: 0644]
src/util/Makefile.sources