lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-14 18:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Detect differences in opaque capture address and fail capture load

Browse Source 
* This should not happen, the vulkan spec guarantees that this function must
  return the same value passed in if there was one, and this can help detect BDA
  addresses moving.
This commit is contained in:
baldurk
2025-07-29 21:43:31 +01:00
parent 25adde711a
commit e7f10d3a84
3 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_info.cpp
+9
View File
@@ -2293,6 +2293,15 @@ void VulkanCreationInfo::Memory::Init(VulkanResourceManager *resourceMan, Vulkan
{
memoryTypeIndex = pAllocInfo->memoryTypeIndex;
allocSize = wholeMemBufSize = pAllocInfo->allocationSize;
const VkMemoryOpaqueCaptureAddressAllocateInfo *memoryDeviceAddress =
(const VkMemoryOpaqueCaptureAddressAllocateInfo *)FindNextStruct(
pAllocInfo, VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO);
if(memoryDeviceAddress)
{
opaqueAddr = memoryDeviceAddress->opaqueCaptureAddress;
}
}
void VulkanCreationInfo::Memory::SimplifyBindings()
renderdoc/driver/vulkan/vk_info.h
+2
View File
@@ -579,6 +579,8 @@ struct VulkanCreationInfo
VkBuffer wholeMemBuf;
VkDeviceAddress opaqueAddr;
enum MemoryBinding
{
None = 0x0,
renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
+22
View File
@@ -370,6 +370,28 @@ bool WrappedVulkan::Serialise_vkAllocateMemory(SerialiserType &ser, VkDevice dev
m_CreationInfo.m_Memory[live].Init(GetResourceManager(), m_CreationInfo, &AllocateInfo);
if(m_CreationInfo.m_Memory[live].opaqueAddr != 0)
{
VkDeviceMemoryOpaqueCaptureAddressInfo getInfo = {
VK_STRUCTURE_TYPE_DEVICE_MEMORY_OPAQUE_CAPTURE_ADDRESS_INFO,
NULL,
Unwrap(mem),
};
uint64_t opaque =
ObjDisp(device)->GetDeviceMemoryOpaqueCaptureAddress(Unwrap(device), &getInfo);
if(m_CreationInfo.m_Memory[live].opaqueAddr != opaque)
{
SET_ERROR_RESULT(
m_FailedReplayResult, ResultCode::APIReplayFailed,
"Allocating memory failed, opaque address 0x%llx has changed on replay to 0x%llx."
"This is illegal and indicates a potential driver bug.",
m_CreationInfo.m_Memory[live].opaqueAddr, opaque);
return false;
}
}
VkMemoryDedicatedAllocateInfo *dedicated = (VkMemoryDedicatedAllocateInfo *)FindNextStruct(
&AllocateInfo, VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO);
if(dedicated && dedicated->buffer == VK_NULL_HANDLE && dedicated->image == VK_NULL_HANDLE)