From c7b0c240e29f684d2c3acb121f3e111c24b8871c Mon Sep 17 00:00:00 2001 From: baldurk Date: Sat, 7 Sep 2024 12:37:23 +0100 Subject: [PATCH] Fix deferred handles to start properly from the upper bits * INTPTR_MAX may overlap with valid pointers on android --- renderdoc/driver/d3d12/d3d12_manager.h | 2 +- renderdoc/driver/vulkan/vk_manager.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/renderdoc/driver/d3d12/d3d12_manager.h b/renderdoc/driver/d3d12/d3d12_manager.h index 95c636cc3..fc6667c42 100644 --- a/renderdoc/driver/d3d12/d3d12_manager.h +++ b/renderdoc/driver/d3d12/d3d12_manager.h @@ -1222,6 +1222,6 @@ private: D3D12GpuBufferAllocator m_GPUBufferAllocator; // dummy handle to use - starting from near highest valid pointer to minimise risk of overlap with real handles - static const uint64_t FirstDummyHandle = INTPTR_MAX - 1024; + static const uint64_t FirstDummyHandle = UINTPTR_MAX - 1024; uint64_t m_DummyHandle = FirstDummyHandle; }; diff --git a/renderdoc/driver/vulkan/vk_manager.h b/renderdoc/driver/vulkan/vk_manager.h index 34bb52bb7..00b1e4537 100644 --- a/renderdoc/driver/vulkan/vk_manager.h +++ b/renderdoc/driver/vulkan/vk_manager.h @@ -512,7 +512,7 @@ private: rdcarray InitialContentResources(); // dummy handle to use - starting from near highest valid pointer to minimise risk of overlap with real handles - static const uint64_t FirstDummyHandle = INTPTR_MAX - 1024; + static const uint64_t FirstDummyHandle = UINTPTR_MAX - 1024; uint64_t m_DummyHandle = FirstDummyHandle; WrappedVulkan *m_Core;