commit 6d78f0562cbd183126c102c6cafa34889a0cbe6c
author Jason Macnak <natsu@google.com> Wed Mar 05 11:06:10 2025 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Mar 06 10:41:54 2025 -0800
tree 390d43c87ed1753ef4c9e16f8e909350c8924939
parent 0ad7b62207a70a470c5290f6e012f766be497b5e

Update variable names to avoid -Wshadow error am: a7985e546a

Original change: https://android-review.googlesource.com/c/platform/hardware/google/gfxstream/+/3521519

Change-Id: I4b0e11b20902f362ea814ef145c1f1a7102bfc46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
GitOrigin-RevId: 36ed9c3d2ca22404b9141fa41dd892f1f66378de

host/vulkan/VkSubDecoder.cpp

diff --git a/host/vulkan/VkSubDecoder.cpp b/host/vulkan/VkSubDecoder.cpp
index ca8d17b..bc3e050 100644
--- a/host/vulkan/VkSubDecoder.cpp
+++ b/host/vulkan/VkSubDecoder.cpp
@@ -33,14 +33,14 @@
 #define MAX_STACK_ITEMS 16
 #define MAX_PACKET_LENGTH (400 * 1024 * 1024)  // 400MB
 size_t subDecode(VulkanMemReadingStream* readStream, VulkanDispatch* vk, void* boxed_dispatchHandle,
-                 void* dispatchHandle, VkDeviceSize dataSize, const void* pData,
+                 void* dispatchHandle, VkDeviceSize subDecodeDataSize, const void* pSubDecodeData,
                  const VkDecoderContext& context) {
     auto& metricsLogger = *context.metricsLogger;
     uint32_t count = 0;
-    unsigned char* buf = (unsigned char*)pData;
+    unsigned char* buf = (unsigned char*)pSubDecodeData;
     android::base::BumpPool* pool = readStream->pool();
-    unsigned char* ptr = (unsigned char*)pData;
-    const unsigned char* const end = (const unsigned char*)buf + dataSize;
+    unsigned char* ptr = (unsigned char*)pSubDecodeData;
+    const unsigned char* const end = (const unsigned char*)buf + subDecodeDataSize;
     VkDecoderGlobalState* globalstate = VkDecoderGlobalState::get();
     while (end - ptr >= 8) {
         uint32_t opcode = *(uint32_t*)ptr;