Re: [Mesa-dev] [PATCH 3/4] android: radv: add Android.mk for vulkan.radv HAL module
On 26 July 2018 at 16:32, Mauro Rossi wrote: > Hello there, > Il giorno gio 26 lug 2018 alle ore 17:09 Mauro Rossi > ha scritto: >> >> Hi Emil, >> >> Il giorno gio 26 lug 2018 alle ore 16:48 Emil Velikov >> ha scritto: >> > >> > On 22 July 2018 at 09:14, Mauro Rossi wrote: >> > > radv implements the Android Vulkan HAL interface, this patch adds >> > > Android.mk building rules by porting of radv automake rules. >> > > vendor HAL module is installed as /vendor/lib/hw/vulkan.radv.so >> > > >> > > Signed-off-by: Mauro Rossi >> > > --- >> > > src/amd/vulkan/Android.mk | 166 ++ >> > >> > It would be great it this file is a bit closer to the ANV one, >> > although no clever ideas come to mind. >> >> As a Quick Win, I think I could pull up this of one level as >> src/amd/Android.vulkan.mk, >> perform the necessary changes in paths, modify 4/4 accordingly, >> test build and no regression and then and push to gitlab with those changes. >> >> No problem to do that. >> >> Please, let me know if I may send 3/4 and 4/4 for review >> to you, to avoid resubmitting and re-reviewing the full series. >> >> Is it ok for you? >> Mauro > > Well, I was too optimistic and considering only Android building rules, > it would require to modify also the automake rules and Makefile.sources > to accomodate the change in the relative path. > > At least the automake and Android for radv are aligned in the AS-IS serie. > > We can align radv to anv with another patch, but it is better to check > also with AMD developers that they agree to it. > Agreed - series seems fine as-is. Any extra tweaks can be done at a later stage. -Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 3/4] android: radv: add Android.mk for vulkan.radv HAL module
Hello there, Il giorno gio 26 lug 2018 alle ore 17:09 Mauro Rossi ha scritto: > > Hi Emil, > > Il giorno gio 26 lug 2018 alle ore 16:48 Emil Velikov > ha scritto: > > > > On 22 July 2018 at 09:14, Mauro Rossi wrote: > > > radv implements the Android Vulkan HAL interface, this patch adds > > > Android.mk building rules by porting of radv automake rules. > > > vendor HAL module is installed as /vendor/lib/hw/vulkan.radv.so > > > > > > Signed-off-by: Mauro Rossi > > > --- > > > src/amd/vulkan/Android.mk | 166 ++ > > > > It would be great it this file is a bit closer to the ANV one, > > although no clever ideas come to mind. > > As a Quick Win, I think I could pull up this of one level as > src/amd/Android.vulkan.mk, > perform the necessary changes in paths, modify 4/4 accordingly, > test build and no regression and then and push to gitlab with those changes. > > No problem to do that. > > Please, let me know if I may send 3/4 and 4/4 for review > to you, to avoid resubmitting and re-reviewing the full series. > > Is it ok for you? > Mauro Well, I was too optimistic and considering only Android building rules, it would require to modify also the automake rules and Makefile.sources to accomodate the change in the relative path. At least the automake and Android for radv are aligned in the AS-IS serie. We can align radv to anv with another patch, but it is better to check also with AMD developers that they agree to it. Mauro > > > > > With the Fixes tag in Patch 1/4, the series is > > Reviewed-by: Emil Velikov > > > > Thanks > > Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 3/4] android: radv: add Android.mk for vulkan.radv HAL module
Hi Emil, Il giorno gio 26 lug 2018 alle ore 16:48 Emil Velikov ha scritto: > > On 22 July 2018 at 09:14, Mauro Rossi wrote: > > radv implements the Android Vulkan HAL interface, this patch adds > > Android.mk building rules by porting of radv automake rules. > > vendor HAL module is installed as /vendor/lib/hw/vulkan.radv.so > > > > Signed-off-by: Mauro Rossi > > --- > > src/amd/vulkan/Android.mk | 166 ++ > > It would be great it this file is a bit closer to the ANV one, > although no clever ideas come to mind. As a Quick Win, I think I could pull up this of one level as src/amd/Android.vulkan.mk, perform the necessary changes in paths, modify 4/4 accordingly, test build and no regression and then and push to gitlab with those changes. No problem to do that. Please, let me know if I may send 3/4 and 4/4 for review to you, to avoid resubmitting and re-reviewing the full series. Is it ok for you? Mauro > > With the Fixes tag in Patch 1/4, the series is > Reviewed-by: Emil Velikov > > Thanks > Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 3/4] android: radv: add Android.mk for vulkan.radv HAL module
On 22 July 2018 at 09:14, Mauro Rossi wrote: > radv implements the Android Vulkan HAL interface, this patch adds > Android.mk building rules by porting of radv automake rules. > vendor HAL module is installed as /vendor/lib/hw/vulkan.radv.so > > Signed-off-by: Mauro Rossi > --- > src/amd/vulkan/Android.mk | 166 ++ It would be great it this file is a bit closer to the ANV one, although no clever ideas come to mind. With the Fixes tag in Patch 1/4, the series is Reviewed-by: Emil Velikov Thanks Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 3/4] android: radv: add Android.mk for vulkan.radv HAL module
radv implements the Android Vulkan HAL interface, this patch adds Android.mk building rules by porting of radv automake rules. vendor HAL module is installed as /vendor/lib/hw/vulkan.radv.so Signed-off-by: Mauro Rossi --- src/amd/vulkan/Android.mk | 166 ++ 1 file changed, 166 insertions(+) create mode 100644 src/amd/vulkan/Android.mk diff --git a/src/amd/vulkan/Android.mk b/src/amd/vulkan/Android.mk new file mode 100644 index 00..e2c3ed9df8 --- /dev/null +++ b/src/amd/vulkan/Android.mk @@ -0,0 +1,166 @@ +# Copyright © 2018 Advanced Micro Devices, Inc. +# Copyright © 2018 Mauro Rossi issor.or...@gmail.com + +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +LOCAL_PATH := $(call my-dir) + +# get VULKAN_FILES and VULKAN_GENERATED_FILES +include $(LOCAL_PATH)/Makefile.sources + +# The gallium includes are for the util/u_math.h include from main/macros.h + +RADV_COMMON_INCLUDES := \ + $(MESA_TOP)/include \ + $(MESA_TOP)/src/ \ + $(MESA_TOP)/src/vulkan/wsi \ + $(MESA_TOP)/src/vulkan/util \ + $(MESA_TOP)/src/amd \ + $(MESA_TOP)/src/amd/common \ + $(MESA_TOP)/src/compiler \ + $(MESA_TOP)/src/mapi \ + $(MESA_TOP)/src/mesa \ + $(MESA_TOP)/src/mesa/drivers/dri/common \ + $(MESA_TOP)/src/gallium/auxiliary \ + $(MESA_TOP)/src/gallium/include \ + frameworks/native/vulkan/include + +RADV_SHARED_LIBRARIES := libdrm_amdgpu + +ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),) +RADV_SHARED_LIBRARIES += libnativewindow +endif + +# +# libmesa_radv_common +# + +include $(CLEAR_VARS) +LOCAL_MODULE := libmesa_radv_common +LOCAL_MODULE_CLASS := STATIC_LIBRARIES + +intermediates := $(call local-generated-sources-dir) + +LOCAL_SRC_FILES := \ + $(VULKAN_FILES) + +LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare LLVMInitializeAMDGPU* functions + +$(call mesa-build-with-llvm) + +LOCAL_C_INCLUDES := \ + $(RADV_COMMON_INCLUDES) \ + $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_amd_common,,) \ + $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \ + $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_radv_common,,) \ + $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_util,,)/util + +LOCAL_WHOLE_STATIC_LIBRARIES := \ + libmesa_vulkan_util + +LOCAL_GENERATED_SOURCES += $(intermediates)/radv_entrypoints.c +LOCAL_GENERATED_SOURCES += $(intermediates)/radv_entrypoints.h +LOCAL_GENERATED_SOURCES += $(intermediates)/radv_extensions.c +LOCAL_GENERATED_SOURCES += $(intermediates)/radv_extensions.h +LOCAL_GENERATED_SOURCES += $(intermediates)/vk_format_table.c + +RADV_ENTRYPOINTS_SCRIPT := $(MESA_TOP)/src/amd/vulkan/radv_entrypoints_gen.py +RADV_EXTENSIONS_SCRIPT := $(MESA_TOP)/src/amd/vulkan/radv_extensions.py +VK_FORMAT_TABLE_SCRIPT := $(MESA_TOP)/src/amd/vulkan/vk_format_table.py +VK_FORMAT_PARSE_SCRIPT := $(MESA_TOP)/src/amd/vulkan/vk_format_parse.py + +vulkan_api_xml = $(MESA_TOP)/src/vulkan/registry/vk.xml +vk_format_layout_csv = $(MESA_TOP)/src/amd/vulkan/vk_format_layout.csv + +$(intermediates)/radv_entrypoints.c: $(RADV_ENTRYPOINTS_SCRIPT) \ + $(RADV_EXTENSIONS_SCRIPT) \ + $(vulkan_api_xml) + @mkdir -p $(dir $@) + $(MESA_PYTHON2) $(RADV_ENTRYPOINTS_SCRIPT) \ + --xml $(vulkan_api_xml) \ + --outdir $(dir $@) + +$(intermediates)/radv_entrypoints.h: $(intermediates)/radv_entrypoints.c + +$(intermediates)/radv_extensions.c: $(RADV_EXTENSIONS_SCRIPT) $(vulkan_api_xml) + @mkdir -p $(dir $@) + $(MESA_PYTHON2) $(RADV_EXTENSIONS_SCRIPT) \ + --xml $(vulkan_api_xml) \ + --out-c $@ \ + --out-h $(addsuffix .h,$(basename $@)) + +$(intermediates)/radv_extensions.h: $(intermediates)/radv_extensions.c + +$