<div dir="auto">Hi,<div dir="auto">Sounds good to me. </div><div dir="auto"><br></div><div dir="auto">The way it could have been prevented was to avoid having fp64 generated file as the only one with with different path in sources.</div><div dir="auto"><br></div><div dir="auto">Could you just confirm that inc_compiler is not needed in src/mesa/meson.build, and provide R-b so that I will proceed with push?</div><div dir="auto"><br></div><div dir="auto">I've tried to build with meson and it's ok</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Il lun 4 mar 2019, 18:59 Dylan Baker <<a href="mailto:dylan@pnwbakers.com" rel="noreferrer noreferrer noreferrer" target="_blank">dylan@pnwbakers.com</a>> ha scritto:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Quoting Mauro Rossi (2019-03-04 01:21:05)<br> > Hi Tapani,<br> > On Mon, Mar 4, 2019 at 6:51 AM Tapani Pälli <<a href="mailto:tapani.palli@intel.com" rel="noreferrer noreferrer noreferrer noreferrer" target="_blank">tapani.palli@intel.com</a>> wrote:<br> > ><br> > > Hi;<br> > ><br> > > On 3/3/19 10:10 PM, Mauro Rossi wrote:<br> > > > Necessary to avoid building error in Android,<br> > > > due to 'compiler/glsl/float64_glsl.h' file not found<br> > > ><br> > > > Fixes: cb4e3e3 ("st/mesa: add support for lowering fp64/int64 for nir drivers")<br> > > > Signed-off-by: Mauro Rossi <<a href="mailto:issor.oruam@gmail.com" rel="noreferrer noreferrer noreferrer noreferrer" target="_blank">issor.oruam@gmail.com</a>><br> > > > ---<br> > > > src/mesa/<a href="http://Android.libmesa_st_mesa.mk" rel="noreferrer noreferrer noreferrer noreferrer noreferrer" target="_blank">Android.libmesa_st_mesa.mk</a> | 1 +<br> > > > src/mesa/Makefile.sources | 1 +<br> > > > src/mesa/state_tracker/st_glsl_to_nir.cpp | 2 +-<br> > > > 3 files changed, 3 insertions(+), 1 deletion(-)<br> > > ><br> > > > diff --git a/src/mesa/<a href="http://Android.libmesa_st_mesa.mk" rel="noreferrer noreferrer noreferrer noreferrer noreferrer" target="_blank">Android.libmesa_st_mesa.mk</a> b/src/mesa/<a href="http://Android.libmesa_st_mesa.mk" rel="noreferrer noreferrer noreferrer noreferrer noreferrer" target="_blank">Android.libmesa_st_mesa.mk</a><br> > > > index ddfd03059c..c5b16cad34 100644<br> > > > --- a/src/mesa/<a href="http://Android.libmesa_st_mesa.mk" rel="noreferrer noreferrer noreferrer noreferrer noreferrer" target="_blank">Android.libmesa_st_mesa.mk</a><br> > > > +++ b/src/mesa/<a href="http://Android.libmesa_st_mesa.mk" rel="noreferrer noreferrer noreferrer noreferrer noreferrer" target="_blank">Android.libmesa_st_mesa.mk</a><br> > > > @@ -58,6 +58,7 @@ endif<br> > > > LOCAL_C_INCLUDES := \<br> > > > $(MESA_TOP)/src/mapi \<br> > > > $(MESA_TOP)/src/mesa/main \<br> > > > + $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_glsl,,) \<br> > > > $(MESA_TOP)/src/compiler/nir \<br> > > > $(MESA_TOP)/src/gallium/auxiliary \<br> > > > $(MESA_TOP)/src/gallium/include<br> > > > diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources<br> > > > index 1e25f47e50..69f32c6adf 100644<br> > > > --- a/src/mesa/Makefile.sources<br> > > > +++ b/src/mesa/Makefile.sources<br> > > > @@ -689,6 +689,7 @@ INCLUDE_DIRS = \<br> > > > -I$(top_srcdir)/include \<br> > > > -I$(top_builddir)/src \<br> > > > -I$(top_srcdir)/src \<br> > > > + -I$(top_builddir)/src/compiler \<br> > > > -I$(top_builddir)/src/compiler/glsl \<br> > > > -I$(top_builddir)/src/compiler/nir \<br> > > > -I$(top_builddir)/src/mesa \<br> > > > diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp<br> > > > index a1e3b6233c..ad77b746ab 100644<br> > > > --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp<br> > > > +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp<br> > > > @@ -48,7 +48,7 @@<br> > > > #include "compiler/glsl/ir.h"<br> > > > #include "compiler/glsl/ir_optimization.h"<br> > > > #include "compiler/glsl/string_to_uint_map.h"<br> > > > -#include "compiler/glsl/float64_glsl.h"<br> > > > +#include "glsl/float64_glsl.h"<br> > ><br> > > Looks familiar :)<br> > ><br> > > <a href="https://github.com/tpalli/external-mesa/commit/ebd8581ad133206ec2b1b818e98dc4f8401af8de" rel="noreferrer noreferrer noreferrer noreferrer noreferrer" target="_blank">https://github.com/tpalli/external-mesa/commit/ebd8581ad133206ec2b1b818e98dc4f8401af8de</a><br> > ><br> > > Before going further though, I'd like to understand why do we have both<br> > > 'compiler/glsl/' and 'glsl/' going on. Should we rather put the<br> > > 'compiler' back in the header generation? I can't remember the full<br> > > story behind commit c812c740e60 but that one changed this .. perhaps we<br> > > should pull it back and have the 'compiler/', any objections to that?<br> > ><br> > <br> > I agree that simply continue to have include "compiler/glsl/float64_glsl.h"<br> > in all sources places would be simpler<br> > and should not break neither autotools nor meson,<br> > which may continue to have glsl/float64_glsl.h in their generators<br> > <br> > Mauro<br> <br> I wrote c812, and I'd be very happy to revert it. The problem that I ran into<br> was putting it in a place that android, meson, and the autotools dist tarball<br> were happy with. I'm hoping that we can remove autotools in the very near future<br> and just revert c812 at that time. Does that seem like a reasonable solution?<br> <br> Dylan<br> </blockquote></div>