Re: [Mesa-dev] [PATCH mesa] spirv: add missing include path
On Tuesday, 2017-07-18 15:32:27 -0700, Kenneth Graunke wrote: > On Tuesday, July 18, 2017 11:16:50 AM PDT Emil Velikov wrote: > > On 18 July 2017 at 19:03, Eric Engestrom wrote: > > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101831 > > > Signed-off-by: Eric Engestrom > > > --- > > > > > > Note: Android and SCons probably need a similar fix > > > --- > > > src/compiler/Makefile.nir.am | 3 +++ > > > 1 file changed, 3 insertions(+) > > > > > > diff --git a/src/compiler/Makefile.nir.am b/src/compiler/Makefile.nir.am > > > index 1533ee536d..002b9fc535 100644 > > > --- a/src/compiler/Makefile.nir.am > > > +++ b/src/compiler/Makefile.nir.am > > > @@ -32,6 +32,9 @@ nir_libnir_la_SOURCES = > > > \ > > > $(SPIRV_GENERATED_FILES)\ > > > $(NIR_GENERATED_FILES) > > > > > > +nir_libnir_la_SOURCES = \ > > > + -I$(top_builddir)/src/compiler/spirv > > > + > > This is off - the generated file is missing the srcdir, since it > > assumes the header to be in the same directory. > > > > Ken should have pushed a fix a second ago. > > -Emil > > ___ > > mesa-dev mailing list > > mesa-dev@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/mesa-dev > > Sorry, I checked the list for a fix, but missed your patch. > Hopefully it's fixed now, at any rate. > > --Ken No worries, my patch was wrong anyway. I was in a rush, copy/pasted something and it somehow compiled, so I sent it to the ML and left. Good thing you looked into it too and provided a correct patch :) ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH mesa] spirv: add missing include path
On Tuesday, July 18, 2017 11:16:50 AM PDT Emil Velikov wrote: > On 18 July 2017 at 19:03, Eric Engestrom wrote: > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101831 > > Signed-off-by: Eric Engestrom > > --- > > > > Note: Android and SCons probably need a similar fix > > --- > > src/compiler/Makefile.nir.am | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/src/compiler/Makefile.nir.am b/src/compiler/Makefile.nir.am > > index 1533ee536d..002b9fc535 100644 > > --- a/src/compiler/Makefile.nir.am > > +++ b/src/compiler/Makefile.nir.am > > @@ -32,6 +32,9 @@ nir_libnir_la_SOURCES = > > \ > > $(SPIRV_GENERATED_FILES)\ > > $(NIR_GENERATED_FILES) > > > > +nir_libnir_la_SOURCES = \ > > + -I$(top_builddir)/src/compiler/spirv > > + > This is off - the generated file is missing the srcdir, since it > assumes the header to be in the same directory. > > Ken should have pushed a fix a second ago. > -Emil > ___ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev Sorry, I checked the list for a fix, but missed your patch. Hopefully it's fixed now, at any rate. --Ken signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH mesa] spirv: add missing include path
On Tue, Jul 18, 2017 at 11:15 AM, Ian Romanick wrote: > I can believe the fix, but I don't understand why it's necessary. > spirv_info.c includes spriv_info.h in the same manner as before > 2dd4e2ec, and, as far as I can understand, spirv_info.c gets built in > the same way as before. Can someone explain to me why it broke? > ...because I don't want to break it again. > Out-of-tree builds. In that case, spirv_info.c is in the build directory but spirv_info.h is in the source directory. --Jason > On 07/18/2017 11:03 AM, Eric Engestrom wrote: > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101831 > > Signed-off-by: Eric Engestrom > > --- > > > > Note: Android and SCons probably need a similar fix > > --- > > src/compiler/Makefile.nir.am | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/src/compiler/Makefile.nir.am b/src/compiler/Makefile.nir.am > > index 1533ee536d..002b9fc535 100644 > > --- a/src/compiler/Makefile.nir.am > > +++ b/src/compiler/Makefile.nir.am > > @@ -32,6 +32,9 @@ nir_libnir_la_SOURCES = > \ > > $(SPIRV_GENERATED_FILES)\ > > $(NIR_GENERATED_FILES) > > > > +nir_libnir_la_SOURCES = \ > > + -I$(top_builddir)/src/compiler/spirv > > + > > nir/nir_builder_opcodes.h: nir/nir_opcodes.py > nir/nir_builder_opcodes_h.py > > $(MKDIR_GEN) > > $(PYTHON_GEN) $(srcdir)/nir/nir_builder_opcodes_h.py > $@ || > ($(RM) $@; false) > > > > ___ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev > ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH mesa] spirv: add missing include path
On 18 July 2017 at 19:03, Eric Engestrom wrote: > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101831 > Signed-off-by: Eric Engestrom > --- > > Note: Android and SCons probably need a similar fix > --- > src/compiler/Makefile.nir.am | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/src/compiler/Makefile.nir.am b/src/compiler/Makefile.nir.am > index 1533ee536d..002b9fc535 100644 > --- a/src/compiler/Makefile.nir.am > +++ b/src/compiler/Makefile.nir.am > @@ -32,6 +32,9 @@ nir_libnir_la_SOURCES = > \ > $(SPIRV_GENERATED_FILES)\ > $(NIR_GENERATED_FILES) > > +nir_libnir_la_SOURCES = \ > + -I$(top_builddir)/src/compiler/spirv > + This is off - the generated file is missing the srcdir, since it assumes the header to be in the same directory. Ken should have pushed a fix a second ago. -Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH mesa] spirv: add missing include path
I can believe the fix, but I don't understand why it's necessary. spirv_info.c includes spriv_info.h in the same manner as before 2dd4e2ec, and, as far as I can understand, spirv_info.c gets built in the same way as before. Can someone explain to me why it broke? ...because I don't want to break it again. On 07/18/2017 11:03 AM, Eric Engestrom wrote: > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101831 > Signed-off-by: Eric Engestrom > --- > > Note: Android and SCons probably need a similar fix > --- > src/compiler/Makefile.nir.am | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/src/compiler/Makefile.nir.am b/src/compiler/Makefile.nir.am > index 1533ee536d..002b9fc535 100644 > --- a/src/compiler/Makefile.nir.am > +++ b/src/compiler/Makefile.nir.am > @@ -32,6 +32,9 @@ nir_libnir_la_SOURCES = > \ > $(SPIRV_GENERATED_FILES)\ > $(NIR_GENERATED_FILES) > > +nir_libnir_la_SOURCES = \ > + -I$(top_builddir)/src/compiler/spirv > + > nir/nir_builder_opcodes.h: nir/nir_opcodes.py nir/nir_builder_opcodes_h.py > $(MKDIR_GEN) > $(PYTHON_GEN) $(srcdir)/nir/nir_builder_opcodes_h.py > $@ || ($(RM) $@; > false) > ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH mesa] spirv: add missing include path
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101831 Signed-off-by: Eric Engestrom --- Note: Android and SCons probably need a similar fix --- src/compiler/Makefile.nir.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/compiler/Makefile.nir.am b/src/compiler/Makefile.nir.am index 1533ee536d..002b9fc535 100644 --- a/src/compiler/Makefile.nir.am +++ b/src/compiler/Makefile.nir.am @@ -32,6 +32,9 @@ nir_libnir_la_SOURCES = \ $(SPIRV_GENERATED_FILES)\ $(NIR_GENERATED_FILES) +nir_libnir_la_SOURCES = \ + -I$(top_builddir)/src/compiler/spirv + nir/nir_builder_opcodes.h: nir/nir_opcodes.py nir/nir_builder_opcodes_h.py $(MKDIR_GEN) $(PYTHON_GEN) $(srcdir)/nir/nir_builder_opcodes_h.py > $@ || ($(RM) $@; false) -- Cheers, Eric ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
