From 7441a3dc1e1960311bdcf9cc3eb7056624c9aadd Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 18 Nov 2015 19:37:44 +0100 Subject: [PATCH] Don't have two overloads that are ambiguous on pointer param --- renderdoc/driver/vulkan/vk_debug.cpp | 4 ++-- renderdoc/driver/vulkan/vk_debug.h | 4 ++-- renderdoc/driver/vulkan/vk_replay.cpp | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp index e09e32e61..93424eb5e 100644 --- a/renderdoc/driver/vulkan/vk_debug.cpp +++ b/renderdoc/driver/vulkan/vk_debug.cpp @@ -202,13 +202,13 @@ void *VulkanDebugManager::GPUBuffer::Map(const VkLayerDispatchTable *vt, VkDevic return ptr; } -void *VulkanDebugManager::GPUBuffer::Map(const VkLayerDispatchTable *vt, VkDevice dev, VkDeviceSize *bindoffset, VkDeviceSize usedsize) +void *VulkanDebugManager::GPUBuffer::Map(const VkLayerDispatchTable *vt, VkDevice dev, VkDeviceSize &bindoffset, VkDeviceSize usedsize) { uint32_t offs = 0; void *ret = Map(vt, dev, &offs, usedsize); - if(bindoffset) *bindoffset = offs; + bindoffset = offs; return ret; } diff --git a/renderdoc/driver/vulkan/vk_debug.h b/renderdoc/driver/vulkan/vk_debug.h index a0f3fd15c..39dd906d9 100644 --- a/renderdoc/driver/vulkan/vk_debug.h +++ b/renderdoc/driver/vulkan/vk_debug.h @@ -81,8 +81,8 @@ class VulkanDebugManager void FillDescriptor(VkDescriptorInfo &desc); - void *Map(const VkLayerDispatchTable *vt, VkDevice dev, VkDeviceSize *bindoffset, VkDeviceSize usedsize = 0); - void *Map(const VkLayerDispatchTable *vt, VkDevice dev, uint32_t *bindoffset, VkDeviceSize usedsize = 0); + void *Map(const VkLayerDispatchTable *vt, VkDevice dev, VkDeviceSize &bindoffset, VkDeviceSize usedsize = 0); + void *Map(const VkLayerDispatchTable *vt, VkDevice dev, uint32_t *bindoffset = NULL, VkDeviceSize usedsize = 0); void Unmap(const VkLayerDispatchTable *vt, VkDevice dev); VkDeviceSize sz; diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp index 8364e2516..ab14badf0 100644 --- a/renderdoc/driver/vulkan/vk_replay.cpp +++ b/renderdoc/driver/vulkan/vk_replay.cpp @@ -1566,7 +1566,7 @@ void VulkanReplay::RenderMesh(uint32_t frameID, uint32_t eventID, const vectorm_MeshBBoxVB.Map(vt, dev, &vboffs); + Vec4f *ptr = (Vec4f *)GetDebugManager()->m_MeshBBoxVB.Map(vt, dev, vboffs); memcpy(ptr, bbox, sizeof(bbox)); @@ -2091,7 +2091,7 @@ void VulkanReplay::RenderMesh(uint32_t frameID, uint32_t eventID, const vector= primSize) { VkDeviceSize vboffs = 0; - Vec4f *ptr = (Vec4f *)GetDebugManager()->m_MeshBBoxVB.Map(vt, dev, &vboffs, sizeof(Vec4f)*primSize); + Vec4f *ptr = (Vec4f *)GetDebugManager()->m_MeshBBoxVB.Map(vt, dev, vboffs, sizeof(Vec4f)*primSize); memcpy(ptr, &activePrim[0], sizeof(Vec4f)*primSize); @@ -2114,7 +2114,7 @@ void VulkanReplay::RenderMesh(uint32_t frameID, uint32_t eventID, const vector= primSize && (adjacentPrimVertices.size() % primSize) == 0) { VkDeviceSize vboffs = 0; - Vec4f *ptr = (Vec4f *)GetDebugManager()->m_MeshBBoxVB.Map(vt, dev, &vboffs, sizeof(Vec4f)*adjacentPrimVertices.size()); + Vec4f *ptr = (Vec4f *)GetDebugManager()->m_MeshBBoxVB.Map(vt, dev, vboffs, sizeof(Vec4f)*adjacentPrimVertices.size()); memcpy(ptr, &adjacentPrimVertices[0], sizeof(Vec4f)*adjacentPrimVertices.size()); @@ -2159,7 +2159,7 @@ void VulkanReplay::RenderMesh(uint32_t frameID, uint32_t eventID, const vectorm_MeshBBoxVB.Map(vt, dev, &vboffs, sizeof(vertSprite)); + Vec4f *ptr = (Vec4f *)GetDebugManager()->m_MeshBBoxVB.Map(vt, dev, vboffs, sizeof(vertSprite)); memcpy(ptr, &vertSprite[0], sizeof(vertSprite)); @@ -2182,7 +2182,7 @@ void VulkanReplay::RenderMesh(uint32_t frameID, uint32_t eventID, const vectorm_MeshBBoxVB.Map(vt, dev, &vboffs, sizeof(vertSprite)); + FloatVector *ptr = (FloatVector *)GetDebugManager()->m_MeshBBoxVB.Map(vt, dev, vboffs, sizeof(vertSprite)); for(size_t i=0; i < inactiveVertices.size(); i++) {