2017-01-30 13:37:47 +02:00
|
|
|
# Copyright © 2017 Intel Corporation
|
|
|
|
|
#
|
|
|
|
|
# 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 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)
|
|
|
|
|
|
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
|
include $(LOCAL_PATH)/Makefile.sources
|
|
|
|
|
|
2017-03-01 21:11:51 -08:00
|
|
|
VK_ENTRYPOINTS_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/vulkan/anv_entrypoints_gen.py
|
2017-01-30 13:37:47 +02:00
|
|
|
|
2017-07-13 22:50:30 -07:00
|
|
|
VK_EXTENSIONS_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/vulkan/anv_extensions.py
|
|
|
|
|
|
2017-01-30 13:37:47 +02:00
|
|
|
VULKAN_COMMON_INCLUDES := \
|
anv: Implement VK_ANDROID_native_buffer (v9)
This implementation is correct (afaict), but takes two shortcuts
regarding the import/export of Android sync fds.
Shortcut 1. When Android calls vkAcquireImageANDROID to import a sync
fd into a VkSemaphore or VkFence, the driver instead simply blocks on
the sync fd, then puts the VkSemaphore or VkFence into the signalled
state. Thanks to implicit sync, this produces correct behavior (with
extra latency overhead, perhaps) despite its ugliness.
Shortcut 2. When Android calls vkQueueSignalReleaseImageANDROID to export
a collection of wait semaphores as a sync fd, the driver instead
submits the semaphores to the queue, then returns sync fd -1, which
informs the caller that no additional synchronization is needed.
Again, thanks to implicit sync, this produces correct behavior (with
extra batch submission overhead) despite its ugliness.
I chose to take the shortcuts instead of properly importing/exporting
the sync fds for two reasons:
Reason 1. I've already tested this patch with dEQP and with demos
apps. It works. I wanted to get the tested patches into the tree now,
and polish the implementation afterwards.
Reason 2. I want to run this on a 3.18 kernel (gasp!). In 3.18, i915
supports neither Android's sync_fence, nor upstream's sync_file, nor
drm_syncobj. Again, I tested these patches on Android with a 3.18
kernel and they work.
I plan to quickly follow-up with patches that remove the shortcuts and
properly import/export the sync fds.
Non-Testing
===========
I did not test at all using the Android.mk buildsystem. I may have broke
it. Please test and review that.
Testing
=======
I tested with 64-bit ARC++ on a Skylake Chromebook and a 3.18 kernel.
The following pass (as of patchset v9):
- a little spinning cube demo APK
- several Sascha demos
- dEQP-VK.info.*
- dEQP-VK.api.wsi.android.*
(except dEQP-VK.api.wsi.android.swapchain.*.image_usage, because
dEQP wants to create swapchains with VK_IMAGE_USAGE_STORAGE_BIT)
- dEQP-VK.api.smoke.*
- dEQP-VK.api.info.instance.*
- dEQP-VK.api.info.device.*
v2:
- Reject VkNativeBufferANDROID if the dma-buf's size is too small for
the VkImage.
- Stop abusing VkNativeBufferANDROID by passing it to vkAllocateMemory
during vkCreateImage. Instead, directly import its dma-buf during
vkCreateImage with anv_bo_cache_import(). [for jekstrand]
- Rebase onto Tapani's VK_EXT_debug_report changes.
- Drop `CPPFLAGS += $(top_srcdir)/include/android`. The dir does not
exist.
v3:
- Delete duplicate #include "anv_private.h". [per Tapani]
- Try to fix the Android-IA build in Android.vulkan.mk by following
Tapani's example.
v4:
- Unset EXEC_OBJECT_ASYNC and set EXEC_OBJECT_WRITE on the imported
gralloc buffer, just as we do for all other winsys buffers in
anv_wsi.c. [found by Tapani]
v5:
- Really fix the Android-IA build by ensuring that Android.vulkan.mk
uses Mesa' vulkan.h and not Android's. Insert -I$(MESA_TOP)/include
before -Iframeworks/native/vulkan/include. [for Tapani]
- In vkAcquireImageANDROID, submit signal operations to the
VkSemaphore and VkFence. [for zhou]
v6:
- Drop copy-paste duplication in vkGetSwapchainGrallocUsageANDROID().
[found by zhou]
- Improve comments in vkGetSwapchainGrallocUsageANDROID().
v7:
- Fix vkGetSwapchainGrallocUsageANDROID() to inspect its
VkImageUsageFlags parameter. [for tfiga]
- This fix regresses dEQP-VK.api.wsi.android.swapchain.*.image_usage
because dEQP wants to create swapchains with
VK_IMAGE_USAGE_STORAGE_BIT.
v8:
- Drop unneeded goto in vkAcquireImageANDROID. [for tfiga]
v8.1: (minor changes)
- Drop errant hunks added by rerere in anv_device.c.
- Drop explicit mention of VK_ANDROID_native_buffer in
anv_entrypoints_gen.py. [for jekstrand]
v9:
- Isolate as much Android code as possible, moving it from anv_image.c
to anv_android.c. Connect the files with anv_image_from_gralloc().
Remove VkNativeBufferANDROID params from all anv_image.c
funcs. [for krh]
- Replace some intel_loge() with vk_errorf() in anv_android.c.
- Use © in copyright line. [for krh]
Reviewed-by: Tapani Pälli <tapani.palli@intel.com> (v5)
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com> (v9)
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> (v9)
Cc: zhoucm1 <david1.zhou@amd.com>
Cc: Tomasz Figa <tfiga@chromium.org>
2016-11-14 16:13:51 -08:00
|
|
|
$(MESA_TOP)/include \
|
2017-01-30 13:37:47 +02:00
|
|
|
$(MESA_TOP)/src/mapi \
|
|
|
|
|
$(MESA_TOP)/src/gallium/auxiliary \
|
|
|
|
|
$(MESA_TOP)/src/gallium/include \
|
|
|
|
|
$(MESA_TOP)/src/mesa \
|
|
|
|
|
$(MESA_TOP)/src/vulkan/wsi \
|
2017-06-06 12:31:05 +01:00
|
|
|
$(MESA_TOP)/src/vulkan/util \
|
2017-02-28 09:10:43 -08:00
|
|
|
$(MESA_TOP)/src/intel \
|
2017-06-28 16:35:55 -07:00
|
|
|
$(MESA_TOP)/include/drm-uapi \
|
anv: Implement VK_ANDROID_native_buffer (v9)
This implementation is correct (afaict), but takes two shortcuts
regarding the import/export of Android sync fds.
Shortcut 1. When Android calls vkAcquireImageANDROID to import a sync
fd into a VkSemaphore or VkFence, the driver instead simply blocks on
the sync fd, then puts the VkSemaphore or VkFence into the signalled
state. Thanks to implicit sync, this produces correct behavior (with
extra latency overhead, perhaps) despite its ugliness.
Shortcut 2. When Android calls vkQueueSignalReleaseImageANDROID to export
a collection of wait semaphores as a sync fd, the driver instead
submits the semaphores to the queue, then returns sync fd -1, which
informs the caller that no additional synchronization is needed.
Again, thanks to implicit sync, this produces correct behavior (with
extra batch submission overhead) despite its ugliness.
I chose to take the shortcuts instead of properly importing/exporting
the sync fds for two reasons:
Reason 1. I've already tested this patch with dEQP and with demos
apps. It works. I wanted to get the tested patches into the tree now,
and polish the implementation afterwards.
Reason 2. I want to run this on a 3.18 kernel (gasp!). In 3.18, i915
supports neither Android's sync_fence, nor upstream's sync_file, nor
drm_syncobj. Again, I tested these patches on Android with a 3.18
kernel and they work.
I plan to quickly follow-up with patches that remove the shortcuts and
properly import/export the sync fds.
Non-Testing
===========
I did not test at all using the Android.mk buildsystem. I may have broke
it. Please test and review that.
Testing
=======
I tested with 64-bit ARC++ on a Skylake Chromebook and a 3.18 kernel.
The following pass (as of patchset v9):
- a little spinning cube demo APK
- several Sascha demos
- dEQP-VK.info.*
- dEQP-VK.api.wsi.android.*
(except dEQP-VK.api.wsi.android.swapchain.*.image_usage, because
dEQP wants to create swapchains with VK_IMAGE_USAGE_STORAGE_BIT)
- dEQP-VK.api.smoke.*
- dEQP-VK.api.info.instance.*
- dEQP-VK.api.info.device.*
v2:
- Reject VkNativeBufferANDROID if the dma-buf's size is too small for
the VkImage.
- Stop abusing VkNativeBufferANDROID by passing it to vkAllocateMemory
during vkCreateImage. Instead, directly import its dma-buf during
vkCreateImage with anv_bo_cache_import(). [for jekstrand]
- Rebase onto Tapani's VK_EXT_debug_report changes.
- Drop `CPPFLAGS += $(top_srcdir)/include/android`. The dir does not
exist.
v3:
- Delete duplicate #include "anv_private.h". [per Tapani]
- Try to fix the Android-IA build in Android.vulkan.mk by following
Tapani's example.
v4:
- Unset EXEC_OBJECT_ASYNC and set EXEC_OBJECT_WRITE on the imported
gralloc buffer, just as we do for all other winsys buffers in
anv_wsi.c. [found by Tapani]
v5:
- Really fix the Android-IA build by ensuring that Android.vulkan.mk
uses Mesa' vulkan.h and not Android's. Insert -I$(MESA_TOP)/include
before -Iframeworks/native/vulkan/include. [for Tapani]
- In vkAcquireImageANDROID, submit signal operations to the
VkSemaphore and VkFence. [for zhou]
v6:
- Drop copy-paste duplication in vkGetSwapchainGrallocUsageANDROID().
[found by zhou]
- Improve comments in vkGetSwapchainGrallocUsageANDROID().
v7:
- Fix vkGetSwapchainGrallocUsageANDROID() to inspect its
VkImageUsageFlags parameter. [for tfiga]
- This fix regresses dEQP-VK.api.wsi.android.swapchain.*.image_usage
because dEQP wants to create swapchains with
VK_IMAGE_USAGE_STORAGE_BIT.
v8:
- Drop unneeded goto in vkAcquireImageANDROID. [for tfiga]
v8.1: (minor changes)
- Drop errant hunks added by rerere in anv_device.c.
- Drop explicit mention of VK_ANDROID_native_buffer in
anv_entrypoints_gen.py. [for jekstrand]
v9:
- Isolate as much Android code as possible, moving it from anv_image.c
to anv_android.c. Connect the files with anv_image_from_gralloc().
Remove VkNativeBufferANDROID params from all anv_image.c
funcs. [for krh]
- Replace some intel_loge() with vk_errorf() in anv_android.c.
- Use © in copyright line. [for krh]
Reviewed-by: Tapani Pälli <tapani.palli@intel.com> (v5)
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com> (v9)
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> (v9)
Cc: zhoucm1 <david1.zhou@amd.com>
Cc: Tomasz Figa <tfiga@chromium.org>
2016-11-14 16:13:51 -08:00
|
|
|
$(MESA_TOP)/src/intel/vulkan \
|
|
|
|
|
frameworks/native/vulkan/include
|
2017-01-30 13:37:47 +02:00
|
|
|
|
|
|
|
|
# libmesa_anv_entrypoints with header and dummy.c
|
|
|
|
|
#
|
|
|
|
|
# This static library is built to pull entrypoints header
|
|
|
|
|
# for multiple gen specific build targets below. The c file
|
|
|
|
|
# is generated separately for libmesa_vulkan_common to avoid
|
|
|
|
|
# duplicate symbols when linking the anv libraries.
|
|
|
|
|
|
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
|
LOCAL_MODULE := libmesa_anv_entrypoints
|
|
|
|
|
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
|
|
|
|
|
|
|
|
|
intermediates := $(call local-generated-sources-dir)
|
|
|
|
|
|
|
|
|
|
LOCAL_C_INCLUDES := \
|
|
|
|
|
$(VULKAN_COMMON_INCLUDES)
|
|
|
|
|
|
2017-03-01 21:11:51 -08:00
|
|
|
LOCAL_GENERATED_SOURCES += $(intermediates)/vulkan/anv_entrypoints.h
|
|
|
|
|
LOCAL_GENERATED_SOURCES += $(intermediates)/vulkan/dummy.c
|
2017-01-30 13:37:47 +02:00
|
|
|
|
2017-03-01 21:11:51 -08:00
|
|
|
$(intermediates)/vulkan/dummy.c:
|
2017-01-30 13:37:47 +02:00
|
|
|
@mkdir -p $(dir $@)
|
|
|
|
|
@echo "Gen Dummy: $(PRIVATE_MODULE) <= $(notdir $(@))"
|
|
|
|
|
$(hide) touch $@
|
|
|
|
|
|
2017-03-23 12:48:34 +02:00
|
|
|
$(intermediates)/vulkan/anv_entrypoints.h: $(intermediates)/vulkan/dummy.c
|
|
|
|
|
$(VK_ENTRYPOINTS_SCRIPT) \
|
|
|
|
|
--outdir $(dir $@) \
|
2017-08-22 16:26:03 -07:00
|
|
|
--xml $(MESA_TOP)/src/vulkan/registry/vk.xml \
|
|
|
|
|
--xml $(MESA_TOP)/src/vulkan/registry/vk_android_native_buffer.xml
|
2017-01-30 13:37:47 +02:00
|
|
|
|
|
|
|
|
LOCAL_EXPORT_C_INCLUDE_DIRS := \
|
|
|
|
|
$(intermediates)
|
|
|
|
|
|
2017-03-17 16:55:24 +00:00
|
|
|
LOCAL_SHARED_LIBRARIES := libdrm
|
2017-01-30 13:37:47 +02:00
|
|
|
|
|
|
|
|
include $(MESA_COMMON_MK)
|
|
|
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
|
|
|
|
|
|
ANV_INCLUDES := \
|
|
|
|
|
$(VULKAN_COMMON_INCLUDES) \
|
2017-03-13 14:08:38 +02:00
|
|
|
$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_anv_entrypoints,,)/vulkan \
|
2017-02-28 01:24:41 +01:00
|
|
|
$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \
|
|
|
|
|
$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_util,,)/util
|
2017-01-30 13:37:47 +02:00
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# libanv for gen7
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
|
LOCAL_MODULE := libmesa_anv_gen7
|
|
|
|
|
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
|
|
|
|
|
2017-03-01 21:11:51 -08:00
|
|
|
LOCAL_SRC_FILES := $(VULKAN_GEN7_FILES)
|
2017-01-30 13:37:47 +02:00
|
|
|
LOCAL_CFLAGS := -DGEN_VERSIONx10=70
|
|
|
|
|
|
|
|
|
|
LOCAL_C_INCLUDES := $(ANV_INCLUDES)
|
|
|
|
|
|
|
|
|
|
LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
|
|
|
|
|
|
2017-06-29 02:46:38 +02:00
|
|
|
LOCAL_SHARED_LIBRARIES := libdrm
|
2017-01-30 13:37:47 +02:00
|
|
|
|
|
|
|
|
include $(MESA_COMMON_MK)
|
|
|
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# libanv for gen75
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
|
LOCAL_MODULE := libmesa_anv_gen75
|
|
|
|
|
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
|
|
|
|
|
2017-03-01 21:11:51 -08:00
|
|
|
LOCAL_SRC_FILES := $(VULKAN_GEN75_FILES)
|
2017-01-30 13:37:47 +02:00
|
|
|
LOCAL_CFLAGS := -DGEN_VERSIONx10=75
|
|
|
|
|
|
|
|
|
|
LOCAL_C_INCLUDES := $(ANV_INCLUDES)
|
|
|
|
|
|
|
|
|
|
LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
|
|
|
|
|
|
2017-03-17 16:55:24 +00:00
|
|
|
LOCAL_SHARED_LIBRARIES := libdrm
|
2017-01-30 13:37:47 +02:00
|
|
|
|
|
|
|
|
include $(MESA_COMMON_MK)
|
|
|
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# libanv for gen8
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
|
LOCAL_MODULE := libmesa_anv_gen8
|
|
|
|
|
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
|
|
|
|
|
2017-03-01 21:11:51 -08:00
|
|
|
LOCAL_SRC_FILES := $(VULKAN_GEN8_FILES)
|
2017-01-30 13:37:47 +02:00
|
|
|
LOCAL_CFLAGS := -DGEN_VERSIONx10=80
|
|
|
|
|
|
|
|
|
|
LOCAL_C_INCLUDES := $(ANV_INCLUDES)
|
|
|
|
|
|
|
|
|
|
LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
|
|
|
|
|
|
2017-03-17 16:55:24 +00:00
|
|
|
LOCAL_SHARED_LIBRARIES := libdrm
|
2017-01-30 13:37:47 +02:00
|
|
|
|
|
|
|
|
include $(MESA_COMMON_MK)
|
|
|
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# libanv for gen9
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
|
LOCAL_MODULE := libmesa_anv_gen9
|
|
|
|
|
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
|
|
|
|
|
2017-03-01 21:11:51 -08:00
|
|
|
LOCAL_SRC_FILES := $(VULKAN_GEN9_FILES)
|
2017-01-30 13:37:47 +02:00
|
|
|
LOCAL_CFLAGS := -DGEN_VERSIONx10=90
|
|
|
|
|
|
|
|
|
|
LOCAL_C_INCLUDES := $(ANV_INCLUDES)
|
|
|
|
|
|
|
|
|
|
LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
|
|
|
|
|
|
2017-03-17 16:55:24 +00:00
|
|
|
LOCAL_SHARED_LIBRARIES := libdrm
|
2017-01-30 13:37:47 +02:00
|
|
|
|
|
|
|
|
include $(MESA_COMMON_MK)
|
|
|
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
|
|
2017-05-11 11:57:11 -07:00
|
|
|
#
|
|
|
|
|
# libanv for gen10
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
|
LOCAL_MODULE := libmesa_anv_gen10
|
|
|
|
|
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
|
|
|
|
|
|
|
|
|
LOCAL_SRC_FILES := $(VULKAN_GEN10_FILES)
|
|
|
|
|
LOCAL_CFLAGS := -DGEN_VERSIONx10=100
|
|
|
|
|
|
|
|
|
|
LOCAL_C_INCLUDES := $(ANV_INCLUDES)
|
|
|
|
|
|
|
|
|
|
LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml
|
|
|
|
|
|
|
|
|
|
LOCAL_SHARED_LIBRARIES := libdrm
|
|
|
|
|
|
|
|
|
|
include $(MESA_COMMON_MK)
|
|
|
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
|
|
2017-01-30 13:37:47 +02:00
|
|
|
#
|
|
|
|
|
# libmesa_vulkan_common
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
|
LOCAL_MODULE := libmesa_vulkan_common
|
|
|
|
|
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
|
|
|
|
|
|
|
|
|
intermediates := $(call local-generated-sources-dir)
|
|
|
|
|
|
|
|
|
|
LOCAL_SRC_FILES := $(VULKAN_FILES)
|
|
|
|
|
|
|
|
|
|
LOCAL_C_INCLUDES := \
|
|
|
|
|
$(ANV_INCLUDES) \
|
|
|
|
|
$(MESA_TOP)/src/compiler
|
|
|
|
|
|
2017-02-28 01:24:41 +01:00
|
|
|
LOCAL_WHOLE_STATIC_LIBRARIES := \
|
|
|
|
|
libmesa_anv_entrypoints \
|
|
|
|
|
libmesa_genxml \
|
|
|
|
|
libmesa_vulkan_util
|
2017-01-30 13:37:47 +02:00
|
|
|
|
2017-03-23 12:48:34 +02:00
|
|
|
# The rule generates both C and H files, but due to some strange
|
|
|
|
|
# reason generating the files once leads to link-time issues.
|
|
|
|
|
# Work around create them here as well - we're safe from race
|
|
|
|
|
# conditions since they are stored in another location.
|
|
|
|
|
|
2017-03-01 21:11:51 -08:00
|
|
|
LOCAL_GENERATED_SOURCES += $(intermediates)/vulkan/anv_entrypoints.c
|
2017-08-03 11:53:23 +03:00
|
|
|
LOCAL_GENERATED_SOURCES += $(intermediates)/vulkan/anv_extensions.c
|
2017-01-30 13:37:47 +02:00
|
|
|
|
2017-03-23 12:48:34 +02:00
|
|
|
$(intermediates)/vulkan/anv_entrypoints.c:
|
|
|
|
|
@mkdir -p $(dir $@)
|
2017-03-03 14:22:44 -08:00
|
|
|
$(VK_ENTRYPOINTS_SCRIPT) \
|
|
|
|
|
--xml $(MESA_TOP)/src/vulkan/registry/vk.xml \
|
2017-08-22 16:26:03 -07:00
|
|
|
--xml $(MESA_TOP)/src/vulkan/registry/vk_android_native_buffer.xml \
|
2017-03-23 12:48:34 +02:00
|
|
|
--outdir $(dir $@)
|
2017-01-30 13:37:47 +02:00
|
|
|
|
2017-07-13 22:50:30 -07:00
|
|
|
$(intermediates)/vulkan/anv_extensions.c:
|
|
|
|
|
@mkdir -p $(dir $@)
|
|
|
|
|
$(VK_EXTENSIONS_SCRIPT) \
|
|
|
|
|
--xml $(MESA_TOP)/src/vulkan/registry/vk.xml \
|
2017-08-22 16:26:03 -07:00
|
|
|
--xml $(MESA_TOP)/src/vulkan/registry/vk_android_native_buffer.xml \
|
2017-07-13 22:50:30 -07:00
|
|
|
--out $@
|
|
|
|
|
|
2017-03-17 16:55:24 +00:00
|
|
|
LOCAL_SHARED_LIBRARIES := libdrm
|
2017-01-30 13:37:47 +02:00
|
|
|
|
|
|
|
|
include $(MESA_COMMON_MK)
|
|
|
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#
|
2017-03-21 10:04:48 +02:00
|
|
|
# libvulkan_intel
|
2017-01-30 13:37:47 +02:00
|
|
|
#
|
|
|
|
|
|
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
|
|
2017-03-21 10:04:48 +02:00
|
|
|
LOCAL_MODULE := libvulkan_intel
|
2017-01-30 13:37:47 +02:00
|
|
|
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
|
|
|
|
|
|
2017-05-19 14:25:49 +03:00
|
|
|
LOCAL_LDFLAGS += -Wl,--build-id=sha1
|
|
|
|
|
|
2017-01-30 13:37:47 +02:00
|
|
|
LOCAL_SRC_FILES := \
|
anv: Implement VK_ANDROID_native_buffer (v9)
This implementation is correct (afaict), but takes two shortcuts
regarding the import/export of Android sync fds.
Shortcut 1. When Android calls vkAcquireImageANDROID to import a sync
fd into a VkSemaphore or VkFence, the driver instead simply blocks on
the sync fd, then puts the VkSemaphore or VkFence into the signalled
state. Thanks to implicit sync, this produces correct behavior (with
extra latency overhead, perhaps) despite its ugliness.
Shortcut 2. When Android calls vkQueueSignalReleaseImageANDROID to export
a collection of wait semaphores as a sync fd, the driver instead
submits the semaphores to the queue, then returns sync fd -1, which
informs the caller that no additional synchronization is needed.
Again, thanks to implicit sync, this produces correct behavior (with
extra batch submission overhead) despite its ugliness.
I chose to take the shortcuts instead of properly importing/exporting
the sync fds for two reasons:
Reason 1. I've already tested this patch with dEQP and with demos
apps. It works. I wanted to get the tested patches into the tree now,
and polish the implementation afterwards.
Reason 2. I want to run this on a 3.18 kernel (gasp!). In 3.18, i915
supports neither Android's sync_fence, nor upstream's sync_file, nor
drm_syncobj. Again, I tested these patches on Android with a 3.18
kernel and they work.
I plan to quickly follow-up with patches that remove the shortcuts and
properly import/export the sync fds.
Non-Testing
===========
I did not test at all using the Android.mk buildsystem. I may have broke
it. Please test and review that.
Testing
=======
I tested with 64-bit ARC++ on a Skylake Chromebook and a 3.18 kernel.
The following pass (as of patchset v9):
- a little spinning cube demo APK
- several Sascha demos
- dEQP-VK.info.*
- dEQP-VK.api.wsi.android.*
(except dEQP-VK.api.wsi.android.swapchain.*.image_usage, because
dEQP wants to create swapchains with VK_IMAGE_USAGE_STORAGE_BIT)
- dEQP-VK.api.smoke.*
- dEQP-VK.api.info.instance.*
- dEQP-VK.api.info.device.*
v2:
- Reject VkNativeBufferANDROID if the dma-buf's size is too small for
the VkImage.
- Stop abusing VkNativeBufferANDROID by passing it to vkAllocateMemory
during vkCreateImage. Instead, directly import its dma-buf during
vkCreateImage with anv_bo_cache_import(). [for jekstrand]
- Rebase onto Tapani's VK_EXT_debug_report changes.
- Drop `CPPFLAGS += $(top_srcdir)/include/android`. The dir does not
exist.
v3:
- Delete duplicate #include "anv_private.h". [per Tapani]
- Try to fix the Android-IA build in Android.vulkan.mk by following
Tapani's example.
v4:
- Unset EXEC_OBJECT_ASYNC and set EXEC_OBJECT_WRITE on the imported
gralloc buffer, just as we do for all other winsys buffers in
anv_wsi.c. [found by Tapani]
v5:
- Really fix the Android-IA build by ensuring that Android.vulkan.mk
uses Mesa' vulkan.h and not Android's. Insert -I$(MESA_TOP)/include
before -Iframeworks/native/vulkan/include. [for Tapani]
- In vkAcquireImageANDROID, submit signal operations to the
VkSemaphore and VkFence. [for zhou]
v6:
- Drop copy-paste duplication in vkGetSwapchainGrallocUsageANDROID().
[found by zhou]
- Improve comments in vkGetSwapchainGrallocUsageANDROID().
v7:
- Fix vkGetSwapchainGrallocUsageANDROID() to inspect its
VkImageUsageFlags parameter. [for tfiga]
- This fix regresses dEQP-VK.api.wsi.android.swapchain.*.image_usage
because dEQP wants to create swapchains with
VK_IMAGE_USAGE_STORAGE_BIT.
v8:
- Drop unneeded goto in vkAcquireImageANDROID. [for tfiga]
v8.1: (minor changes)
- Drop errant hunks added by rerere in anv_device.c.
- Drop explicit mention of VK_ANDROID_native_buffer in
anv_entrypoints_gen.py. [for jekstrand]
v9:
- Isolate as much Android code as possible, moving it from anv_image.c
to anv_android.c. Connect the files with anv_image_from_gralloc().
Remove VkNativeBufferANDROID params from all anv_image.c
funcs. [for krh]
- Replace some intel_loge() with vk_errorf() in anv_android.c.
- Use © in copyright line. [for krh]
Reviewed-by: Tapani Pälli <tapani.palli@intel.com> (v5)
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com> (v9)
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> (v9)
Cc: zhoucm1 <david1.zhou@amd.com>
Cc: Tomasz Figa <tfiga@chromium.org>
2016-11-14 16:13:51 -08:00
|
|
|
$(VULKAN_GEM_FILES) \
|
|
|
|
|
$(VULKAN_ANDROID_FILES)
|
2017-01-30 13:37:47 +02:00
|
|
|
|
|
|
|
|
LOCAL_C_INCLUDES := \
|
|
|
|
|
$(VULKAN_COMMON_INCLUDES) \
|
2017-03-13 14:08:38 +02:00
|
|
|
$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_anv_entrypoints,,)/vulkan
|
2017-01-30 13:37:47 +02:00
|
|
|
|
|
|
|
|
LOCAL_EXPORT_C_INCLUDE_DIRS := $(MESA_TOP)/src/intel/vulkan
|
|
|
|
|
|
|
|
|
|
LOCAL_WHOLE_STATIC_LIBRARIES := \
|
|
|
|
|
libmesa_nir \
|
|
|
|
|
libmesa_isl \
|
|
|
|
|
libmesa_glsl \
|
|
|
|
|
libmesa_util \
|
|
|
|
|
libmesa_blorp \
|
|
|
|
|
libmesa_compiler \
|
|
|
|
|
libmesa_intel_common \
|
|
|
|
|
libmesa_vulkan_common \
|
|
|
|
|
libmesa_anv_gen7 \
|
|
|
|
|
libmesa_anv_gen75 \
|
|
|
|
|
libmesa_anv_gen8 \
|
|
|
|
|
libmesa_anv_gen9 \
|
2017-05-11 11:57:11 -07:00
|
|
|
libmesa_anv_gen10 \
|
2017-02-28 09:10:43 -08:00
|
|
|
libmesa_intel_compiler \
|
2017-01-30 13:37:47 +02:00
|
|
|
libmesa_anv_entrypoints
|
|
|
|
|
|
2017-09-14 09:57:40 +03:00
|
|
|
LOCAL_SHARED_LIBRARIES := libdrm libz libsync liblog
|
2017-01-30 13:37:47 +02:00
|
|
|
|
|
|
|
|
include $(MESA_COMMON_MK)
|
|
|
|
|
include $(BUILD_SHARED_LIBRARY)
|