[Mesa-dev] [PATCH] glsl: Don't add nir files to libglsl_la_SOURCES

[Jose Fonseca]

Looks great. Thanks.

Reviewed-by: Jose Fonseca <jfonseca at vmware.com>

We really need to get NIR into SCons.  There's no reason not to.  It 
takes time, but when consider the time we all spend with build issues, 
it's probably not that much.

Jose

On 08/01/16 23:44, Kristian Høgsberg wrote:
> From: Kristian Høgsberg Kristensen <kristian.h.kristensen at intel.com>
>
> SCons doesn't understand nir yet and doesn't want to compile the glsl to
> nir pass. Move the files to their own variable so we can add it only for
> automake.
> ---
>
> I'm currently build testing this just to be sure, but this should fix
> the SCons build breakage in my previous commit.
>
> Kristian
>
>   src/glsl/Makefile.am      | 4 ++--
>   src/glsl/Makefile.sources | 7 +++++--
>   2 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
> index 33a34e4..95efdb3 100644
> --- a/src/glsl/Makefile.am
> +++ b/src/glsl/Makefile.am
> @@ -144,8 +144,8 @@ libglsl_la_SOURCES =					\
>   	glsl_parser.h					\
>   	$(LIBGLSL_FILES)				\
>   	$(NIR_FILES)					\
> -	$(NIR_GENERATED_FILES)
> -
> +	$(NIR_GENERATED_FILES)				\
> +	$(GLSL_TO_NIR_FILES)
>
>   libnir_la_SOURCES =					\
>   	$(NIR_FILES)					\
> diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
> index 4da9b07..fd28f5c 100644
> --- a/src/glsl/Makefile.sources
> +++ b/src/glsl/Makefile.sources
> @@ -182,8 +182,6 @@ LIBGLSL_FILES = \
>   	lower_output_reads.cpp \
>   	lower_shared_reference.cpp \
>   	lower_ubo_reference.cpp \
> -	nir/glsl_to_nir.cpp \
> -	nir/glsl_to_nir.h \
>   	opt_algebraic.cpp \
>   	opt_array_splitting.cpp \
>   	opt_conditional_discard.cpp \
> @@ -213,6 +211,11 @@ LIBGLSL_FILES = \
>   	s_expression.cpp \
>   	s_expression.h
>
> +# glsl to nir pass
> +GLSL_TO_NIR_FILES = \
> +	nir/glsl_to_nir.cpp \
> +	nir/glsl_to_nir.h
> +
>   # glsl_compiler
>
>   GLSL_COMPILER_CXX_FILES = \
>