[Mesa-dev] [PATCH 03/11] compiler: Move blob up a level

[Jordan Justen]

Didn't you have the same patch written by Connor in your nir-serialize
series? :)

-Jordan

On 2017-10-11 13:38:43, Jason Ekstrand wrote:
> We're going to want to use the blob for Vulkan pipeline caching so it
> makes sense to have it in libcompiler not libglsl.
> ---
>  src/compiler/Makefile.sources            | 4 ++--
>  src/compiler/{glsl => }/blob.c           | 0
>  src/compiler/{glsl => }/blob.h           | 0
>  src/mesa/state_tracker/st_shader_cache.h | 2 +-
>  4 files changed, 3 insertions(+), 3 deletions(-)
>  rename src/compiler/{glsl => }/blob.c (100%)
>  rename src/compiler/{glsl => }/blob.h (100%)
> 
> diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources
> index 36906f4..b500368 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/mesa/state_tracker/st_shader_cache.h b/src/mesa/state_tracker/st_shader_cache.h
> index f9e4615..090d7d8 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"
> -- 
> 2.5.0.400.gff86faf
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev