diff options
| author | Thomas Helland <[email protected]> | 2016-08-16 22:10:36 +0200 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-09-12 10:48:35 +1000 |
| commit | 08c5b10ae904231d887f9b6c37694c0e03939a28 (patch) | |
| tree | db97136a86537e3327927fa171e690822adeedf4 /src/mesa/main | |
| parent | e55eb2b7ea9a464eca9d2c6259f5b69299762856 (diff) | |
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 <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/shader_query.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/main/shaderobj.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index 0eae39a3557..5c42006b5dc 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -37,7 +37,7 @@ #include "compiler/glsl/glsl_symbol_table.h" #include "compiler/glsl/ir.h" #include "compiler/glsl/program.h" -#include "program/hash_table.h" +#include "util/string_to_uint_map.h" #include "util/strndup.h" diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c index 0075a6d6429..350b677911e 100644 --- a/src/mesa/main/shaderobj.c +++ b/src/mesa/main/shaderobj.c @@ -39,8 +39,8 @@ #include "main/uniforms.h" #include "program/program.h" #include "program/prog_parameter.h" -#include "program/hash_table.h" #include "util/ralloc.h" +#include "util/string_to_uint_map.h" /**********************************************************************/ /*** Shader object functions ***/ |