From: Kristian Høgsberg Kristensen Date: Fri, 8 Jan 2016 20:35:18 +0000 (-0800) Subject: glsl: Move glsl_to_nir files to LIBGLSL_FILES X-Git-Tag: upstream/17.1.0~13292 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e97caba1f6c2bd803f9c8b969b52c21f93daf1d0;p=platform%2Fupstream%2Fmesa.git glsl: Move glsl_to_nir files to LIBGLSL_FILES libglsl_la_SOURCES includes both NIR_FILES and LIBGLSL_FILES, so for libglsl.la consumers, this is a no-op. libnir.la however no longer uses any GLSL IR infrastructure and can be used without also linking to libglsl.la. Acked-by: Matt Turner --- diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources index fc10f14..4da9b07 100644 --- a/src/glsl/Makefile.sources +++ b/src/glsl/Makefile.sources @@ -18,8 +18,6 @@ NIR_GENERATED_FILES = \ nir/nir_opt_algebraic.c NIR_FILES = \ - nir/glsl_to_nir.cpp \ - nir/glsl_to_nir.h \ nir/glsl_types.cpp \ nir/glsl_types.h \ nir/builtin_type_macros.h \ @@ -184,6 +182,8 @@ 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 \