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

[Kristensen, Kristian H]

On Fri, Jan 8, 2016 at 4:12 PM, Brian Paul <brianp at vmware.com> wrote:
> Yes, this fixes things.  Thanks, Kristian!
>
> Tested-by: Brian Paul <brianp at vmware.com>

Thanks for testing - I've pushed the fix.

Kristian

>
> On 01/08/2016 05:07 PM, 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.
>> ---
>>
>> Ok, this one adds shader_enums.c to the SCons build, should fix
>> the issue Brian saw.
>>
>> Kristian
>>
>>   src/glsl/Makefile.am      | 4 ++--
>>   src/glsl/Makefile.sources | 7 +++++--
>>   src/glsl/SConscript       | 1 +
>>   3 files changed, 8 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 = \
>> diff --git a/src/glsl/SConscript b/src/glsl/SConscript
>> index 70bf5b0..a9d38c1 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']:
>>
>