Mesa (master): anv: do not support image export with stencil aspect set

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 58e93711412a6b0358f4800c18aa302676845de9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=58e93711412a6b0358f4800c18aa302676845de9

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Tue Dec  1 14:53:14 2020 +0200

anv: do not support image export with stencil aspect set

Export/import with iris does not work properly so disable it for now.

v2: Added a vk_errorfi and assigned to a result (Lionel Landwerlin)
v3: Changed the type of error to be VK_ERROR_FORMAT_NOT_SUPPORTED
(Lionel Landwerlin)

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Signed-off-by: Eleni Maria Stea <elene.mst at gmail.com> (v2, v3)
Reviewed-by: Eleni Maria Stea <elene.mst at gmail.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4337>

---

 src/intel/vulkan/anv_formats.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c
index 62f8207d40d..85ab379c3f5 100644
--- a/src/intel/vulkan/anv_formats.c
+++ b/src/intel/vulkan/anv_formats.c
@@ -1371,6 +1371,15 @@ VkResult anv_GetPhysicalDeviceImageFormatProperties2(
        */
       switch (external_info->handleType) {
       case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT:
+
+         /* Disable stencil export, there are issues. */
+         if (vk_format_aspects(base_info->format) & VK_IMAGE_ASPECT_STENCIL_BIT) {
+            result = vk_errorfi(instance, &physical_device->vk.base,
+                                VK_ERROR_FORMAT_NOT_SUPPORTED,
+                                "External stencil buffers are not supported yet");
+            goto fail;
+         }
+
          if (external_props) {
             if (tiling_has_explicit_layout) {
                /* With an explicit memory layout, we don't care which type of fd