diff options
| author | Kristian Høgsberg Kristensen <kristian.h.kristensen@intel.com> | 2016-01-08 15:23:56 -0800 |
|---|---|---|
| committer | Kristian Høgsberg Kristensen <kristian.h.kristensen@intel.com> | 2016-01-08 16:15:49 -0800 |
| commit | 81f7fd3c54fa231081ceaf6e17af23e34a786c58 (patch) | |
| tree | 241f5b9734fcc76afc597219dbbdb44380503005 | |
| parent | e3706a7118cb572077c877b92450dc955e7a6754 (diff) | |
glsl: Don't add nir files to libglsl_la_SOURCES
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.
Tested-by: Brian Paul <brianp@vmware.com>
| -rw-r--r-- | src/glsl/Makefile.am | 4 | ||||
| -rw-r--r-- | src/glsl/Makefile.sources | 7 | ||||
| -rw-r--r-- | src/glsl/SConscript | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am index 33a34e4ccc..95efdb327c 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 4da9b07289..fd28f5cedd 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 = \ diff --git a/src/glsl/SConscript b/src/glsl/SConscript index 70bf5b09c3..a9d38c163b 100644 --- a/src/glsl/SConscript +++ b/src/glsl/SConscript @@ -65,6 +65,7 @@ for l in ('LIBGLCPP_FILES', 'LIBGLSL_FILES'): # XXX: Remove this once we build NIR and NIR_FILES. glsl_sources += [ 'nir/glsl_types.cpp', + 'nir/shader_enums.c', ] if env['msvc']: |