From 2aad7d2b006bee5475396128de354982fc5758a1 Mon Sep 17 00:00:00 2001
From: Jean-Francois Thibert <jfthibert@google.com>
Date: Mon, 6 May 2024 17:03:46 -0400
Subject: [PATCH] gfxstream: Fix usage of encoder after release in
 vkResetCommandBuffer

Reviewed-by: Aaron Ruby <aruby@blackberry.com>
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27246>
---
 src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
index ac4886fa542..955f5b411ce 100644
--- a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
+++ b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
@@ -6815,7 +6815,7 @@ VkResult ResourceTracker::on_vkResetCommandBuffer(void* context, VkResult input_
     resetCommandBufferStagingInfo(commandBuffer, true /* also reset primaries */,
                                   true /* also clear pending descriptor sets */);
 
-    VkEncoder* enc = (VkEncoder*)context;
+    VkEncoder* enc = ResourceTracker::getCommandBufferEncoder(commandBuffer);
     (void)input_result;
 
     if (!supportsDeferredCommands()) {