[1/3] android: glsl: fix fp64 generated source path

Submitted by Mauro Rossi on Feb. 2, 2019, 10:29 a.m.

Details

Message ID 20190202102956.16679-1-issor.oruam@gmail.com
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in Mesa

Not browsing as part of any series.

Commit Message

Mauro Rossi Feb. 2, 2019, 10:29 a.m.
Porting of commit 7d7b308 ("automake: Fix path to generated source")
to Android build system

Fixes the following building error:
ninja: error: '.../x86/gen/STATIC_LIBRARIES/libmesa_glsl_intermediates/glsl/float64_glsl.h',
needed by '.../x86/obj/STATIC_LIBRARIES/libmesa_glsl_intermediates/glsl/float64_glsl.h',
missing and no known rule to make it

Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
Fixes: 7d7b308 ("automake: Fix path to generated source")
Fixes: b63a1f8 ("glsl: Create file to contain software fp64 functions")
Cc: 19.0 <mesa-stable@lists.freedesktop.org>
---
 src/compiler/Android.glsl.gen.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/src/compiler/Android.glsl.gen.mk b/src/compiler/Android.glsl.gen.mk
index e31eb6f101..3b94ea7bd2 100644
--- a/src/compiler/Android.glsl.gen.mk
+++ b/src/compiler/Android.glsl.gen.mk
@@ -104,6 +104,6 @@  $(intermediates)/glsl/ir_expression_operation_strings.h: $(LOCAL_PATH)/glsl/ir_e
 	@mkdir -p $(dir $@)
 	$(hide) $(MESA_PYTHON2) $< strings > $@
 
-$(intermediates)/compiler/glsl/float64_glsl.h: $(LOCAL_PATH)/glsl/xxd.py
+$(intermediates)/glsl/float64_glsl.h: $(LOCAL_PATH)/glsl/xxd.py
 	@mkdir -p $(dir $@)
 	$(hide) $(MESA_PYTHON2) $< $(MESA_TOP)/src/compiler/glsl/float64.glsl $@ -n float64_source > $@

Comments

Hi,
sorry I just saw that there is a similar correction is already in both
19.0 and master branches
but I missed it because I searched only in mesa-dev ML

Please Dylan, just check if the 3rd patch makes sense or not necessary at all.
Mauro

On Sat, Feb 2, 2019 at 11:30 AM Mauro Rossi <issor.oruam@gmail.com> wrote:
>
> Porting of commit 7d7b308 ("automake: Fix path to generated source")
> to Android build system
>
> Fixes the following building error:
> ninja: error: '.../x86/gen/STATIC_LIBRARIES/libmesa_glsl_intermediates/glsl/float64_glsl.h',
> needed by '.../x86/obj/STATIC_LIBRARIES/libmesa_glsl_intermediates/glsl/float64_glsl.h',
> missing and no known rule to make it
>
> Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
> Fixes: 7d7b308 ("automake: Fix path to generated source")
> Fixes: b63a1f8 ("glsl: Create file to contain software fp64 functions")
> Cc: 19.0 <mesa-stable@lists.freedesktop.org>
> ---
>  src/compiler/Android.glsl.gen.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/compiler/Android.glsl.gen.mk b/src/compiler/Android.glsl.gen.mk
> index e31eb6f101..3b94ea7bd2 100644
> --- a/src/compiler/Android.glsl.gen.mk
> +++ b/src/compiler/Android.glsl.gen.mk
> @@ -104,6 +104,6 @@ $(intermediates)/glsl/ir_expression_operation_strings.h: $(LOCAL_PATH)/glsl/ir_e
>         @mkdir -p $(dir $@)
>         $(hide) $(MESA_PYTHON2) $< strings > $@
>
> -$(intermediates)/compiler/glsl/float64_glsl.h: $(LOCAL_PATH)/glsl/xxd.py
> +$(intermediates)/glsl/float64_glsl.h: $(LOCAL_PATH)/glsl/xxd.py
>         @mkdir -p $(dir $@)
>         $(hide) $(MESA_PYTHON2) $< $(MESA_TOP)/src/compiler/glsl/float64.glsl $@ -n float64_source > $@
> --
> 2.19.1
>