diff options
| author | Thomas Helland <thomashelland90@gmail.com> | 2016-08-16 22:10:36 +0200 |
|---|---|---|
| committer | Timothy Arceri <timothy.arceri@collabora.com> | 2016-09-12 10:48:35 +1000 |
| commit | 08c5b10ae904231d887f9b6c37694c0e03939a28 (patch) | |
| tree | db97136a86537e3327927fa171e690822adeedf4 /src/compiler/glsl | |
| parent | e55eb2b7ea9a464eca9d2c6259f5b69299762856 (diff) | |
| download | external_mesa3d-08c5b10ae904231d887f9b6c37694c0e03939a28.tar.gz external_mesa3d-08c5b10ae904231d887f9b6c37694c0e03939a28.tar.bz2 external_mesa3d-08c5b10ae904231d887f9b6c37694c0e03939a28.zip | |
mesa/glsl: Move string_to_uint_map into the util folder
This clears the last bits of the usecases of the hash table
located in mesa/program, allowing us to remove it.
V2: Rebase on top of changes to Makefile.sources
Signed-off-by: Thomas Helland <thomashelland90@gmail.com>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
Diffstat (limited to 'src/compiler/glsl')
| -rw-r--r-- | src/compiler/glsl/link_uniform_initializers.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/link_uniforms.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/linker.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/standalone.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/tests/set_uniform_initializer_tests.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/glsl/link_uniform_initializers.cpp b/src/compiler/glsl/link_uniform_initializers.cpp index 021e95032f..68ba167e47 100644 --- a/src/compiler/glsl/link_uniform_initializers.cpp +++ b/src/compiler/glsl/link_uniform_initializers.cpp @@ -22,10 +22,10 @@ */ #include "main/core.h" -#include "program/hash_table.h" #include "ir.h" #include "linker.h" #include "ir_uniform.h" +#include "util/string_to_uint_map.h" /* These functions are put in a "private" namespace instead of being marked * static so that the unit tests can access them. See diff --git a/src/compiler/glsl/link_uniforms.cpp b/src/compiler/glsl/link_uniforms.cpp index 9f8adcc115..4d3fc6d9c7 100644 --- a/src/compiler/glsl/link_uniforms.cpp +++ b/src/compiler/glsl/link_uniforms.cpp @@ -26,8 +26,8 @@ #include "linker.h" #include "ir_uniform.h" #include "glsl_symbol_table.h" -#include "program/hash_table.h" #include "program.h" +#include "util/string_to_uint_map.h" /** * \file link_uniforms.cpp diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 23e87093d7..4440c03267 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -71,9 +71,9 @@ #include "glsl_parser_extras.h" #include "ir.h" #include "program.h" -#include "program/hash_table.h" #include "program/prog_instruction.h" #include "util/set.h" +#include "util/string_to_uint_map.h" #include "linker.h" #include "link_varyings.h" #include "ir_optimization.h" diff --git a/src/compiler/glsl/standalone.cpp b/src/compiler/glsl/standalone.cpp index 88fe5fde09..d6e6829197 100644 --- a/src/compiler/glsl/standalone.cpp +++ b/src/compiler/glsl/standalone.cpp @@ -33,10 +33,10 @@ #include "glsl_parser_extras.h" #include "ir_optimization.h" #include "program.h" -#include "program/hash_table.h" #include "loop_analysis.h" #include "standalone_scaffolding.h" #include "standalone.h" +#include "util/string_to_uint_map.h" static const struct standalone_options *options; diff --git a/src/compiler/glsl/tests/set_uniform_initializer_tests.cpp b/src/compiler/glsl/tests/set_uniform_initializer_tests.cpp index 9d4101743f..245494c739 100644 --- a/src/compiler/glsl/tests/set_uniform_initializer_tests.cpp +++ b/src/compiler/glsl/tests/set_uniform_initializer_tests.cpp @@ -24,8 +24,8 @@ #include "main/compiler.h" #include "main/mtypes.h" #include "main/macros.h" -#include "program/hash_table.h" #include "util/ralloc.h" +#include "util/string_to_uint_map.h" #include "uniform_initializer_utils.h" namespace linker { |