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

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 \

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,
 )
 

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,
 )
 

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"