Re: [Mesa-dev] [PATCH 2/3] android: anv: add dependency on libnativewindow for O and later
Thanks Mauro! Reviewed-by: Tapani Pälli On 02/08/2018 02:21 AM, Mauro Rossi wrote: How about introducing ANV_LIBRARIES (near to ANV_INCLUDES) and setting libdrm and libnativewindow there, then for each libanv just have the $(ANV_LIBRARIES)? IMO this would make it cleaner to add new libs like we do here. In Android-IA we've just had the libnativewindow include path (since that is enough) but this is more cleaner way. Hi, I'm sending the updated [PATCH 2/3] From 3960954f7037cd4dc248fe7f5b5b932d1d662a14 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Mon, 5 Feb 2018 22:15:52 +0100 Subject: [PATCH] android: anv: add dependency on libnativewindow for O and later Similar to 90dd6e5 ("Android: egl: add dependency on libnativewindow") Fixes the following building errors: In file included from external/mesa/src/intel/vulkan/gen7_cmd_buffer.c:30: In file included from external/mesa/src/intel/vulkan/anv_private.h:72: external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal error: 'system/window.h' file not found ^ 1 error generated. ... In file included from external/mesa/src/intel/vulkan/anv_gem.c:32: In file included from external/mesa/src/intel/vulkan/anv_private.h:72: external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal error: 'system/window.h' file not found ^ 1 error generated. --- src/intel/Android.vulkan.mk | 20 +--- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk index 5c8c947136..dfc78e5289 100644 --- a/src/intel/Android.vulkan.mk +++ b/src/intel/Android.vulkan.mk @@ -85,6 +85,12 @@ ANV_INCLUDES := \ $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_common,,)/vulkan \ $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_util,,)/util +ANV_SHARED_LIBRARIES := libdrm + +ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) +ANV_SHARED_LIBRARIES += libnativewindow +endif + # # libanv for gen7 # @@ -100,7 +106,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES) LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -120,7 +126,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES) LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -140,7 +146,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES) LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -160,7 +166,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES) LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -180,7 +186,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES) LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -236,7 +242,7 @@ $(intermediates)/vulkan/anv_extensions.h: --xml $(MESA_TOP)/src/vulkan/registry/vk_android_native_buffer.xml \ --out-h $@ -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -283,7 +289,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ libmesa_intel_compiler \ libmesa_anv_entrypoints -LOCAL_SHARED_LIBRARIES := libdrm libz libsync liblog +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) libz libsync liblog include $(MESA_COMMON_MK) include $(BUILD_SHARED_LIBRARY) ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 2/3] android: anv: add dependency on libnativewindow for O and later
> How about introducing ANV_LIBRARIES (near to ANV_INCLUDES) and setting > libdrm and libnativewindow there, then for each libanv just have the > $(ANV_LIBRARIES)? > > IMO this would make it cleaner to add new libs like we do here. In > Android-IA we've just had the libnativewindow include path (since that is > enough) but this is more cleaner way. Hi, I'm sending the updated [PATCH 2/3] >From 3960954f7037cd4dc248fe7f5b5b932d1d662a14 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Mon, 5 Feb 2018 22:15:52 +0100 Subject: [PATCH] android: anv: add dependency on libnativewindow for O and later Similar to 90dd6e5 ("Android: egl: add dependency on libnativewindow") Fixes the following building errors: In file included from external/mesa/src/intel/vulkan/gen7_cmd_buffer.c:30: In file included from external/mesa/src/intel/vulkan/anv_private.h:72: external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal error: 'system/window.h' file not found ^ 1 error generated. ... In file included from external/mesa/src/intel/vulkan/anv_gem.c:32: In file included from external/mesa/src/intel/vulkan/anv_private.h:72: external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal error: 'system/window.h' file not found ^ 1 error generated. --- src/intel/Android.vulkan.mk | 20 +--- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk index 5c8c947136..dfc78e5289 100644 --- a/src/intel/Android.vulkan.mk +++ b/src/intel/Android.vulkan.mk @@ -85,6 +85,12 @@ ANV_INCLUDES := \ $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_common,,)/vulkan \ $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_util,,)/util +ANV_SHARED_LIBRARIES := libdrm + +ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) +ANV_SHARED_LIBRARIES += libnativewindow +endif + # # libanv for gen7 # @@ -100,7 +106,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES) LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -120,7 +126,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES) LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -140,7 +146,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES) LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -160,7 +166,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES) LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -180,7 +186,7 @@ LOCAL_C_INCLUDES := $(ANV_INCLUDES) LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -236,7 +242,7 @@ $(intermediates)/vulkan/anv_extensions.h: --xml $(MESA_TOP)/src/vulkan/registry/vk_android_native_buffer.xml \ --out-h $@ -LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -283,7 +289,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ libmesa_intel_compiler \ libmesa_anv_entrypoints -LOCAL_SHARED_LIBRARIES := libdrm libz libsync liblog +LOCAL_SHARED_LIBRARIES := $(ANV_SHARED_LIBRARIES) libz libsync liblog include $(MESA_COMMON_MK) include $(BUILD_SHARED_LIBRARY) -- 2.14.1 From 3960954f7037cd4dc248fe7f5b5b932d1d662a14 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Mon, 5 Feb 2018 22:15:52 +0100 Subject: [PATCH] android: anv: add dependency on libnativewindow for O and later Similar to 90dd6e5 ("Android: egl: add dependency on libnativewindow") Fixes the following building errors: In file included from external/mesa/src/intel/vulkan/gen7_cmd_buffer.c:30: In file included from external/mesa/src/intel/vulkan/anv_private.h:72: external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal error: 'system/window.h' file not found ^ 1 error generated. ... In file included from external/mesa/src/intel/vulkan/anv_gem.c:32: In file included from external/mesa/src/intel/vulkan/anv_private.h:72: external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal error: 'system/window.h' file not found ^ 1 error generated. --- src/intel/Android.vulkan.mk | 20 +--- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/intel/A
Re: [Mesa-dev] [PATCH 2/3] android: anv: add dependency on libnativewindow for O and later
On 5 February 2018 at 08:09, Tapani Pälli wrote: > Hi; > > > On 02/04/2018 11:57 PM, Mauro Rossi wrote: >> >> Similar to 90dd6e5 ("Android: egl: add dependency on libnativewindow") >> >> Fixes the following building errors: >> >> In file included from external/mesa/src/intel/vulkan/gen7_cmd_buffer.c:30: >> In file included from external/mesa/src/intel/vulkan/anv_private.h:72: >> external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal >> error: 'system/window.h' file not found >> ^ >> 1 error generated. >> ... >> In file included from external/mesa/src/intel/vulkan/anv_gem.c:32: >> In file included from external/mesa/src/intel/vulkan/anv_private.h:72: >> external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal >> error: 'system/window.h' file not found >> ^ >> 1 error generated. >> >> Cc: "18.0" >> --- >> src/intel/Android.vulkan.mk | 28 >> 1 file changed, 28 insertions(+) >> >> diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk >> index 5c8c947136..3a6870097b 100644 >> --- a/src/intel/Android.vulkan.mk >> +++ b/src/intel/Android.vulkan.mk >> @@ -102,6 +102,10 @@ LOCAL_WHOLE_STATIC_LIBRARIES := >> libmesa_anv_entrypoints libmesa_genxml >> LOCAL_SHARED_LIBRARIES := libdrm >> +ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) >> +LOCAL_SHARED_LIBRARIES += libnativewindow >> +endif >> + > > > How about introducing ANV_LIBRARIES (near to ANV_INCLUDES) and setting > libdrm and libnativewindow there, then for each libanv just have the > $(ANV_LIBRARIES)? > > IMO this would make it cleaner to add new libs like we do here. In > Android-IA we've just had the libnativewindow include path (since that is > enough) but this is more cleaner way. > IIRC some (most?) versions of the Android build system do not understand header-only dependencies. Thus by using the shared/static library, we effectively ask to overlink the final binary, That aside (since we cannot do much about it), with Tapani's suggestions the series is Reviewed-by: Emil Velikov Mauro you have been providing good patches for a while. You can get commit access to push them to the master branch. Please check the instructions [1] and an example [2]. As a Tl;Dr; - create gpg and ssh keys - open a bug report + attach the public bits of ^^ [please add me to the CC list] Thanks Emil [1] https://www.freedesktop.org/wiki/AccountRequests/ [2] https://bugs.freedesktop.org/show_bug.cgi?id=103683 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 2/3] android: anv: add dependency on libnativewindow for O and later
Hi; On 02/04/2018 11:57 PM, Mauro Rossi wrote: Similar to 90dd6e5 ("Android: egl: add dependency on libnativewindow") Fixes the following building errors: In file included from external/mesa/src/intel/vulkan/gen7_cmd_buffer.c:30: In file included from external/mesa/src/intel/vulkan/anv_private.h:72: external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal error: 'system/window.h' file not found ^ 1 error generated. ... In file included from external/mesa/src/intel/vulkan/anv_gem.c:32: In file included from external/mesa/src/intel/vulkan/anv_private.h:72: external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal error: 'system/window.h' file not found ^ 1 error generated. Cc: "18.0" --- src/intel/Android.vulkan.mk | 28 1 file changed, 28 insertions(+) diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk index 5c8c947136..3a6870097b 100644 --- a/src/intel/Android.vulkan.mk +++ b/src/intel/Android.vulkan.mk @@ -102,6 +102,10 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml LOCAL_SHARED_LIBRARIES := libdrm +ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) +LOCAL_SHARED_LIBRARIES += libnativewindow +endif + How about introducing ANV_LIBRARIES (near to ANV_INCLUDES) and setting libdrm and libnativewindow there, then for each libanv just have the $(ANV_LIBRARIES)? IMO this would make it cleaner to add new libs like we do here. In Android-IA we've just had the libnativewindow include path (since that is enough) but this is more cleaner way. include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -122,6 +126,10 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml LOCAL_SHARED_LIBRARIES := libdrm +ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) +LOCAL_SHARED_LIBRARIES += libnativewindow +endif + include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -142,6 +150,10 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml LOCAL_SHARED_LIBRARIES := libdrm +ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) +LOCAL_SHARED_LIBRARIES += libnativewindow +endif + include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -162,6 +174,10 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml LOCAL_SHARED_LIBRARIES := libdrm +ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) +LOCAL_SHARED_LIBRARIES += libnativewindow +endif + include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -182,6 +198,10 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml LOCAL_SHARED_LIBRARIES := libdrm +ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) +LOCAL_SHARED_LIBRARIES += libnativewindow +endif + include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -238,6 +258,10 @@ $(intermediates)/vulkan/anv_extensions.h: LOCAL_SHARED_LIBRARIES := libdrm +ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) +LOCAL_SHARED_LIBRARIES += libnativewindow +endif + include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -285,5 +309,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := libdrm libz libsync liblog +ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) +LOCAL_SHARED_LIBRARIES += libnativewindow +endif + include $(MESA_COMMON_MK) include $(BUILD_SHARED_LIBRARY) ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 2/3] android: anv: add dependency on libnativewindow for O and later
Similar to 90dd6e5 ("Android: egl: add dependency on libnativewindow") Fixes the following building errors: In file included from external/mesa/src/intel/vulkan/gen7_cmd_buffer.c:30: In file included from external/mesa/src/intel/vulkan/anv_private.h:72: external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal error: 'system/window.h' file not found ^ 1 error generated. ... In file included from external/mesa/src/intel/vulkan/anv_gem.c:32: In file included from external/mesa/src/intel/vulkan/anv_private.h:72: external/mesa/include/vulkan/vk_android_native_buffer.h:22:10: fatal error: 'system/window.h' file not found ^ 1 error generated. Cc: "18.0" --- src/intel/Android.vulkan.mk | 28 1 file changed, 28 insertions(+) diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk index 5c8c947136..3a6870097b 100644 --- a/src/intel/Android.vulkan.mk +++ b/src/intel/Android.vulkan.mk @@ -102,6 +102,10 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml LOCAL_SHARED_LIBRARIES := libdrm +ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) +LOCAL_SHARED_LIBRARIES += libnativewindow +endif + include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -122,6 +126,10 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml LOCAL_SHARED_LIBRARIES := libdrm +ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) +LOCAL_SHARED_LIBRARIES += libnativewindow +endif + include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -142,6 +150,10 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml LOCAL_SHARED_LIBRARIES := libdrm +ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) +LOCAL_SHARED_LIBRARIES += libnativewindow +endif + include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -162,6 +174,10 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml LOCAL_SHARED_LIBRARIES := libdrm +ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) +LOCAL_SHARED_LIBRARIES += libnativewindow +endif + include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -182,6 +198,10 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml LOCAL_SHARED_LIBRARIES := libdrm +ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) +LOCAL_SHARED_LIBRARIES += libnativewindow +endif + include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -238,6 +258,10 @@ $(intermediates)/vulkan/anv_extensions.h: LOCAL_SHARED_LIBRARIES := libdrm +ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) +LOCAL_SHARED_LIBRARIES += libnativewindow +endif + include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) @@ -285,5 +309,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := libdrm libz libsync liblog +ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) +LOCAL_SHARED_LIBRARIES += libnativewindow +endif + include $(MESA_COMMON_MK) include $(BUILD_SHARED_LIBRARY) -- 2.14.1 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev