[Mesa-dev] [PATCH] android, autotools: st/mesa: fix location of float64_glsl.h

[Tapani Pälli]

Hi;

On 3/3/19 10:10 PM, Mauro Rossi wrote:
> Necessary to avoid building error in Android,
> due to 'compiler/glsl/float64_glsl.h' file not found
> 
> Fixes: cb4e3e3 ("st/mesa: add support for lowering fp64/int64 for nir drivers")
> Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>
> ---
>   src/mesa/Android.libmesa_st_mesa.mk       | 1 +
>   src/mesa/Makefile.sources                 | 1 +
>   src/mesa/state_tracker/st_glsl_to_nir.cpp | 2 +-
>   3 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/src/mesa/Android.libmesa_st_mesa.mk b/src/mesa/Android.libmesa_st_mesa.mk
> index ddfd03059c..c5b16cad34 100644
> --- a/src/mesa/Android.libmesa_st_mesa.mk
> +++ b/src/mesa/Android.libmesa_st_mesa.mk
> @@ -58,6 +58,7 @@ endif
>   LOCAL_C_INCLUDES := \
>   	$(MESA_TOP)/src/mapi \
>   	$(MESA_TOP)/src/mesa/main \
> +	$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_glsl,,) \
>   	$(MESA_TOP)/src/compiler/nir \
>   	$(MESA_TOP)/src/gallium/auxiliary \
>   	$(MESA_TOP)/src/gallium/include
> diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources
> index 1e25f47e50..69f32c6adf 100644
> --- a/src/mesa/Makefile.sources
> +++ b/src/mesa/Makefile.sources
> @@ -689,6 +689,7 @@ INCLUDE_DIRS = \
>   	-I$(top_srcdir)/include \
>   	-I$(top_builddir)/src \
>   	-I$(top_srcdir)/src \
> +	-I$(top_builddir)/src/compiler \
>   	-I$(top_builddir)/src/compiler/glsl \
>   	-I$(top_builddir)/src/compiler/nir \
>   	-I$(top_builddir)/src/mesa \
> diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
> index a1e3b6233c..ad77b746ab 100644
> --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
> +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
> @@ -48,7 +48,7 @@
>   #include "compiler/glsl/ir.h"
>   #include "compiler/glsl/ir_optimization.h"
>   #include "compiler/glsl/string_to_uint_map.h"
> -#include "compiler/glsl/float64_glsl.h"
> +#include "glsl/float64_glsl.h"

Looks familiar :)

https://github.com/tpalli/external-mesa/commit/ebd8581ad133206ec2b1b818e98dc4f8401af8de

Before going further though, I'd like to understand why do we have both 
'compiler/glsl/' and 'glsl/' going on. Should we rather put the 
'compiler' back in the header generation? I can't remember the full 
story behind commit c812c740e60 but that one changed this .. perhaps we 
should pull it back and have the 'compiler/', any objections to that?

Thanks;

// Tapani