Mesa (master): compiler: Move blob up a level

[Jason Ekstrand]

Module: Mesa
Branch: master
Commit: 0e3bd56c6ea783dbc93fce71cec98ab859782a81
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0e3bd56c6ea783dbc93fce71cec98ab859782a81

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Wed Oct 11 09:54:55 2017 -0700

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 <nicolai.haehnle at amd.com>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>

---

 src/compiler/Makefile.sources            | 4 ++--
 src/compiler/{glsl => }/blob.c           | 0
 src/compiler/{glsl => }/blob.h           | 0
 src/compiler/glsl/meson.build            | 3 ---
 src/compiler/meson.build                 | 3 +++
 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 352631a75a..2724a41286 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
similarity index 100%
rename from src/compiler/glsl/blob.c
rename to src/compiler/blob.c
diff --git a/src/compiler/glsl/blob.h b/src/compiler/blob.h
similarity index 100%
rename from src/compiler/glsl/blob.h
rename to src/compiler/blob.h
diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build
index 1d7e40b55b..d1a75eb8c3 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 58d52e4c6c..783be11c92 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 f9e46158dc..090d7d85cc 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"