diff options
| author | Jason Ekstrand <[email protected]> | 2017-10-11 09:54:55 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2017-10-12 21:47:06 -0700 |
| commit | 0e3bd56c6ea783dbc93fce71cec98ab859782a81 (patch) | |
| tree | dfa876c14ea1262aa61ba88b166351f2660fa71c /src | |
| parent | 8f42a43d08d761101dfcb07e204282464edd5fbe (diff) | |
compiler: Move blob up a level
We're going to want to use the blob for Vulkan pipeline caching so it
makes sense to have it in libcompiler not libglsl.
Reviewed-by: Nicolai Hähnle <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/Makefile.sources | 4 | ||||
| -rw-r--r-- | src/compiler/blob.c (renamed from src/compiler/glsl/blob.c) | 0 | ||||
| -rw-r--r-- | src/compiler/blob.h (renamed from src/compiler/glsl/blob.h) | 0 | ||||
| -rw-r--r-- | src/compiler/glsl/meson.build | 3 | ||||
| -rw-r--r-- | src/compiler/meson.build | 3 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_shader_cache.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources index 352631a75ad..2724a41286e 100644 --- a/src/compiler/Makefile.sources +++ b/src/compiler/Makefile.sources @@ -1,4 +1,6 @@ LIBCOMPILER_FILES = \ + blob.c \ + blob.h \ builtin_type_macros.h \ glsl_types.cpp \ glsl_types.h \ @@ -17,8 +19,6 @@ LIBGLSL_FILES = \ glsl/ast_function.cpp \ glsl/ast_to_hir.cpp \ glsl/ast_type.cpp \ - glsl/blob.c \ - glsl/blob.h \ glsl/builtin_functions.cpp \ glsl/builtin_functions.h \ glsl/builtin_int64.h \ diff --git a/src/compiler/glsl/blob.c b/src/compiler/blob.c index 65e1376e160..65e1376e160 100644 --- a/src/compiler/glsl/blob.c +++ b/src/compiler/blob.c diff --git a/src/compiler/glsl/blob.h b/src/compiler/blob.h index 4cbbb01b15d..4cbbb01b15d 100644 --- a/src/compiler/glsl/blob.h +++ b/src/compiler/blob.h diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build index 1d7e40b55be..d1a75eb8c36 100644 --- a/src/compiler/glsl/meson.build +++ b/src/compiler/glsl/meson.build @@ -58,8 +58,6 @@ files_libglsl = files( 'ast_function.cpp', 'ast_to_hir.cpp', 'ast_type.cpp', - 'blob.c', - 'blob.h', 'builtin_functions.cpp', 'builtin_functions.h', 'builtin_int64.h', @@ -205,7 +203,6 @@ libglsl = static_library( cpp_args : [cpp_vis_args, cpp_msvc_compat_args], link_with : [libnir, libglcpp], include_directories : [inc_common, inc_compiler, inc_nir], - dependencies : [dep_valgrind], build_by_default : false, ) diff --git a/src/compiler/meson.build b/src/compiler/meson.build index 58d52e4c6cb..783be11c926 100644 --- a/src/compiler/meson.build +++ b/src/compiler/meson.build @@ -23,6 +23,8 @@ inc_nir = include_directories('nir') inc_glsl = include_directories('glsl') files_libcompiler = files( + 'blob.c', + 'blob.h', 'builtin_type_macros.h', 'glsl_types.cpp', 'glsl_types.h', @@ -47,6 +49,7 @@ libcompiler = static_library( include_directories : [inc_mapi, inc_mesa, inc_compiler, inc_common], c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], cpp_args : [cpp_vis_args, cpp_msvc_compat_args], + dependencies : [dep_valgrind], build_by_default : false, ) diff --git a/src/mesa/state_tracker/st_shader_cache.h b/src/mesa/state_tracker/st_shader_cache.h index f9e46158dc0..090d7d85cc8 100644 --- a/src/mesa/state_tracker/st_shader_cache.h +++ b/src/mesa/state_tracker/st_shader_cache.h @@ -22,7 +22,7 @@ */ #include "st_context.h" -#include "compiler/glsl/blob.h" +#include "compiler/blob.h" #include "main/mtypes.h" #include "pipe/p_state.h" #include "util/disk_cache.h" |