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>

diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index 33a34e4ccc8b50133a18d4d84c58ec6aa986ddea..95efdb327c1af159beaa27618c43ec3660213a0c 100644 (file)
--- 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 4da9b0728928849da432c9fb76d1a32b277b7849..fd28f5cedda4ab3f94f5afd079cfe85717b47f1c 100644 (file)
--- 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 70bf5b09c3c8846023d28a7686a1bef12a2ee845..a9d38c163b71c0a44e3e674e90b6a14d3b4c1c2c 100644 (file)
--- 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']: