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

[Eric Engestrom]

On Sunday, 2019-03-03 21:10:50 +0100, 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"
>  
>  static int
>  type_size(const struct glsl_type *type)
> -- 
> 2.19.1
> 

I think you'll need this to avoid breaking meson:

---8<---
diff --git a/src/mesa/meson.build b/src/mesa/meson.build
index d8a5682f6a0b84134ae7..d0edd71df09c8d23b4e3 100644
--- a/src/mesa/meson.build
+++ b/src/mesa/meson.build
@@ -736,7 +736,7 @@ libmesa_gallium = static_library(
   [files_libmesa_common, files_libmesa_gallium],
   c_args : [c_vis_args, c_msvc_compat_args],
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-  include_directories : [inc_common, inc_libmesa_asm, include_directories('main')],
+  include_directories : [inc_common, inc_compiler, inc_libmesa_asm, include_directories('main')],
   link_with : [libglsl, libmesa_sse41],
   dependencies : [idep_nir_headers, dep_vdpau],
   build_by_default : false,
--->8---