commit db2bcb48c947ef8dab7f342ac35c776e9b8c6846
author AWoloszyn <awoloszyn@google.com> Fri Sep 22 09:46:10 2023 -0400
committer Andrew Woloszyn <awoloszyn@google.com> Fri Sep 22 17:52:14 2023 +0000
tree a608ec799cea620afb016fda57c89266180ed71d
parent e5e3e04ec7a66d1406024cee005c253bd3bd2600

Fix for compressed textures when using CopyCommands2

Test: Running dEQP-VK.api.copy_and_blit.copy_commands2.image_to_image.all_formats.{eac|astc|etc).*
Bug: 300460096
Change-Id: I56b094411e7cf6dbe7323796338e4032c42ebd71

host/vulkan/VkSubDecoder.cpp

diff --git a/host/vulkan/VkSubDecoder.cpp b/host/vulkan/VkSubDecoder.cpp
index 4b4a1f4..08c919f 100644
--- a/host/vulkan/VkSubDecoder.cpp
+++ b/host/vulkan/VkSubDecoder.cpp
@@ -1680,7 +1680,8 @@
                     transform_tohost_VkCopyImageInfo2(globalstate,
                                                       (VkCopyImageInfo2*)(pCopyImageInfo));
                 }
-                vk->vkCmdCopyImage2((VkCommandBuffer)dispatchHandle, pCopyImageInfo);
+                this->on_vkCmdCopyImage2(pool, (VkCommandBuffer)(boxed_dispatchHandle),
+                                         pCopyImageInfo);
                 android::base::endTrace();
                 break;
             }
@@ -1696,8 +1697,8 @@
                     transform_tohost_VkCopyBufferToImageInfo2(
                         globalstate, (VkCopyBufferToImageInfo2*)(pCopyBufferToImageInfo));
                 }
-                vk->vkCmdCopyBufferToImage2((VkCommandBuffer)dispatchHandle,
-                                            pCopyBufferToImageInfo);
+                this->on_vkCmdCopyBufferToImage2(pool, (VkCommandBuffer)(boxed_dispatchHandle),
+                                                 pCopyBufferToImageInfo, context);
                 android::base::endTrace();
                 break;
             }
@@ -1713,8 +1714,8 @@
                     transform_tohost_VkCopyImageToBufferInfo2(
                         globalstate, (VkCopyImageToBufferInfo2*)(pCopyImageToBufferInfo));
                 }
-                vk->vkCmdCopyImageToBuffer2((VkCommandBuffer)dispatchHandle,
-                                            pCopyImageToBufferInfo);
+                this->on_vkCmdCopyImageToBuffer2(pool, (VkCommandBuffer)(boxed_dispatchHandle),
+                                                 pCopyImageToBufferInfo);
                 android::base::endTrace();
                 break;
             }
@@ -2742,7 +2743,8 @@
                     transform_tohost_VkCopyImageInfo2(globalstate,
                                                       (VkCopyImageInfo2*)(pCopyImageInfo));
                 }
-                vk->vkCmdCopyImage2KHR((VkCommandBuffer)dispatchHandle, pCopyImageInfo);
+                this->on_vkCmdCopyImage2KHR(pool, (VkCommandBuffer)(boxed_dispatchHandle),
+                                            pCopyImageInfo);
                 android::base::endTrace();
                 break;
             }
@@ -2758,8 +2760,8 @@
                     transform_tohost_VkCopyBufferToImageInfo2(
                         globalstate, (VkCopyBufferToImageInfo2*)(pCopyBufferToImageInfo));
                 }
-                vk->vkCmdCopyBufferToImage2KHR((VkCommandBuffer)dispatchHandle,
-                                               pCopyBufferToImageInfo);
+                this->on_vkCmdCopyBufferToImage2KHR(pool, (VkCommandBuffer)(boxed_dispatchHandle),
+                                                    pCopyBufferToImageInfo, context);
                 android::base::endTrace();
                 break;
             }
@@ -2775,8 +2777,8 @@
                     transform_tohost_VkCopyImageToBufferInfo2(
                         globalstate, (VkCopyImageToBufferInfo2*)(pCopyImageToBufferInfo));
                 }
-                vk->vkCmdCopyImageToBuffer2KHR((VkCommandBuffer)dispatchHandle,
-                                               pCopyImageToBufferInfo);
+                this->on_vkCmdCopyImageToBuffer2KHR(pool, (VkCommandBuffer)(boxed_dispatchHandle),
+                                                    pCopyImageToBufferInfo);
                 android::base::endTrace();
                 break;
             }