From cf0537d0554111c51b07ffa2f400d7b4e7908009 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 11 Dec 2015 00:32:32 +0100 Subject: [PATCH] Don't vkMapMemory with size of 0, use VK_WHOLE_SIZE --- renderdoc/driver/vulkan/vk_core.cpp | 2 +- renderdoc/driver/vulkan/vk_debug.cpp | 10 +++++----- renderdoc/driver/vulkan/vk_initstate.cpp | 14 +++++++------- renderdoc/driver/vulkan/vk_replay.cpp | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp index 982bf0f05..6d33301e8 100644 --- a/renderdoc/driver/vulkan/vk_core.cpp +++ b/renderdoc/driver/vulkan/vk_core.cpp @@ -848,7 +848,7 @@ bool WrappedVulkan::EndFrameCapture(void *dev, void *wnd) // map memory and readback byte *pData = NULL; - vkr = vt->MapMemory(Unwrap(dev), readbackMem, 0, 0, 0, (void **)&pData); + vkr = vt->MapMemory(Unwrap(dev), readbackMem, 0, VK_WHOLE_SIZE, 0, (void **)&pData); RDCASSERT(vkr == VK_SUCCESS); RDCASSERT(pData != NULL); diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp index ad23e15fd..fb0fcaaf0 100644 --- a/renderdoc/driver/vulkan/vk_debug.cpp +++ b/renderdoc/driver/vulkan/vk_debug.cpp @@ -1019,7 +1019,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) vt->CmdPipelineBarrier(Unwrap(cmd), VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, false, 1, &barrierptr); byte *pData = NULL; - vkr = vt->MapMemory(Unwrap(dev), Unwrap(m_TextAtlasMem), 0, 0, 0, (void **)&pData); + vkr = vt->MapMemory(Unwrap(dev), Unwrap(m_TextAtlasMem), 0, VK_WHOLE_SIZE, 0, (void **)&pData); RDCASSERT(vkr == VK_SUCCESS); RDCASSERT(pData != NULL); @@ -1747,7 +1747,7 @@ void VulkanDebugManager::GetBufferData(ResourceId buff, uint64_t offset, uint64_ m_pDriver->FlushQ(); byte *pData = NULL; - vkr = vt->MapMemory(Unwrap(dev), Unwrap(m_ReadbackWindow.mem), 0, 0, 0, (void **)&pData); + vkr = vt->MapMemory(Unwrap(dev), Unwrap(m_ReadbackWindow.mem), 0, VK_WHOLE_SIZE, 0, (void **)&pData); RDCASSERT(vkr == VK_SUCCESS); RDCASSERT(pData != NULL); @@ -3984,7 +3984,7 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t frameID, uint32_t eventID) RDCASSERT(vkr == VK_SUCCESS); byte *idxData = NULL; - vkr = m_pDriver->vkMapMemory(m_Device, uniqIdxBufMem, 0, 0, 0, (void **)&idxData); + vkr = m_pDriver->vkMapMemory(m_Device, uniqIdxBufMem, 0, VK_WHOLE_SIZE, 0, (void **)&idxData); RDCASSERT(vkr == VK_SUCCESS); memcpy(idxData, &indices[0], indices.size()*sizeof(uint32_t)); @@ -4294,7 +4294,7 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t frameID, uint32_t eventID) // upload rebased memory byte *idxData = NULL; - vkr = m_pDriver->vkMapMemory(m_Device, idxBufMem, 0, 0, 0, (void **)&idxData); + vkr = m_pDriver->vkMapMemory(m_Device, idxBufMem, 0, VK_WHOLE_SIZE, 0, (void **)&idxData); RDCASSERT(vkr == VK_SUCCESS); memcpy(idxData, idx32, numIndices*idxsize); @@ -4339,7 +4339,7 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t frameID, uint32_t eventID) // readback mesh data byte *byteData = NULL; - vkr = m_pDriver->vkMapMemory(m_Device, readbackMem, 0, 0, 0, (void **)&byteData); + vkr = m_pDriver->vkMapMemory(m_Device, readbackMem, 0, VK_WHOLE_SIZE, 0, (void **)&byteData); // do near/far calculations diff --git a/renderdoc/driver/vulkan/vk_initstate.cpp b/renderdoc/driver/vulkan/vk_initstate.cpp index 7129ab69a..282d52acf 100644 --- a/renderdoc/driver/vulkan/vk_initstate.cpp +++ b/renderdoc/driver/vulkan/vk_initstate.cpp @@ -395,7 +395,7 @@ bool WrappedVulkan::Serialise_SparseInitialState(ResourceId id, WrappedVkBuffer VkDevice d = GetDev(); byte *ptr = NULL; - ObjDisp(d)->MapMemory(Unwrap(d), ToHandle(contents.resource), 0, 0, 0, (void **)&ptr); + ObjDisp(d)->MapMemory(Unwrap(d), ToHandle(contents.resource), 0, VK_WHOLE_SIZE, 0, (void **)&ptr); size_t dataSize = (size_t)info->totalSize; @@ -487,7 +487,7 @@ bool WrappedVulkan::Serialise_SparseInitialState(ResourceId id, WrappedVkBuffer RDCASSERT(vkr == VK_SUCCESS); byte *ptr = NULL; - ObjDisp(d)->MapMemory(Unwrap(d), Unwrap(mem), 0, 0, 0, (void **)&ptr); + ObjDisp(d)->MapMemory(Unwrap(d), Unwrap(mem), 0, VK_WHOLE_SIZE, 0, (void **)&ptr); size_t dummy = 0; m_pSerialiser->SerialiseBuffer("data", ptr, dummy); @@ -538,7 +538,7 @@ bool WrappedVulkan::Serialise_SparseInitialState(ResourceId id, WrappedVkImage * VkDevice d = GetDev(); byte *ptr = NULL; - ObjDisp(d)->MapMemory(Unwrap(d), ToHandle(contents.resource), 0, 0, 0, (void **)&ptr); + ObjDisp(d)->MapMemory(Unwrap(d), ToHandle(contents.resource), 0, VK_WHOLE_SIZE, 0, (void **)&ptr); size_t dataSize = (size_t)state->totalSize; @@ -690,7 +690,7 @@ bool WrappedVulkan::Serialise_SparseInitialState(ResourceId id, WrappedVkImage * RDCASSERT(vkr == VK_SUCCESS); byte *ptr = NULL; - ObjDisp(d)->MapMemory(Unwrap(d), Unwrap(mem), 0, 0, 0, (void **)&ptr); + ObjDisp(d)->MapMemory(Unwrap(d), Unwrap(mem), 0, VK_WHOLE_SIZE, 0, (void **)&ptr); size_t dummy = 0; m_pSerialiser->SerialiseBuffer("data", ptr, dummy); @@ -1237,7 +1237,7 @@ bool WrappedVulkan::Serialise_InitialState(WrappedVkRes *res) } byte *ptr = NULL; - ObjDisp(d)->MapMemory(Unwrap(d), ToHandle(initContents.resource), 0, 0, 0, (void **)&ptr); + ObjDisp(d)->MapMemory(Unwrap(d), ToHandle(initContents.resource), 0, VK_WHOLE_SIZE, 0, (void **)&ptr); size_t dataSize = (size_t)initContents.num; @@ -1456,7 +1456,7 @@ bool WrappedVulkan::Serialise_InitialState(WrappedVkRes *res) RDCASSERT(vkr == VK_SUCCESS); byte *ptr = NULL; - ObjDisp(d)->MapMemory(Unwrap(d), uploadmem, 0, 0, 0, (void **)&ptr); + ObjDisp(d)->MapMemory(Unwrap(d), uploadmem, 0, VK_WHOLE_SIZE, 0, (void **)&ptr); size_t dummy = 0; m_pSerialiser->SerialiseBuffer("data", ptr, dummy); @@ -1634,7 +1634,7 @@ bool WrappedVulkan::Serialise_InitialState(WrappedVkRes *res) RDCASSERT(vkr == VK_SUCCESS); byte *ptr = NULL; - ObjDisp(d)->MapMemory(Unwrap(d), Unwrap(mem), 0, 0, 0, (void **)&ptr); + ObjDisp(d)->MapMemory(Unwrap(d), Unwrap(mem), 0, VK_WHOLE_SIZE, 0, (void **)&ptr); size_t dummy = 0; m_pSerialiser->SerialiseBuffer("data", ptr, dummy); diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp index 6f27f4b1d..1042a981c 100644 --- a/renderdoc/driver/vulkan/vk_replay.cpp +++ b/renderdoc/driver/vulkan/vk_replay.cpp @@ -884,7 +884,7 @@ void VulkanReplay::PickPixel(ResourceId texture, uint32_t x, uint32_t y, uint32_ m_pDriver->FlushQ(); float *pData = NULL; - vt->MapMemory(Unwrap(dev), Unwrap(GetDebugManager()->m_PickPixelReadbackBuffer.mem), 0, 0, 0, (void **)&pData); + vt->MapMemory(Unwrap(dev), Unwrap(GetDebugManager()->m_PickPixelReadbackBuffer.mem), 0, VK_WHOLE_SIZE, 0, (void **)&pData); RDCASSERT(pData != NULL); @@ -4145,7 +4145,7 @@ byte *VulkanReplay::GetTextureData(ResourceId tex, uint32_t arrayIdx, uint32_t m // map the buffer and copy to return buffer byte *pData = NULL; - vkr = vt->MapMemory(Unwrap(dev), readbackMem, 0, 0, 0, (void **)&pData); + vkr = vt->MapMemory(Unwrap(dev), readbackMem, 0, VK_WHOLE_SIZE, 0, (void **)&pData); RDCASSERT(vkr == VK_SUCCESS); RDCASSERT(pData != NULL);