From 840c79fc9bcba9dfa38107da37a375c18fdcdcc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tapani=20P=C3=A4lli?= <tapani.palli@intel.com>
Date: Tue, 12 Oct 2021 11:13:49 +0300
Subject: [PATCH] anv/android: fix parameters given for vk_common_QueueSubmit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Common queue submit expects pWaitDstStageMask to be set per each
semaphore (as per Vulkan spec) and crashes if these are not given
properly.

This fixes crashes seen when running vulkan apps on Android.

v2: change the VkPipelineStageFlags given (Lionel)

Fixes: b996fa8efaa4 ("anv: implement VK_KHR_synchronization2")
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13305>
---
 src/intel/vulkan/anv_android.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/intel/vulkan/anv_android.c b/src/intel/vulkan/anv_android.c
index 94cc09514dc..eef859ae249 100644
--- a/src/intel/vulkan/anv_android.c
+++ b/src/intel/vulkan/anv_android.c
@@ -904,6 +904,9 @@ anv_QueueSignalReleaseImageANDROID(
             .sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
             .waitSemaphoreCount = 1,
             .pWaitSemaphores = pWaitSemaphores,
+            .pWaitDstStageMask = &(VkPipelineStageFlags) {
+               VK_PIPELINE_STAGE_ALL_COMMANDS_BIT
+            },
       },
       (VkFence) VK_NULL_HANDLE);
    if (result != VK_SUCCESS)