[Mesa-dev] [PATCH 03/17] compiler: Fold shader_cache in with libglsl sources

[Nicolai Hähnle]

On 09.11.2017 07:42, Jordan Justen wrote:
> It appears that we include the shader cache sources into libglsl
> regardless.
> 
> The Meson build already does this.
> 
> Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>

Patches 1-3:

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>


> ---
>   src/compiler/Android.glsl.mk  | 3 +--
>   src/compiler/Makefile.glsl.am | 3 +--
>   src/compiler/Makefile.sources | 6 ++----
>   3 files changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/src/compiler/Android.glsl.mk b/src/compiler/Android.glsl.mk
> index 0aabafa2673..8533830833f 100644
> --- a/src/compiler/Android.glsl.mk
> +++ b/src/compiler/Android.glsl.mk
> @@ -35,8 +35,7 @@ include $(CLEAR_VARS)
>   
>   LOCAL_SRC_FILES := \
>   	$(LIBGLCPP_FILES) \
> -	$(LIBGLSL_FILES) \
> -	$(LIBGLSL_SHADER_CACHE_FILES)
> +	$(LIBGLSL_FILES)
>   
>   LOCAL_C_INCLUDES := \
>   	$(MESA_TOP)/src/mapi \
> diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am
> index 179f415fe6f..11ff14b2852 100644
> --- a/src/compiler/Makefile.glsl.am
> +++ b/src/compiler/Makefile.glsl.am
> @@ -134,8 +134,7 @@ glsl_libglsl_la_LIBADD = \
>   
>   glsl_libglsl_la_SOURCES =				\
>   	$(LIBGLSL_GENERATED_FILES)			\
> -	$(LIBGLSL_FILES)				\
> -	$(LIBGLSL_SHADER_CACHE_FILES)
> +	$(LIBGLSL_FILES)
>   
>   glsl_libstandalone_la_SOURCES = \
>   	$(GLSL_COMPILER_CXX_FILES)
> diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources
> index abcd8c6641f..f7eb69dc2bc 100644
> --- a/src/compiler/Makefile.sources
> +++ b/src/compiler/Makefile.sources
> @@ -141,13 +141,11 @@ LIBGLSL_FILES = \
>   	glsl/propagate_invariance.cpp \
>   	glsl/s_expression.cpp \
>   	glsl/s_expression.h \
> +	glsl/shader_cache.cpp \
> +	glsl/shader_cache.h \
>   	glsl/string_to_uint_map.cpp \
>   	glsl/string_to_uint_map.h
>   
> -LIBGLSL_SHADER_CACHE_FILES = \
> -	glsl/shader_cache.cpp \
> -	glsl/shader_cache.h
> -
>   # glsl_compiler
>   
>   GLSL_COMPILER_CXX_FILES = \
> 


-- 
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.