From 6880b096e18868c17ad85b329af602a5ca2b9b5f Mon Sep 17 00:00:00 2001 From: Fabian Schmidt Date: Thu, 5 Sep 2024 09:49:36 +0200 Subject: [PATCH] android build, formatting --- android/framework/decode/CMakeLists.txt | 2 ++ framework/decode/vulkan_replay_consumer_base.cpp | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/android/framework/decode/CMakeLists.txt b/android/framework/decode/CMakeLists.txt index 3889eab031..ef329df820 100644 --- a/android/framework/decode/CMakeLists.txt +++ b/android/framework/decode/CMakeLists.txt @@ -44,6 +44,8 @@ target_sources(gfxrecon_decode ${GFXRECON_SOURCE_DIR}/framework/decode/value_decoder.h ${GFXRECON_SOURCE_DIR}/framework/decode/metadata_consumer_base.h ${GFXRECON_SOURCE_DIR}/framework/decode/marker_consumer_base.h + ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_buffer_tracker.h + ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_buffer_tracker.cpp ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_consumer_base.h ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_decoder_base.h ${GFXRECON_SOURCE_DIR}/framework/decode/vulkan_decoder_base.cpp diff --git a/framework/decode/vulkan_replay_consumer_base.cpp b/framework/decode/vulkan_replay_consumer_base.cpp index deae5b9942..41971d1366 100644 --- a/framework/decode/vulkan_replay_consumer_base.cpp +++ b/framework/decode/vulkan_replay_consumer_base.cpp @@ -4483,8 +4483,8 @@ VkResult VulkanReplayConsumerBase::OverrideBindBufferMemory(PFN_vkBindBufferMemo auto entry = device_info->opaque_addresses.find(memory_info->capture_id); if (entry != device_info->opaque_addresses.end()) { - uint64_t memory_device_address = entry->second; - uint64_t original_buffer_address = memory_device_address + memoryOffset; + uint64_t memory_device_address = entry->second; + uint64_t original_buffer_address = memory_device_address + memoryOffset; VkBufferDeviceAddressInfo info = {}; info.sType = VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO; info.pNext = nullptr; @@ -7835,7 +7835,6 @@ VkDeviceAddress VulkanReplayConsumerBase::OverrideGetBufferDeviceAddress( // track device-addresses GetBufferTracker(device).TrackBuffer(buffer_info); - return replay_device_address; }