From ba36dec115745085f49e63010358f8100d0aa1a1 Mon Sep 17 00:00:00 2001 From: baldurk Date: Sat, 27 Feb 2016 17:40:32 +0100 Subject: [PATCH] Change a load of asserts to the new value-printing style assert. --- renderdoc/driver/d3d11/d3d11_analyse.cpp | 16 +- renderdoc/driver/d3d11/d3d11_context.cpp | 2 +- renderdoc/driver/d3d11/d3d11_counters.cpp | 10 +- renderdoc/driver/d3d11/d3d11_device.cpp | 2 +- renderdoc/driver/gl/gl_driver.cpp | 4 +- renderdoc/driver/vulkan/vk_core.cpp | 34 +-- renderdoc/driver/vulkan/vk_counters.cpp | 8 +- renderdoc/driver/vulkan/vk_debug.cpp | 270 +++++++++--------- renderdoc/driver/vulkan/vk_initstate.cpp | 110 +++---- renderdoc/driver/vulkan/vk_linux.cpp | 2 +- renderdoc/driver/vulkan/vk_replay.cpp | 98 +++---- renderdoc/driver/vulkan/vk_win32.cpp | 2 +- .../vulkan/wrappers/vk_device_funcs.cpp | 16 +- .../driver/vulkan/wrappers/vk_misc_funcs.cpp | 4 +- .../vulkan/wrappers/vk_resource_funcs.cpp | 4 +- .../driver/vulkan/wrappers/vk_wsi_funcs.cpp | 20 +- 16 files changed, 301 insertions(+), 301 deletions(-) diff --git a/renderdoc/driver/d3d11/d3d11_analyse.cpp b/renderdoc/driver/d3d11/d3d11_analyse.cpp index 225daba69..0490f05f2 100644 --- a/renderdoc/driver/d3d11/d3d11_analyse.cpp +++ b/renderdoc/driver/d3d11/d3d11_analyse.cpp @@ -4927,7 +4927,7 @@ vector D3D11DebugManager::PixelHistory(uint32_t frameID, vect { hr = m_pImmediateContext->GetData(occl[i], &occlData, sizeof(occlData), 0); } while(hr == S_FALSE); - RDCASSERT(hr == S_OK); + RDCASSERTEQUAL(hr, S_OK); const FetchDrawcall *draw = m_WrappedDevice->GetDrawcall(frameID, events[i].eventID); @@ -5415,7 +5415,7 @@ vector D3D11DebugManager::PixelHistory(uint32_t frameID, vect { hr = m_pImmediateContext->GetData(testQueries[0], &occlData, sizeof(occlData), 0); } while(hr == S_FALSE); - RDCASSERT(hr == S_OK); + RDCASSERTEQUAL(hr, S_OK); mod.backfaceCulled = (occlData == 0); @@ -5429,7 +5429,7 @@ vector D3D11DebugManager::PixelHistory(uint32_t frameID, vect { hr = m_pImmediateContext->GetData(testQueries[1], &occlData, sizeof(occlData), 0); } while(hr == S_FALSE); - RDCASSERT(hr == S_OK); + RDCASSERTEQUAL(hr, S_OK); mod.depthClipped = (occlData == 0); @@ -5443,7 +5443,7 @@ vector D3D11DebugManager::PixelHistory(uint32_t frameID, vect { hr = m_pImmediateContext->GetData(testQueries[2], &occlData, sizeof(occlData), 0); } while(hr == S_FALSE); - RDCASSERT(hr == S_OK); + RDCASSERTEQUAL(hr, S_OK); mod.scissorClipped = (occlData == 0); @@ -5456,7 +5456,7 @@ vector D3D11DebugManager::PixelHistory(uint32_t frameID, vect { hr = m_pImmediateContext->GetData(testQueries[3], &occlData, sizeof(occlData), 0); } while(hr == S_FALSE); - RDCASSERT(hr == S_OK); + RDCASSERTEQUAL(hr, S_OK); mod.shaderDiscarded = (occlData == 0); @@ -5470,7 +5470,7 @@ vector D3D11DebugManager::PixelHistory(uint32_t frameID, vect { hr = m_pImmediateContext->GetData(testQueries[4], &occlData, sizeof(occlData), 0); } while(hr == S_FALSE); - RDCASSERT(hr == S_OK); + RDCASSERTEQUAL(hr, S_OK); mod.depthTestFailed = (occlData == 0); @@ -5484,7 +5484,7 @@ vector D3D11DebugManager::PixelHistory(uint32_t frameID, vect { hr = m_pImmediateContext->GetData(testQueries[5], &occlData, sizeof(occlData), 0); } while(hr == S_FALSE); - RDCASSERT(hr == S_OK); + RDCASSERTEQUAL(hr, S_OK); mod.stencilTestFailed = (occlData == 0); @@ -6152,7 +6152,7 @@ vector D3D11DebugManager::PixelHistory(uint32_t frameID, vect { hr = m_pImmediateContext->GetData(testQueries[0], &occlData, sizeof(occlData), 0); } while(hr == S_FALSE); - RDCASSERT(hr == S_OK); + RDCASSERTEQUAL(hr, S_OK); if(occlData == 0) { diff --git a/renderdoc/driver/d3d11/d3d11_context.cpp b/renderdoc/driver/d3d11/d3d11_context.cpp index 45020bd10..f27ceb730 100644 --- a/renderdoc/driver/d3d11/d3d11_context.cpp +++ b/renderdoc/driver/d3d11/d3d11_context.cpp @@ -1159,7 +1159,7 @@ void WrappedID3D11DeviceContext::ReplayLog(LogState readType, uint32_t startEven m_DoStateVerify = true; D3D11ChunkType header = (D3D11ChunkType)m_pSerialiser->PushContext(NULL, NULL, 1, false); - RDCASSERT(header == CONTEXT_CAPTURE_HEADER); + RDCASSERTEQUAL(header, CONTEXT_CAPTURE_HEADER); ResourceId id; m_pSerialiser->Serialise("context", id); diff --git a/renderdoc/driver/d3d11/d3d11_counters.cpp b/renderdoc/driver/d3d11/d3d11_counters.cpp index 1b9d3fb45..2176a8b99 100644 --- a/renderdoc/driver/d3d11/d3d11_counters.cpp +++ b/renderdoc/driver/d3d11/d3d11_counters.cpp @@ -176,9 +176,9 @@ void D3D11DebugManager::FillTimers(CounterContext &ctx, const DrawcallTreeNode & timer->before = timer->after = NULL; hr = m_pDevice->CreateQuery(&qdesc, &timer->before); - RDCASSERT(SUCCEEDED(hr)); + RDCASSERTEQUAL(hr, S_OK); hr = m_pDevice->CreateQuery(&qdesc, &timer->after); - RDCASSERT(SUCCEEDED(hr)); + RDCASSERTEQUAL(hr, S_OK); } else { @@ -266,7 +266,7 @@ vector D3D11DebugManager::FetchCounters(uint32_t frameID, const v { hr = m_pImmediateContext->GetData(disjoint, &disjointData, sizeof(D3D11_QUERY_DATA_TIMESTAMP_DISJOINT), 0); } while(hr == S_FALSE); - RDCASSERT(hr == S_OK); + RDCASSERTEQUAL(hr, S_OK); RDCASSERT(!disjointData.Disjoint); @@ -280,11 +280,11 @@ vector D3D11DebugManager::FetchCounters(uint32_t frameID, const v if(ctx.timers[i].before && ctx.timers[i].after) { hr = m_pImmediateContext->GetData(ctx.timers[i].before, &a, sizeof(UINT64), 0); - RDCASSERT(hr == S_OK); + RDCASSERTEQUAL(hr, S_OK); UINT64 b=0; hr = m_pImmediateContext->GetData(ctx.timers[i].after, &b, sizeof(UINT64), 0); - RDCASSERT(hr == S_OK); + RDCASSERTEQUAL(hr, S_OK); double duration = (double(b-a)/ticksToSecs); diff --git a/renderdoc/driver/d3d11/d3d11_device.cpp b/renderdoc/driver/d3d11/d3d11_device.cpp index 1253d8b3f..a1e1d687b 100644 --- a/renderdoc/driver/d3d11/d3d11_device.cpp +++ b/renderdoc/driver/d3d11/d3d11_device.cpp @@ -2239,7 +2239,7 @@ void WrappedID3D11Device::ReplayLog(uint32_t frameID, uint32_t startEventID, uin D3D11ChunkType header = (D3D11ChunkType)m_pSerialiser->PushContext(NULL, NULL, 1, false); - RDCASSERT(header == CAPTURE_SCOPE); + RDCASSERTEQUAL(header, CAPTURE_SCOPE); m_pSerialiser->SkipCurrentChunk(); diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp index c11a9eed4..ec32cf637 100644 --- a/renderdoc/driver/gl/gl_driver.cpp +++ b/renderdoc/driver/gl/gl_driver.cpp @@ -3891,7 +3891,7 @@ void WrappedOpenGL::ContextReplayLog(LogState readType, uint32_t startEventID, u m_DoStateVerify = true; GLChunkType header = (GLChunkType)m_pSerialiser->PushContext(NULL, NULL, 1, false); - RDCASSERT(header == CONTEXT_CAPTURE_HEADER); + RDCASSERTEQUAL(header, CONTEXT_CAPTURE_HEADER); WrappedOpenGL *context = this; @@ -4460,7 +4460,7 @@ void WrappedOpenGL::ReplayLog(uint32_t frameID, uint32_t startEventID, uint32_t GLChunkType header = (GLChunkType)m_pSerialiser->PushContext(NULL, NULL, 1, false); - RDCASSERT(header == CAPTURE_SCOPE); + RDCASSERTEQUAL(header, CAPTURE_SCOPE); m_pSerialiser->SkipCurrentChunk(); diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp index 7c2960afd..1d50f98da 100644 --- a/renderdoc/driver/vulkan/vk_core.cpp +++ b/renderdoc/driver/vulkan/vk_core.cpp @@ -375,7 +375,7 @@ VkCommandBuffer WrappedVulkan::GetNextCmd() SetDispatchTableOverMagicNumber(m_Device, ret); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(m_Device), ret); } @@ -407,7 +407,7 @@ void WrappedVulkan::SubmitCmds() if(m_Queue != VK_NULL_HANDLE) { VkResult vkr = ObjDisp(m_Queue)->QueueSubmit(Unwrap(m_Queue), 1, &submitInfo, VK_NULL_HANDLE); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } m_InternalCmds.submittedcmds.insert(m_InternalCmds.submittedcmds.end(), m_InternalCmds.pendingcmds.begin(), m_InternalCmds.pendingcmds.end()); @@ -429,7 +429,7 @@ VkSemaphore WrappedVulkan::GetNextSemaphore() { VkSemaphoreCreateInfo semInfo = { VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO }; VkResult vkr = ObjDisp(m_Device)->CreateSemaphore(Unwrap(m_Device), &semInfo, NULL, &ret); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(m_Device), ret); } @@ -670,7 +670,7 @@ bool WrappedVulkan::Serialise_BeginCaptureFrame(bool applyInitialState) } vkr = ObjDisp(cmd)->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); SubmitCmds(); // don't need to flush here @@ -852,7 +852,7 @@ bool WrappedVulkan::EndFrameCapture(void *dev, void *wnd) VK_IMAGE_LAYOUT_UNDEFINED, }; vt->CreateImage(Unwrap(dev), &imInfo, NULL, &readbackIm); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkMemoryRequirements mrq; vt->GetImageMemoryRequirements(Unwrap(dev), readbackIm, &mrq); @@ -868,15 +868,15 @@ bool WrappedVulkan::EndFrameCapture(void *dev, void *wnd) }; vkr = vt->AllocateMemory(Unwrap(dev), &allocInfo, NULL, &readbackMem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vkr = vt->BindImageMemory(Unwrap(dev), readbackIm, readbackMem, 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; // do image copy vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkImageCopy cpy = { { VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1 }, @@ -922,7 +922,7 @@ bool WrappedVulkan::EndFrameCapture(void *dev, void *wnd) DoPipelineBarrier(cmd, 1, &readBarrier); vkr = vt->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); SubmitCmds(); FlushQ(); // need to wait so we can readback @@ -930,7 +930,7 @@ bool WrappedVulkan::EndFrameCapture(void *dev, void *wnd) // map memory and readback byte *pData = NULL; vkr = vt->MapMemory(Unwrap(dev), readbackMem, 0, VK_WHOLE_SIZE, 0, (void **)&pData); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); RDCASSERT(pData != NULL); @@ -1243,7 +1243,7 @@ void WrappedVulkan::ContextReplayLog(LogState readType, uint32_t startEventID, u m_State = readType; VulkanChunkType header = (VulkanChunkType)m_pSerialiser->PushContext(NULL, NULL, 1, false); - RDCASSERT(header == CONTEXT_CAPTURE_HEADER); + RDCASSERTEQUAL(header, CONTEXT_CAPTURE_HEADER); WrappedVulkan *context = this; @@ -1399,12 +1399,12 @@ void WrappedVulkan::ApplyInitialContents() VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; vkr = ObjDisp(cmd)->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); DoPipelineBarrier(cmd, 1, &memBarrier); vkr = ObjDisp(cmd)->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // sync all GPU work so we can also apply descriptor set initial contents SubmitCmds(); @@ -1417,12 +1417,12 @@ void WrappedVulkan::ApplyInitialContents() cmd = GetNextCmd(); vkr = ObjDisp(cmd)->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); DoPipelineBarrier(cmd, 1, &memBarrier); vkr = ObjDisp(cmd)->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } void WrappedVulkan::ContextProcessChunk(uint64_t offset, VulkanChunkType chunk, bool forceExecute) @@ -1833,7 +1833,7 @@ void WrappedVulkan::ReplayLog(uint32_t frameID, uint32_t startEventID, uint32_t VulkanChunkType header = (VulkanChunkType)m_pSerialiser->PushContext(NULL, NULL, 1, false); - RDCASSERT(header == CAPTURE_SCOPE); + RDCASSERTEQUAL(header, CAPTURE_SCOPE); m_pSerialiser->SkipCurrentChunk(); @@ -1875,7 +1875,7 @@ void WrappedVulkan::ReplayLog(uint32_t frameID, uint32_t startEventID, uint32_t VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; vkr = ObjDisp(cmd)->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); rpWasActive = m_PartialReplayData.renderPassActive; diff --git a/renderdoc/driver/vulkan/vk_counters.cpp b/renderdoc/driver/vulkan/vk_counters.cpp index 0138869f7..3f467acc9 100644 --- a/renderdoc/driver/vulkan/vk_counters.cpp +++ b/renderdoc/driver/vulkan/vk_counters.cpp @@ -132,19 +132,19 @@ vector VulkanReplay::FetchCounters(uint32_t frameID, const vector VkQueryPool pool; VkResult vkr = ObjDisp(dev)->CreateQueryPool(Unwrap(dev), &poolCreateInfo, NULL, &pool); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkCommandBuffer cmd = m_pDriver->GetNextCmd(); VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; vkr = ObjDisp(dev)->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); ObjDisp(dev)->CmdResetQueryPool(Unwrap(cmd), pool, 0, maxEID*2); vkr = ObjDisp(dev)->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GPUTimerCallback cb(m_pDriver, this, pool); @@ -157,7 +157,7 @@ vector VulkanReplay::FetchCounters(uint32_t frameID, const vector vkr = ObjDisp(dev)->GetQueryPoolResults(Unwrap(dev), pool, 0, (uint32_t)m_Data.size(), sizeof(uint64_t)*m_Data.size(), &m_Data[0], sizeof(uint64_t), VK_QUERY_RESULT_64_BIT|VK_QUERY_RESULT_WAIT_BIT); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); ObjDisp(dev)->DestroyQueryPool(Unwrap(dev), pool, NULL); diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp index c900a2e90..cfb47727c 100644 --- a/renderdoc/driver/vulkan/vk_debug.cpp +++ b/renderdoc/driver/vulkan/vk_debug.cpp @@ -70,7 +70,7 @@ void VulkanDebugManager::GPUBuffer::Create(WrappedVulkan *driver, VkDevice dev, bufInfo.usage |= VK_BUFFER_USAGE_STORAGE_BUFFER_BIT; VkResult vkr = vt->CreateBuffer(Unwrap(dev), &bufInfo, NULL, &buf); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), buf); @@ -86,12 +86,12 @@ void VulkanDebugManager::GPUBuffer::Create(WrappedVulkan *driver, VkDevice dev, }; vkr = vt->AllocateMemory(Unwrap(dev), &allocInfo, NULL, &mem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), mem); vkr = vt->BindBufferMemory(Unwrap(dev), Unwrap(buf), Unwrap(mem), 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } void VulkanDebugManager::GPUBuffer::FillDescriptor(VkDescriptorBufferInfo &desc) @@ -108,7 +108,7 @@ void VulkanDebugManager::GPUBuffer::Destroy(const VkLayerDispatchTable *vt, VkDe if(buf != VK_NULL_HANDLE) { vt->DestroyBuffer(Unwrap(dev), Unwrap(buf), NULL); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->ReleaseWrappedResource(buf); buf = VK_NULL_HANDLE; } @@ -116,7 +116,7 @@ void VulkanDebugManager::GPUBuffer::Destroy(const VkLayerDispatchTable *vt, VkDe if(mem != VK_NULL_HANDLE) { vt->FreeMemory(Unwrap(dev), Unwrap(mem), NULL); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->ReleaseWrappedResource(mem); mem = VK_NULL_HANDLE; } @@ -140,7 +140,7 @@ void *VulkanDebugManager::GPUBuffer::Map(const VkLayerDispatchTable *vt, VkDevic void *ptr = NULL; VkResult vkr = vt->MapMemory(Unwrap(dev), Unwrap(mem), offset, size, 0, (void **)&ptr); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); return ptr; } @@ -339,7 +339,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) }; vkr = vt->CreateSampler(Unwrap(dev), &sampInfo, NULL, &m_LinearSampler); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_LinearSampler); @@ -347,7 +347,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) sampInfo.magFilter = VK_FILTER_NEAREST; vkr = vt->CreateSampler(Unwrap(dev), &sampInfo, NULL, &m_PointSampler); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_PointSampler); @@ -362,19 +362,19 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) }; vkr = vt->CreateDescriptorSetLayout(Unwrap(dev), &descsetLayoutInfo, NULL, &m_CheckerboardDescSetLayout); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_CheckerboardDescSetLayout); // identical layout vkr = vt->CreateDescriptorSetLayout(Unwrap(dev), &descsetLayoutInfo, NULL, &m_MeshDescSetLayout); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_MeshDescSetLayout); // identical layout vkr = vt->CreateDescriptorSetLayout(Unwrap(dev), &descsetLayoutInfo, NULL, &m_OutlineDescSetLayout); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_OutlineDescSetLayout); } @@ -393,7 +393,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) // because this will go through partial replay, needs proper creation info etc so we go through our wrapped // function vkr = m_pDriver->vkCreateDescriptorSetLayout(dev, &descsetLayoutInfo, NULL, &m_MeshFetchDescSetLayout); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } { @@ -422,7 +422,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) }; vkr = vt->CreateDescriptorSetLayout(Unwrap(dev), &descsetLayoutInfo, NULL, &m_TexDisplayDescSetLayout); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_TexDisplayDescSetLayout); } @@ -441,7 +441,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) }; vkr = vt->CreateDescriptorSetLayout(Unwrap(dev), &descsetLayoutInfo, NULL, &m_TextDescSetLayout); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_TextDescSetLayout); } @@ -461,7 +461,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) // because this will go through partial replay, needs proper creation info etc so we go through our wrapped // function vkr = m_pDriver->vkCreateDescriptorSetLayout(dev, &descsetLayoutInfo, NULL, &m_QuadDescSetLayout); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } { @@ -492,7 +492,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) }; vkr = vt->CreateDescriptorSetLayout(Unwrap(dev), &descsetLayoutInfo, NULL, &m_HistogramDescSetLayout); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_HistogramDescSetLayout); } @@ -504,21 +504,21 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) }; vkr = vt->CreatePipelineLayout(Unwrap(dev), &pipeLayoutInfo, NULL, &m_TexDisplayPipeLayout); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_TexDisplayPipeLayout); pipeLayoutInfo.pSetLayouts = UnwrapPtr(m_CheckerboardDescSetLayout); vkr = vt->CreatePipelineLayout(Unwrap(dev), &pipeLayoutInfo, NULL, &m_CheckerboardPipeLayout); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_CheckerboardPipeLayout); pipeLayoutInfo.pSetLayouts = UnwrapPtr(m_TextDescSetLayout); vkr = vt->CreatePipelineLayout(Unwrap(dev), &pipeLayoutInfo, NULL, &m_TextPipeLayout); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_TextPipeLayout); @@ -527,27 +527,27 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) if(m_State < WRITING) { vkr = m_pDriver->vkCreatePipelineLayout(dev, &pipeLayoutInfo, NULL, &m_QuadResolvePipeLayout); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } pipeLayoutInfo.pSetLayouts = UnwrapPtr(m_OutlineDescSetLayout); vkr = vt->CreatePipelineLayout(Unwrap(dev), &pipeLayoutInfo, NULL, &m_OutlinePipeLayout); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_OutlinePipeLayout); pipeLayoutInfo.pSetLayouts = UnwrapPtr(m_MeshDescSetLayout); vkr = vt->CreatePipelineLayout(Unwrap(dev), &pipeLayoutInfo, NULL, &m_MeshPipeLayout); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_MeshPipeLayout); pipeLayoutInfo.pSetLayouts = UnwrapPtr(m_HistogramDescSetLayout); vkr = vt->CreatePipelineLayout(Unwrap(dev), &pipeLayoutInfo, NULL, &m_HistogramPipeLayout); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_HistogramPipeLayout); @@ -566,7 +566,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) }; vkr = vt->CreateDescriptorPool(Unwrap(dev), &descpoolInfo, NULL, &m_DescriptorPool); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_DescriptorPool); @@ -577,7 +577,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) descAllocInfo.pSetLayouts = UnwrapPtr(m_CheckerboardDescSetLayout); vkr = vt->AllocateDescriptorSets(Unwrap(dev), &descAllocInfo, &m_CheckerboardDescSet); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_CheckerboardDescSet); @@ -585,14 +585,14 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) for(size_t i=0; i < ARRAY_COUNT(m_TexDisplayDescSet); i++) { vkr = vt->AllocateDescriptorSets(Unwrap(dev), &descAllocInfo, &m_TexDisplayDescSet[i]); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_TexDisplayDescSet[i]); } descAllocInfo.pSetLayouts = UnwrapPtr(m_TextDescSetLayout); vkr = vt->AllocateDescriptorSets(Unwrap(dev), &descAllocInfo, &m_TextDescSet); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_TextDescSet); @@ -600,31 +600,31 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) { descAllocInfo.pSetLayouts = UnwrapPtr(m_QuadDescSetLayout); vkr = vt->AllocateDescriptorSets(Unwrap(dev), &descAllocInfo, &m_QuadDescSet); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_QuadDescSet); } descAllocInfo.pSetLayouts = UnwrapPtr(m_OutlineDescSetLayout); vkr = vt->AllocateDescriptorSets(Unwrap(dev), &descAllocInfo, &m_OutlineDescSet); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_OutlineDescSet); descAllocInfo.pSetLayouts = UnwrapPtr(m_MeshDescSetLayout); vkr = vt->AllocateDescriptorSets(Unwrap(dev), &descAllocInfo, &m_MeshDescSet); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_MeshDescSet); descAllocInfo.pSetLayouts = UnwrapPtr(m_HistogramDescSetLayout); vkr = vt->AllocateDescriptorSets(Unwrap(dev), &descAllocInfo, &m_HistogramDescSet[0]); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_HistogramDescSet[0]); vkr = vt->AllocateDescriptorSets(Unwrap(dev), &descAllocInfo, &m_HistogramDescSet[1]); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_HistogramDescSet[1]); @@ -632,7 +632,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) { descAllocInfo.pSetLayouts = UnwrapPtr(m_MeshFetchDescSetLayout); vkr = vt->AllocateDescriptorSets(Unwrap(dev), &descAllocInfo, &m_MeshFetchDescSet); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_MeshFetchDescSet); } @@ -770,7 +770,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) } vkr = vt->CreateShaderModule(Unwrap(dev), &modinfo, NULL, &module[i]); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), module[i]); } @@ -906,7 +906,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) stages[1].module = Unwrap(module[CHECKERBOARDFS]); vkr = vt->CreateGraphicsPipelines(Unwrap(dev), VK_NULL_HANDLE, 1, &pipeInfo, NULL, &m_CheckerboardPipeline); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_CheckerboardPipeline); @@ -914,7 +914,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) pipeInfo.renderPass = RGBA8MSRP; vkr = vt->CreateGraphicsPipelines(Unwrap(dev), VK_NULL_HANDLE, 1, &pipeInfo, NULL, &m_CheckerboardMSAAPipeline); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); msaa.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; pipeInfo.renderPass = RGBA8RP; @@ -927,14 +927,14 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) pipeInfo.layout = Unwrap(m_TexDisplayPipeLayout); vkr = vt->CreateGraphicsPipelines(Unwrap(dev), VK_NULL_HANDLE, 1, &pipeInfo, NULL, &m_TexDisplayPipeline); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_TexDisplayPipeline); pipeInfo.renderPass = RGBA32RP; vkr = vt->CreateGraphicsPipelines(Unwrap(dev), VK_NULL_HANDLE, 1, &pipeInfo, NULL, &m_TexDisplayF32Pipeline); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_TexDisplayF32Pipeline); @@ -945,7 +945,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) attState.dstColorBlendFactor = VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA; vkr = vt->CreateGraphicsPipelines(Unwrap(dev), VK_NULL_HANDLE, 1, &pipeInfo, NULL, &m_TexDisplayBlendPipeline); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_TexDisplayBlendPipeline); @@ -957,7 +957,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) pipeInfo.layout = Unwrap(m_TextPipeLayout); vkr = vt->CreateGraphicsPipelines(Unwrap(dev), VK_NULL_HANDLE, 1, &pipeInfo, NULL, &m_TextPipeline); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_TextPipeline); @@ -972,7 +972,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) attState.dstAlphaBlendFactor = VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA; vkr = vt->CreateGraphicsPipelines(Unwrap(dev), VK_NULL_HANDLE, 1, &pipeInfo, NULL, &m_OutlinePipeline); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_OutlinePipeline); @@ -987,7 +987,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) if(m_State < WRITING) { vkr = m_pDriver->vkCreateGraphicsPipelines(dev, VK_NULL_HANDLE, 1, &pipeInfo, NULL, &m_QuadResolvePipeline); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } VkComputePipelineCreateInfo compPipeInfo = { @@ -1031,7 +1031,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) modinfo.pCode = &(*blob)[0]; vkr = vt->CreateShaderModule(Unwrap(dev), &modinfo, NULL, &histogram); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); sources[4] = shaderSources[MINMAXTILECS]; @@ -1042,7 +1042,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) modinfo.pCode = &(*blob)[0]; vkr = vt->CreateShaderModule(Unwrap(dev), &modinfo, NULL, &minmaxtile); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); if(t == 1) { @@ -1055,20 +1055,20 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) modinfo.pCode = &(*blob)[0]; vkr = vt->CreateShaderModule(Unwrap(dev), &modinfo, NULL, &minmaxresult); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } compPipeInfo.stage.module = minmaxtile; vkr = vt->CreateComputePipelines(Unwrap(dev), VK_NULL_HANDLE, 1, &compPipeInfo, NULL, &m_MinMaxTilePipe[t][f]); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_MinMaxTilePipe[t][f]); compPipeInfo.stage.module = histogram; vkr = vt->CreateComputePipelines(Unwrap(dev), VK_NULL_HANDLE, 1, &compPipeInfo, NULL, &m_HistogramPipe[t][f]); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_HistogramPipe[t][f]); @@ -1077,7 +1077,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) if(t == 1) { vkr = vt->CreateComputePipelines(Unwrap(dev), VK_NULL_HANDLE, 1, &compPipeInfo, NULL, &m_MinMaxResultPipe[f]); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_MinMaxResultPipe[f]); } @@ -1129,7 +1129,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); { const uint32_t width = FONT_TEX_WIDTH, height = FONT_TEX_HEIGHT; @@ -1175,7 +1175,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) // create and fill image { vkr = vt->CreateImage(Unwrap(dev), &imInfo, NULL, &m_TextAtlas); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_TextAtlas); @@ -1193,12 +1193,12 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) }; vkr = vt->AllocateMemory(Unwrap(dev), &allocInfo, NULL, &m_TextAtlasMem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_TextAtlasMem); vkr = vt->BindImageMemory(Unwrap(dev), Unwrap(m_TextAtlas), Unwrap(m_TextAtlasMem), 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkImageViewCreateInfo viewInfo = { VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, NULL, 0, @@ -1209,7 +1209,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) }; vkr = vt->CreateImageView(Unwrap(dev), &viewInfo, NULL, &m_TextAtlasView); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_TextAtlasView); @@ -1312,7 +1312,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) }; vkr = vt->CreateImage(Unwrap(dev), &imInfo, NULL, &m_PickPixelImage); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_PickPixelImage); @@ -1330,12 +1330,12 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) }; vkr = vt->AllocateMemory(Unwrap(dev), &allocInfo, NULL, &m_PickPixelImageMem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_PickPixelImageMem); vkr = vt->BindImageMemory(Unwrap(dev), Unwrap(m_PickPixelImage), Unwrap(m_PickPixelImageMem), 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkImageViewCreateInfo viewInfo = { VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, NULL, 0, @@ -1346,7 +1346,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) }; vkr = vt->CreateImageView(Unwrap(dev), &viewInfo, NULL, &m_PickPixelImageView); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_PickPixelImageView); @@ -1390,7 +1390,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) }; vkr = vt->CreateRenderPass(Unwrap(dev), &rpinfo, NULL, &m_PickPixelRP); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_PickPixelRP); @@ -1403,7 +1403,7 @@ VulkanDebugManager::VulkanDebugManager(WrappedVulkan *driver, VkDevice dev) }; vkr = vt->CreateFramebuffer(Unwrap(dev), &fbinfo, NULL, &m_PickPixelFB); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(dev), m_PickPixelFB); @@ -1877,7 +1877,7 @@ void VulkanDebugManager::BeginText(const TextPrintState &textstate) VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; VkResult vkr = vt->BeginCommandBuffer(Unwrap(textstate.cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkClearValue clearval = {0}; VkRenderPassBeginInfo rpbegin = { @@ -1983,7 +1983,7 @@ void VulkanDebugManager::GetBufferData(ResourceId buff, uint64_t offset, uint64_ VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; VkResult vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkBufferMemoryBarrier bufBarrier = { VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, NULL, @@ -1999,14 +1999,14 @@ void VulkanDebugManager::GetBufferData(ResourceId buff, uint64_t offset, uint64_ DoPipelineBarrier(cmd, 1, &bufBarrier); vkr = vt->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); while(sizeRemaining > 0) { VkDeviceSize chunkSize = RDCMIN(sizeRemaining, STAGE_BUFFER_BYTE_SIZE); VkResult vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkBufferCopy region = { srcoffset, 0, chunkSize }; vt->CmdCopyBuffer(Unwrap(cmd), Unwrap(srcBuf), Unwrap(m_ReadbackWindow.buf), 1, ®ion); @@ -2021,14 +2021,14 @@ void VulkanDebugManager::GetBufferData(ResourceId buff, uint64_t offset, uint64_ DoPipelineBarrier(cmd, 1, &bufBarrier); vkr = vt->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); m_pDriver->SubmitCmds(); m_pDriver->FlushQ(); byte *pData = NULL; vkr = vt->MapMemory(Unwrap(dev), Unwrap(m_ReadbackWindow.mem), 0, VK_WHOLE_SIZE, 0, (void **)&pData); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); RDCASSERT(pData != NULL); memcpy(&ret[dstoffset], pData, (size_t)chunkSize); @@ -2296,7 +2296,7 @@ void VulkanDebugManager::PatchFixedColShader(VkShaderModule &mod, float col[4]) }; VkResult vkr = m_pDriver->vkCreateShaderModule(m_Device, &modinfo, NULL, &mod); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } struct QuadOverdrawCallback : public DrawcallCallback @@ -2359,7 +2359,7 @@ struct QuadOverdrawCallback : public DrawcallCallback // create pipeline layout with same descriptor set layouts, plus our mesh output set VkPipelineLayout pipeLayout; vkr = m_pDriver->vkCreatePipelineLayout(m_pDriver->GetDev(), &pipeLayoutInfo, NULL, &pipeLayout); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); SAFE_DELETE_ARRAY(descSetLayouts); @@ -2421,7 +2421,7 @@ struct QuadOverdrawCallback : public DrawcallCallback VkDevice dev = m_pDriver->GetDev(); vkr = ObjDisp(dev)->CreateShaderModule(Unwrap(dev), &modinfo, NULL, &module); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); m_pDriver->GetResourceManager()->WrapResource(Unwrap(dev), module); @@ -2453,7 +2453,7 @@ struct QuadOverdrawCallback : public DrawcallCallback } vkr = m_pDriver->vkCreateGraphicsPipelines(dev, VK_NULL_HANDLE, 1, &pipeCreateInfo, NULL, &pipe.second); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); ObjDisp(dev)->DestroyShaderModule(Unwrap(dev), Unwrap(module), NULL); m_pDriver->GetResourceManager()->ReleaseWrappedResource(module); @@ -2523,7 +2523,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; VkResult vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // if the overlay image is the wrong size, free it if(m_OverlayImage != VK_NULL_HANDLE && (iminfo.extent.width != m_OverlayDim.width || iminfo.extent.height != m_OverlayDim.height)) @@ -2561,7 +2561,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve }; vkr = m_pDriver->vkCreateImage(m_Device, &imInfo, NULL, &m_OverlayImage); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkMemoryRequirements mrq; m_pDriver->vkGetImageMemoryRequirements(m_Device, m_OverlayImage, &mrq); @@ -2581,13 +2581,13 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve }; vkr = m_pDriver->vkAllocateMemory(m_Device, &allocInfo, NULL, &m_OverlayImageMem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); m_OverlayMemSize = mrq.size; } vkr = m_pDriver->vkBindImageMemory(m_Device, m_OverlayImage, m_OverlayImageMem, 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkImageViewCreateInfo viewInfo = { VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, NULL, 0, @@ -2598,7 +2598,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve }; vkr = m_pDriver->vkCreateImageView(m_Device, &viewInfo, NULL, &m_OverlayImageView); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // need to update image layout into valid state @@ -2641,7 +2641,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve }; vkr = m_pDriver->vkCreateRenderPass(m_Device, &rpinfo, NULL, &m_OverlayNoDepthRP); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // Create framebuffer rendering just to overlay image, no depth VkFramebufferCreateInfo fbinfo = { @@ -2652,7 +2652,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve }; vkr = m_pDriver->vkCreateFramebuffer(m_Device, &fbinfo, NULL, &m_OverlayNoDepthFB); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // can't create a framebuffer or renderpass for overlay image + depth as that // needs to match the depth texture type wherever our draw is. @@ -2823,12 +2823,12 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve } vkr = vt->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkPipeline pipe = VK_NULL_HANDLE; vkr = m_pDriver->vkCreateGraphicsPipelines(m_Device, VK_NULL_HANDLE, 1, &pipeCreateInfo, NULL, &pipe); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // modify state m_pDriver->m_RenderState.renderPass = GetResID(m_OverlayNoDepthRP); @@ -2858,7 +2858,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve cmd = m_pDriver->GetNextCmd(); vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // restore state m_pDriver->m_RenderState = prevstate; @@ -3088,16 +3088,16 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve } vkr = vt->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vkr = m_pDriver->vkCreateGraphicsPipelines(m_Device, VK_NULL_HANDLE, 1, &pipeCreateInfo, NULL, &pipe[0]); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); fragShader->module = mod[1]; rs->cullMode = origCullMode; vkr = m_pDriver->vkCreateGraphicsPipelines(m_Device, VK_NULL_HANDLE, 1, &pipeCreateInfo, NULL, &pipe[1]); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // modify state m_pDriver->m_RenderState.renderPass = GetResID(m_OverlayNoDepthRP); @@ -3128,7 +3128,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve cmd = m_pDriver->GetNextCmd(); vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // restore state m_pDriver->m_RenderState = prevstate; @@ -3216,7 +3216,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve }; vkr = m_pDriver->vkCreateRenderPass(m_Device, &rpinfo, NULL, &depthRP); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkImageView views[] = { m_OverlayImageView, @@ -3232,7 +3232,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve }; vkr = m_pDriver->vkCreateFramebuffer(m_Device, &fbinfo, NULL, &depthFB); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } // if depthRP is NULL, so is depthFB, and it means no depth buffer was @@ -3330,10 +3330,10 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve } vkr = vt->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vkr = m_pDriver->vkCreateGraphicsPipelines(m_Device, VK_NULL_HANDLE, 1, &pipeCreateInfo, NULL, &pipe[0]); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); fragShader->module = mod[1]; @@ -3347,7 +3347,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve } vkr = m_pDriver->vkCreateGraphicsPipelines(m_Device, VK_NULL_HANDLE, 1, &pipeCreateInfo, NULL, &pipe[1]); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // modify state m_pDriver->m_RenderState.renderPass = GetResID(m_OverlayNoDepthRP); @@ -3383,7 +3383,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve cmd = m_pDriver->GetNextCmd(); vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // restore state m_pDriver->m_RenderState = prevstate; @@ -3433,7 +3433,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve { vkr = vt->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); size_t startEvent = 0; @@ -3467,7 +3467,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve cmd = m_pDriver->GetNextCmd(); vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); m_pDriver->m_RenderState.BeginRenderPassAndApplyState(cmd); @@ -3497,7 +3497,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve vt->CmdClearAttachments(Unwrap(cmd), (uint32_t)atts.size(), &atts[0], 1, &rect); vkr = vt->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); for(size_t i = startEvent; i < events.size(); i++) { @@ -3510,7 +3510,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve cmd = m_pDriver->GetNextCmd(); vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } } else if(overlay == eTexOverlay_QuadOverdrawPass || overlay == eTexOverlay_QuadOverdrawDraw) @@ -3564,7 +3564,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve }; VkResult vkr = m_pDriver->vkCreateImage(m_Device, &imInfo, NULL, &quadImg); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkMemoryRequirements mrq = {0}; @@ -3576,10 +3576,10 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve }; vkr = m_pDriver->vkAllocateMemory(m_Device, &allocInfo, NULL, &quadImgMem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vkr = m_pDriver->vkBindImageMemory(m_Device, quadImg, quadImgMem, 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkImageViewCreateInfo viewinfo = { VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, NULL, @@ -3590,7 +3590,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve }; vkr = m_pDriver->vkCreateImageView(m_Device, &viewinfo, NULL, &quadImgView); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // update descriptor to point to our R32 result image VkDescriptorImageInfo imdesc = { 0 }; @@ -3636,7 +3636,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve // end this cmd buffer so the image is in the right state for the next part vkr = vt->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); m_pDriver->ReplayLog(frameID, 0, events[0], eReplay_WithoutDraw); @@ -3650,7 +3650,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve cmd = m_pDriver->GetNextCmd(); vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); quadImBarrier.srcAccessMask = quadImBarrier.dstAccessMask; quadImBarrier.oldLayout = quadImBarrier.newLayout; @@ -3684,7 +3684,7 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve vt->CmdEndRenderPass(Unwrap(cmd)); vkr = vt->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } m_pDriver->SubmitCmds(); @@ -3706,11 +3706,11 @@ ResourceId VulkanDebugManager::RenderOverlay(ResourceId texid, TextureDisplayOve cmd = m_pDriver->GetNextCmd(); vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } vkr = vt->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); return GetResID(m_OverlayImage); } @@ -3945,24 +3945,24 @@ MeshDisplayPipelines VulkanDebugManager::CacheMeshDisplayPipelines(const MeshFor ds.depthTestEnable = false; vkr = vt->CreateGraphicsPipelines(Unwrap(m_Device), VK_NULL_HANDLE, 1, &pipeInfo, NULL, &cache.pipes[MeshDisplayPipelines::ePipe_Wire]); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); ds.depthTestEnable = true; vkr = vt->CreateGraphicsPipelines(Unwrap(m_Device), VK_NULL_HANDLE, 1, &pipeInfo, NULL, &cache.pipes[MeshDisplayPipelines::ePipe_WireDepth]); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // solid shading pipeline rs.polygonMode = VK_POLYGON_MODE_FILL; ds.depthTestEnable = false; vkr = vt->CreateGraphicsPipelines(Unwrap(m_Device), VK_NULL_HANDLE, 1, &pipeInfo, NULL, &cache.pipes[MeshDisplayPipelines::ePipe_Solid]); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); ds.depthTestEnable = true; vkr = vt->CreateGraphicsPipelines(Unwrap(m_Device), VK_NULL_HANDLE, 1, &pipeInfo, NULL, &cache.pipes[MeshDisplayPipelines::ePipe_SolidDepth]); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); if(secondary.buf != ResourceId()) { @@ -3974,7 +3974,7 @@ MeshDisplayPipelines VulkanDebugManager::CacheMeshDisplayPipelines(const MeshFor vi.vertexBindingDescriptionCount = 2; vkr = vt->CreateGraphicsPipelines(Unwrap(m_Device), VK_NULL_HANDLE, 1, &pipeInfo, NULL, &cache.pipes[MeshDisplayPipelines::ePipe_Secondary]); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } vertAttrs[1].binding = 0; @@ -3990,7 +3990,7 @@ MeshDisplayPipelines VulkanDebugManager::CacheMeshDisplayPipelines(const MeshFor pipeInfo.stageCount = 3; vkr = vt->CreateGraphicsPipelines(Unwrap(m_Device), VK_NULL_HANDLE, 1, &pipeInfo, NULL, &cache.pipes[MeshDisplayPipelines::ePipe_Lit]); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); for(uint32_t i=0; i < MeshDisplayPipelines::ePipe_Count; i++) if(cache.pipes[i] != VK_NULL_HANDLE) @@ -4828,7 +4828,7 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t frameID, uint32_t eventID) // create pipeline layout with same descriptor set layouts, plus our mesh output set VkPipelineLayout pipeLayout; vkr = m_pDriver->vkCreatePipelineLayout(dev, &pipeLayoutInfo, NULL, &pipeLayout); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); SAFE_DELETE_ARRAY(descSetLayouts); @@ -4951,7 +4951,7 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t frameID, uint32_t eventID) }; vkr = m_pDriver->vkCreateBuffer(dev, &bufInfo, NULL, &uniqIdxBuf); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkMemoryRequirements mrq; m_pDriver->vkGetBufferMemoryRequirements(dev, uniqIdxBuf, &mrq); @@ -4963,14 +4963,14 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t frameID, uint32_t eventID) }; vkr = m_pDriver->vkAllocateMemory(dev, &allocInfo, NULL, &uniqIdxBufMem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vkr = m_pDriver->vkBindBufferMemory(dev, uniqIdxBuf, uniqIdxBufMem, 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); byte *idxData = NULL; vkr = m_pDriver->vkMapMemory(m_Device, uniqIdxBufMem, 0, VK_WHOLE_SIZE, 0, (void **)&idxData); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); memcpy(idxData, &indices[0], indices.size()*sizeof(uint32_t)); @@ -4979,7 +4979,7 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t frameID, uint32_t eventID) bufInfo.size = numIndices*idxsize; vkr = m_pDriver->vkCreateBuffer(dev, &bufInfo, NULL, &idxBuf); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); m_pDriver->vkGetBufferMemoryRequirements(dev, idxBuf, &mrq); @@ -4987,10 +4987,10 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t frameID, uint32_t eventID) allocInfo.memoryTypeIndex = m_pDriver->GetUploadMemoryIndex(mrq.memoryTypeBits); vkr = m_pDriver->vkAllocateMemory(dev, &allocInfo, NULL, &idxBufMem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vkr = m_pDriver->vkBindBufferMemory(dev, idxBuf, idxBufMem, 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } else { @@ -5011,7 +5011,7 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t frameID, uint32_t eventID) VkShaderModule module; vkr = m_pDriver->vkCreateShaderModule(dev, &moduleInfo, NULL, &module); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // change vertex shader to use our modified code for(uint32_t i=0; i < pipeCreateInfo.stageCount; i++) @@ -5028,7 +5028,7 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t frameID, uint32_t eventID) // create new pipeline VkPipeline pipe; vkr = m_pDriver->vkCreateGraphicsPipelines(m_Device, VK_NULL_HANDLE, 1, &pipeCreateInfo, NULL, &pipe); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // make copy of state to draw from VulkanRenderState modifiedstate = state; @@ -5060,12 +5060,12 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t frameID, uint32_t eventID) bufInfo.usage |= VK_BUFFER_USAGE_VERTEX_BUFFER_BIT; vkr = m_pDriver->vkCreateBuffer(dev, &bufInfo, NULL, &meshBuffer); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); bufInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT|VK_BUFFER_USAGE_TRANSFER_DST_BIT; vkr = m_pDriver->vkCreateBuffer(dev, &bufInfo, NULL, &readbackBuffer); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkMemoryRequirements mrq; m_pDriver->vkGetBufferMemoryRequirements(dev, meshBuffer, &mrq); @@ -5077,20 +5077,20 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t frameID, uint32_t eventID) }; vkr = m_pDriver->vkAllocateMemory(dev, &allocInfo, NULL, &meshMem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vkr = m_pDriver->vkBindBufferMemory(dev, meshBuffer, meshMem, 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); m_pDriver->vkGetBufferMemoryRequirements(dev, readbackBuffer, &mrq); allocInfo.memoryTypeIndex = m_pDriver->GetReadbackMemoryIndex(mrq.memoryTypeBits); vkr = m_pDriver->vkAllocateMemory(dev, &allocInfo, NULL, &readbackMem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vkr = m_pDriver->vkBindBufferMemory(dev, readbackBuffer, readbackMem, 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // vkUpdateDescriptorSet desc set to point to buffer VkDescriptorBufferInfo fetchdesc = { 0 }; @@ -5110,7 +5110,7 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t frameID, uint32_t eventID) VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; vkr = ObjDisp(dev)->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // do single draw modifiedstate.BeginRenderPassAndApplyState(cmd); @@ -5143,7 +5143,7 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t frameID, uint32_t eventID) DoPipelineBarrier(cmd, 1, &meshbufbarrier); vkr = ObjDisp(dev)->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // submit & flush so that we don't have to keep pipeline around for a while m_pDriver->SubmitCmds(); @@ -5167,12 +5167,12 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t frameID, uint32_t eventID) bufInfo.usage |= VK_BUFFER_USAGE_VERTEX_BUFFER_BIT; vkr = m_pDriver->vkCreateBuffer(dev, &bufInfo, NULL, &meshBuffer); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); bufInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT|VK_BUFFER_USAGE_TRANSFER_DST_BIT; vkr = m_pDriver->vkCreateBuffer(dev, &bufInfo, NULL, &readbackBuffer); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkMemoryRequirements mrq; m_pDriver->vkGetBufferMemoryRequirements(dev, meshBuffer, &mrq); @@ -5184,20 +5184,20 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t frameID, uint32_t eventID) }; vkr = m_pDriver->vkAllocateMemory(dev, &allocInfo, NULL, &meshMem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vkr = m_pDriver->vkBindBufferMemory(dev, meshBuffer, meshMem, 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); m_pDriver->vkGetBufferMemoryRequirements(dev, readbackBuffer, &mrq); allocInfo.memoryTypeIndex = m_pDriver->GetReadbackMemoryIndex(mrq.memoryTypeBits); vkr = m_pDriver->vkAllocateMemory(dev, &allocInfo, NULL, &readbackMem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vkr = m_pDriver->vkBindBufferMemory(dev, readbackBuffer, readbackMem, 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkBufferMemoryBarrier meshbufbarrier = { VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER, NULL, @@ -5212,7 +5212,7 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t frameID, uint32_t eventID) VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; vkr = ObjDisp(dev)->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // wait for upload to finish DoPipelineBarrier(cmd, 1, &meshbufbarrier); @@ -5275,7 +5275,7 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t frameID, uint32_t eventID) // upload rebased memory byte *idxData = NULL; vkr = m_pDriver->vkMapMemory(m_Device, idxBufMem, 0, VK_WHOLE_SIZE, 0, (void **)&idxData); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); memcpy(idxData, idx32, numIndices*idxsize); @@ -5310,7 +5310,7 @@ void VulkanDebugManager::InitPostVSBuffers(uint32_t frameID, uint32_t eventID) DoPipelineBarrier(cmd, 1, &meshbufbarrier); vkr = ObjDisp(dev)->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // submit & flush so that we don't have to keep pipeline around for a while m_pDriver->SubmitCmds(); diff --git a/renderdoc/driver/vulkan/vk_initstate.cpp b/renderdoc/driver/vulkan/vk_initstate.cpp index 155326cf3..003bb3462 100644 --- a/renderdoc/driver/vulkan/vk_initstate.cpp +++ b/renderdoc/driver/vulkan/vk_initstate.cpp @@ -144,7 +144,7 @@ bool WrappedVulkan::Prepare_SparseInitialState(WrappedVkBuffer *buf) VkResult vkr = VK_SUCCESS; vkr = ObjDisp(d)->CreateBuffer(Unwrap(d), &bufInfo, NULL, &dstBuf); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkMemoryRequirements mrq = { 0 }; @@ -158,12 +158,12 @@ bool WrappedVulkan::Prepare_SparseInitialState(WrappedVkBuffer *buf) allocInfo.allocationSize = AlignUp(allocInfo.allocationSize, mrq.alignment); vkr = ObjDisp(d)->AllocateMemory(Unwrap(d), &allocInfo, NULL, &readbackmem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(d), readbackmem); vkr = ObjDisp(d)->BindBufferMemory(Unwrap(d), dstBuf, Unwrap(readbackmem), 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vector bufdeletes; bufdeletes.push_back(dstBuf); @@ -171,7 +171,7 @@ bool WrappedVulkan::Prepare_SparseInitialState(WrappedVkBuffer *buf) VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; vkr = ObjDisp(d)->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // copy all of the bound memory objects for(auto it=boundMems.begin(); it != boundMems.end(); ++it) @@ -180,10 +180,10 @@ bool WrappedVulkan::Prepare_SparseInitialState(WrappedVkBuffer *buf) bufInfo.size = GetRecord(it->first)->Length; vkr = ObjDisp(d)->CreateBuffer(Unwrap(d), &bufInfo, NULL, &srcBuf); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vkr = ObjDisp(d)->BindBufferMemory(Unwrap(d), srcBuf, Unwrap(it->first), 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // copy srcbuf into its area in dstbuf VkBufferCopy region = { 0, it->second, bufInfo.size }; @@ -194,7 +194,7 @@ bool WrappedVulkan::Prepare_SparseInitialState(WrappedVkBuffer *buf) } vkr = ObjDisp(d)->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // INITSTATEBATCH SubmitCmds(); @@ -313,7 +313,7 @@ bool WrappedVulkan::Prepare_SparseInitialState(WrappedVkImage *im) VkResult vkr = VK_SUCCESS; vkr = ObjDisp(d)->CreateBuffer(Unwrap(d), &bufInfo, NULL, &dstBuf); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkMemoryRequirements mrq = { 0 }; @@ -327,12 +327,12 @@ bool WrappedVulkan::Prepare_SparseInitialState(WrappedVkImage *im) allocInfo.allocationSize = AlignUp(allocInfo.allocationSize, mrq.alignment); vkr = ObjDisp(d)->AllocateMemory(Unwrap(d), &allocInfo, NULL, &readbackmem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(d), readbackmem); vkr = ObjDisp(d)->BindBufferMemory(Unwrap(d), dstBuf, Unwrap(readbackmem), 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vector bufdeletes; bufdeletes.push_back(dstBuf); @@ -340,7 +340,7 @@ bool WrappedVulkan::Prepare_SparseInitialState(WrappedVkImage *im) VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; vkr = ObjDisp(d)->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // copy all of the bound memory objects for(auto it=boundMems.begin(); it != boundMems.end(); ++it) @@ -349,10 +349,10 @@ bool WrappedVulkan::Prepare_SparseInitialState(WrappedVkImage *im) bufInfo.size = GetRecord(it->first)->Length; vkr = ObjDisp(d)->CreateBuffer(Unwrap(d), &bufInfo, NULL, &srcBuf); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vkr = ObjDisp(d)->BindBufferMemory(Unwrap(d), srcBuf, Unwrap(it->first), 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // copy srcbuf into its area in dstbuf VkBufferCopy region = { 0, it->second, bufInfo.size }; @@ -363,7 +363,7 @@ bool WrappedVulkan::Prepare_SparseInitialState(WrappedVkImage *im) } vkr = ObjDisp(d)->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // INITSTATEBATCH SubmitCmds(); @@ -465,7 +465,7 @@ bool WrappedVulkan::Serialise_SparseBufferInitialState(ResourceId id, VulkanReso VkBuffer buf; vkr = ObjDisp(d)->CreateBuffer(Unwrap(d), &bufInfo, NULL, &buf); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(d), buf); @@ -479,12 +479,12 @@ bool WrappedVulkan::Serialise_SparseBufferInitialState(ResourceId id, VulkanReso }; vkr = ObjDisp(d)->AllocateMemory(Unwrap(d), &allocInfo, NULL, &mem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(d), mem); vkr = ObjDisp(d)->BindBufferMemory(Unwrap(d), Unwrap(buf), Unwrap(mem), 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); byte *ptr = NULL; ObjDisp(d)->MapMemory(Unwrap(d), Unwrap(mem), 0, VK_WHOLE_SIZE, 0, (void **)&ptr); @@ -668,7 +668,7 @@ bool WrappedVulkan::Serialise_SparseImageInitialState(ResourceId id, VulkanResou VkBuffer buf; vkr = ObjDisp(d)->CreateBuffer(Unwrap(d), &bufInfo, NULL, &buf); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(d), buf); @@ -682,12 +682,12 @@ bool WrappedVulkan::Serialise_SparseImageInitialState(ResourceId id, VulkanResou }; vkr = ObjDisp(d)->AllocateMemory(Unwrap(d), &allocInfo, NULL, &mem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(d), mem); vkr = ObjDisp(d)->BindBufferMemory(Unwrap(d), Unwrap(buf), Unwrap(mem), 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); byte *ptr = NULL; ObjDisp(d)->MapMemory(Unwrap(d), Unwrap(mem), 0, VK_WHOLE_SIZE, 0, (void **)&ptr); @@ -769,7 +769,7 @@ bool WrappedVulkan::Apply_SparseInitialState(WrappedVkBuffer *buf, VulkanResourc VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; vkr = ObjDisp(cmd)->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkBufferCreateInfo bufInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO, NULL, 0, @@ -791,7 +791,7 @@ bool WrappedVulkan::Apply_SparseInitialState(WrappedVkBuffer *buf, VulkanResourc } vkr = ObjDisp(cmd)->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); FlushQ(); @@ -896,7 +896,7 @@ bool WrappedVulkan::Apply_SparseInitialState(WrappedVkImage *im, VulkanResourceM VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; vkr = ObjDisp(cmd)->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkBufferCreateInfo bufInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO, NULL, 0, @@ -919,7 +919,7 @@ bool WrappedVulkan::Apply_SparseInitialState(WrappedVkImage *im, VulkanResourceM } vkr = ObjDisp(cmd)->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); return true; } @@ -998,7 +998,7 @@ bool WrappedVulkan::Prepare_InitialState(WrappedVkRes *res) VkBuffer dstBuf; vkr = ObjDisp(d)->CreateBuffer(Unwrap(d), &bufInfo, NULL, &dstBuf); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkMemoryRequirements mrq = { 0 }; @@ -1010,17 +1010,17 @@ bool WrappedVulkan::Prepare_InitialState(WrappedVkRes *res) }; vkr = ObjDisp(d)->AllocateMemory(Unwrap(d), &allocInfo, NULL, &readbackmem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(d), readbackmem); vkr = ObjDisp(d)->BindBufferMemory(Unwrap(d), dstBuf, Unwrap(readbackmem), 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; vkr = ObjDisp(d)->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkImageAspectFlags aspectFlags = VK_IMAGE_ASPECT_COLOR_BIT; if (IsDepthStencilFormat(layout->format)) @@ -1099,7 +1099,7 @@ bool WrappedVulkan::Prepare_InitialState(WrappedVkRes *res) } vkr = ObjDisp(d)->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // INITSTATEBATCH SubmitCmds(); @@ -1142,12 +1142,12 @@ bool WrappedVulkan::Prepare_InitialState(WrappedVkRes *res) // dstBuf is just over the allocated memory, so only the image's size bufInfo.size = datasize; vkr = ObjDisp(d)->CreateBuffer(Unwrap(d), &bufInfo, NULL, &dstBuf); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // srcBuf spans the entire memory, then we copy out the sub-region we're interested in bufInfo.size = memsize; vkr = ObjDisp(d)->CreateBuffer(Unwrap(d), &bufInfo, NULL, &srcBuf); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkMemoryRequirements mrq = { 0 }; @@ -1161,26 +1161,26 @@ bool WrappedVulkan::Prepare_InitialState(WrappedVkRes *res) allocInfo.allocationSize = AlignUp(allocInfo.allocationSize, mrq.alignment); vkr = ObjDisp(d)->AllocateMemory(Unwrap(d), &allocInfo, NULL, &readbackmem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(d), readbackmem); vkr = ObjDisp(d)->BindBufferMemory(Unwrap(d), srcBuf, datamem, 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vkr = ObjDisp(d)->BindBufferMemory(Unwrap(d), dstBuf, Unwrap(readbackmem), 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; vkr = ObjDisp(d)->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkBufferCopy region = { dataoffs, 0, datasize }; ObjDisp(d)->CmdCopyBuffer(Unwrap(cmd), srcBuf, dstBuf, 1, ®ion); vkr = ObjDisp(d)->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // INITSTATEBATCH SubmitCmds(); @@ -1458,7 +1458,7 @@ bool WrappedVulkan::Serialise_InitialState(ResourceId resid, WrappedVkRes *) VkDeviceMemory uploadmem = VK_NULL_HANDLE; vkr = ObjDisp(d)->CreateBuffer(Unwrap(d), &bufInfo, NULL, &buf); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkMemoryRequirements mrq = { 0 }; @@ -1472,10 +1472,10 @@ bool WrappedVulkan::Serialise_InitialState(ResourceId resid, WrappedVkRes *) // first we upload the data into a single buffer, then we do // a copy per-mip from that buffer to a new image vkr = ObjDisp(d)->AllocateMemory(Unwrap(d), &allocInfo, NULL, &uploadmem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vkr = ObjDisp(d)->BindBufferMemory(Unwrap(d), buf, uploadmem, 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); byte *ptr = NULL; ObjDisp(d)->MapMemory(Unwrap(d), uploadmem, 0, VK_WHOLE_SIZE, 0, (void **)&ptr); @@ -1511,7 +1511,7 @@ bool WrappedVulkan::Serialise_InitialState(ResourceId resid, WrappedVkRes *) VkImage im = VK_NULL_HANDLE; vkr = ObjDisp(d)->CreateImage(Unwrap(d), &imInfo, NULL, &im); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(d), im); @@ -1523,12 +1523,12 @@ bool WrappedVulkan::Serialise_InitialState(ResourceId resid, WrappedVkRes *) VkDeviceMemory mem = VK_NULL_HANDLE; vkr = ObjDisp(d)->AllocateMemory(Unwrap(d), &allocInfo, NULL, &mem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(d), mem); vkr = ObjDisp(d)->BindImageMemory(Unwrap(d), Unwrap(im), Unwrap(mem), 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; @@ -1536,7 +1536,7 @@ bool WrappedVulkan::Serialise_InitialState(ResourceId resid, WrappedVkRes *) VkCommandBuffer cmd = GetNextCmd(); vkr = ObjDisp(d)->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkImageAspectFlags aspectFlags = VK_IMAGE_ASPECT_COLOR_BIT; @@ -1610,7 +1610,7 @@ bool WrappedVulkan::Serialise_InitialState(ResourceId resid, WrappedVkRes *) } vkr = ObjDisp(d)->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // INITSTATEBATCH SubmitCmds(); @@ -1651,7 +1651,7 @@ bool WrappedVulkan::Serialise_InitialState(ResourceId resid, WrappedVkRes *) VkBuffer buf; vkr = ObjDisp(d)->CreateBuffer(Unwrap(d), &bufInfo, NULL, &buf); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(d), buf); @@ -1665,12 +1665,12 @@ bool WrappedVulkan::Serialise_InitialState(ResourceId resid, WrappedVkRes *) }; vkr = ObjDisp(d)->AllocateMemory(Unwrap(d), &allocInfo, NULL, &mem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(d), mem); vkr = ObjDisp(d)->BindBufferMemory(Unwrap(d), Unwrap(buf), Unwrap(mem), 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); byte *ptr = NULL; ObjDisp(d)->MapMemory(Unwrap(d), Unwrap(mem), 0, VK_WHOLE_SIZE, 0, (void **)&ptr); @@ -1815,7 +1815,7 @@ void WrappedVulkan::Apply_InitialState(WrappedVkRes *live, VulkanResourceManager VkCommandBuffer cmd = GetNextCmd(); vkr = ObjDisp(cmd)->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkImageMemoryBarrier barrier = { VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, NULL, @@ -1858,14 +1858,14 @@ void WrappedVulkan::Apply_InitialState(WrappedVkRes *live, VulkanResourceManager } vkr = ObjDisp(cmd)->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } else if(initial.num == eInitialContents_ClearDepthStencilImage) { VkCommandBuffer cmd = GetNextCmd(); vkr = ObjDisp(cmd)->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkImageMemoryBarrier barrier = { VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, NULL, @@ -1907,7 +1907,7 @@ void WrappedVulkan::Apply_InitialState(WrappedVkRes *live, VulkanResourceManager } vkr = ObjDisp(cmd)->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } else { @@ -1922,7 +1922,7 @@ void WrappedVulkan::Apply_InitialState(WrappedVkRes *live, VulkanResourceManager VkCommandBuffer cmd = GetNextCmd(); vkr = ObjDisp(cmd)->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkExtent3D extent = m_CreationInfo.m_Image[id].extent; @@ -1993,7 +1993,7 @@ void WrappedVulkan::Apply_InitialState(WrappedVkRes *live, VulkanResourceManager } vkr = ObjDisp(cmd)->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } else if(type == eResDeviceMemory) { @@ -2012,7 +2012,7 @@ void WrappedVulkan::Apply_InitialState(WrappedVkRes *live, VulkanResourceManager VkCommandBuffer cmd = GetNextCmd(); vkr = ObjDisp(cmd)->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkBufferCreateInfo bufInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO, NULL, 0, @@ -2026,7 +2026,7 @@ void WrappedVulkan::Apply_InitialState(WrappedVkRes *live, VulkanResourceManager ObjDisp(cmd)->CmdCopyBuffer(Unwrap(cmd), Unwrap(srcBuf), Unwrap(dstBuf), 1, ®ion); vkr = ObjDisp(cmd)->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } else { diff --git a/renderdoc/driver/vulkan/vk_linux.cpp b/renderdoc/driver/vulkan/vk_linux.cpp index 1976844bc..b1d9d9693 100644 --- a/renderdoc/driver/vulkan/vk_linux.cpp +++ b/renderdoc/driver/vulkan/vk_linux.cpp @@ -57,7 +57,7 @@ void VulkanReplay::OutputWindow::CreateSurface(VkInstance inst) createInfo.window = wnd; VkResult vkr = ObjDisp(inst)->CreateXcbSurfaceKHR(Unwrap(inst), &createInfo, NULL, &surface); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } void VulkanReplay::GetOutputWindowDimensions(uint64_t id, int32_t &w, int32_t &h) diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp index 5af26a0d4..1769e0a1b 100644 --- a/renderdoc/driver/vulkan/vk_replay.cpp +++ b/renderdoc/driver/vulkan/vk_replay.cpp @@ -197,14 +197,14 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device, uint32_t numFormats = 0; vkr = ObjDisp(inst)->GetPhysicalDeviceSurfaceFormatsKHR(Unwrap(phys), Unwrap(surface), &numFormats, NULL); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); if(numFormats > 0) { VkSurfaceFormatKHR *formats = new VkSurfaceFormatKHR[numFormats]; vkr = ObjDisp(inst)->GetPhysicalDeviceSurfaceFormatsKHR(Unwrap(phys), Unwrap(surface), &numFormats, formats); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); if(numFormats == 1 && formats[0].format == VK_FORMAT_UNDEFINED) { @@ -242,14 +242,14 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device, uint32_t numModes = 0; vkr = ObjDisp(inst)->GetPhysicalDeviceSurfacePresentModesKHR(Unwrap(phys), Unwrap(surface), &numModes, NULL); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); if(numModes > 0) { VkPresentModeKHR *modes = new VkPresentModeKHR[numModes]; vkr = ObjDisp(inst)->GetPhysicalDeviceSurfacePresentModesKHR(Unwrap(phys), Unwrap(surface), &numModes, modes); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // If mailbox mode is available, use it, as is the lowest-latency non- // tearing mode. If not, try IMMEDIATE which will usually be available, @@ -289,7 +289,7 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device, }; vkr = vt->CreateSwapchainKHR(Unwrap(device), &swapInfo, NULL, &swap); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(device), swap); @@ -300,11 +300,11 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device, } vkr = vt->GetSwapchainImagesKHR(Unwrap(device), Unwrap(swap), &numImgs, NULL); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkImage* imgs = new VkImage[numImgs]; vkr = vt->GetSwapchainImagesKHR(Unwrap(device), Unwrap(swap), &numImgs, imgs); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); for(size_t i=0; i < numImgs; i++) { @@ -330,7 +330,7 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device, }; VkResult vkr = vt->CreateImage(Unwrap(device), &imInfo, NULL, &dsimg); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(device), dsimg); @@ -344,12 +344,12 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device, }; vkr = vt->AllocateMemory(Unwrap(device), &allocInfo, NULL, &dsmem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(device), dsmem); vkr = vt->BindImageMemory(Unwrap(device), Unwrap(dsimg), Unwrap(dsmem), 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); depthBarrier.image = Unwrap(dsimg); depthBarrier.oldLayout = depthBarrier.newLayout = VK_IMAGE_LAYOUT_UNDEFINED; @@ -363,7 +363,7 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device, }; vkr = vt->CreateImageView(Unwrap(device), &info, NULL, &dsview); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(device), dsview); } @@ -405,7 +405,7 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device, }; vkr = vt->CreateRenderPass(Unwrap(device), &rpinfo, NULL, &rp); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(device), rp); @@ -416,7 +416,7 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device, rpinfo.attachmentCount = 2; vkr = vt->CreateRenderPass(Unwrap(device), &rpinfo, NULL, &rpdepth); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(device), rpdepth); } @@ -434,7 +434,7 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device, }; VkResult vkr = vt->CreateImage(Unwrap(device), &imInfo, NULL, &bb); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(device), bb); @@ -448,12 +448,12 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device, }; vkr = vt->AllocateMemory(Unwrap(device), &allocInfo, NULL, &bbmem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(device), bbmem); vkr = vt->BindImageMemory(Unwrap(device), Unwrap(bb), Unwrap(bbmem), 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); bbBarrier.image = Unwrap(bb); bbBarrier.oldLayout = bbBarrier.newLayout = VK_IMAGE_LAYOUT_UNDEFINED; @@ -469,7 +469,7 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device, }; vkr = vt->CreateImageView(Unwrap(device), &info, NULL, &bbview); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(device), bbview); @@ -481,7 +481,7 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device, }; vkr = vt->CreateFramebuffer(Unwrap(device), &fbinfo, NULL, &fb); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(device), fb); @@ -496,7 +496,7 @@ void VulkanReplay::OutputWindow::Create(WrappedVulkan *driver, VkDevice device, }; vkr = vt->CreateFramebuffer(Unwrap(device), &fbinfo, NULL, &fbdepth); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(device), fbdepth); } @@ -886,7 +886,7 @@ void VulkanReplay::PickPixel(ResourceId texture, uint32_t x, uint32_t y, uint32_ VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); DoPipelineBarrier(cmd, 1, &pickimBarrier); pickimBarrier.oldLayout = pickimBarrier.newLayout; @@ -1267,7 +1267,7 @@ void VulkanReplay::CreateTexImageView(VkImageAspectFlags aspectFlags, VkImage li VkImageView view; VkResult vkr = ObjDisp(dev)->CreateImageView(Unwrap(dev), &viewInfo, NULL, &view); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); ResourceId viewid = m_pDriver->GetResourceManager()->WrapResource(Unwrap(dev), view); // register as a live-only resource, so it is cleaned up properly @@ -1294,7 +1294,7 @@ void VulkanReplay::RenderCheckerboard(Vec3f light, Vec3f dark) VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; VkResult vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); uint32_t uboOffs = 0; @@ -1329,7 +1329,7 @@ void VulkanReplay::RenderCheckerboard(Vec3f light, Vec3f dark) } vkr = vt->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } void VulkanReplay::RenderHighlightBox(float w, float h, float scale) @@ -1347,7 +1347,7 @@ void VulkanReplay::RenderHighlightBox(float w, float h, float scale) VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; VkResult vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); { VkClearValue clearval = {0}; @@ -1406,7 +1406,7 @@ void VulkanReplay::RenderHighlightBox(float w, float h, float scale) } vkr = vt->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } ResourceId VulkanReplay::RenderOverlay(ResourceId texid, TextureDisplayOverlay overlay, uint32_t frameID, uint32_t eventID, const vector &passEvents) @@ -1515,7 +1515,7 @@ void VulkanReplay::RenderMesh(uint32_t frameID, uint32_t eventID, const vectorBeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkClearValue clearval = {0}; VkRenderPassBeginInfo rpbegin = { @@ -1913,7 +1913,7 @@ void VulkanReplay::RenderMesh(uint32_t frameID, uint32_t eventID, const vectorCmdEndRenderPass(Unwrap(cmd)); vkr = vt->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); uint64_t maxIndex = cfg.position.numVerts; @@ -1970,7 +1970,7 @@ void VulkanReplay::RenderMesh(uint32_t frameID, uint32_t eventID, const vectorGetNextCmd(); vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vt->CmdBeginRenderPass(Unwrap(cmd), &rpbegin, VK_SUBPASS_CONTENTS_INLINE); vt->CmdSetViewport(Unwrap(cmd), 0, 1, &viewport); @@ -2444,7 +2444,7 @@ void VulkanReplay::RenderMesh(uint32_t frameID, uint32_t eventID, const vectorCmdEndRenderPass(Unwrap(cmd)); vkr = vt->EndCommandBuffer(Unwrap(cmd)); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } bool VulkanReplay::CheckResizeOutputWindow(uint64_t id) @@ -2503,10 +2503,10 @@ void VulkanReplay::BindOutputWindow(uint64_t id, bool depth) VkSemaphoreCreateInfo semInfo = { VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO, NULL, VK_FENCE_CREATE_SIGNALED_BIT }; VkResult vkr = vt->CreateSemaphore(Unwrap(dev), &semInfo, NULL, &sem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vkr = vt->AcquireNextImageKHR(Unwrap(dev), Unwrap(outw.swap), UINT64_MAX, sem, VK_NULL_HANDLE, &outw.curidx); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkSubmitInfo submitInfo = { VK_STRUCTURE_TYPE_SUBMIT_INFO, NULL, @@ -2516,7 +2516,7 @@ void VulkanReplay::BindOutputWindow(uint64_t id, bool depth) }; vkr = vt->QueueSubmit(Unwrap(m_pDriver->GetQ()), 1, &submitInfo, VK_NULL_HANDLE); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vt->QueueWaitIdle(Unwrap(m_pDriver->GetQ())); @@ -2525,7 +2525,7 @@ void VulkanReplay::BindOutputWindow(uint64_t id, bool depth) VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); outw.depthBarrier.newLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; @@ -2563,7 +2563,7 @@ void VulkanReplay::ClearOutputWindowColour(uint64_t id, float col[4]) VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; VkResult vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); outw.bbBarrier.srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; outw.bbBarrier.oldLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -2602,7 +2602,7 @@ void VulkanReplay::ClearOutputWindowDepth(uint64_t id, float depth, uint8_t sten VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; VkResult vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkClearDepthStencilValue ds = { depth, stencil }; @@ -2640,7 +2640,7 @@ void VulkanReplay::FlipOutputWindow(uint64_t id) VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; VkResult vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // ensure rendering has completed before copying outw.bbBarrier.srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; @@ -2706,7 +2706,7 @@ void VulkanReplay::FlipOutputWindow(uint64_t id) }; vt->QueuePresentKHR(Unwrap(m_pDriver->GetQ()), &presentInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); m_pDriver->FlushQ(); } @@ -3304,7 +3304,7 @@ void VulkanReplay::FillCBufferVariables(rdctype::array invars, v { const byte *d = &data[dataOffset]; - RDCASSERT(rows <= 4 && rows*cols <= 16); + RDCASSERT(rows <= 4 && rows*cols <= 16, rows, cols); if(!rowMajor) { @@ -4023,7 +4023,7 @@ byte *VulkanReplay::GetTextureData(ResourceId tex, uint32_t arrayIdx, uint32_t m VkCommandBufferBeginInfo beginInfo = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT }; VkResult vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); if(imInfo.samples > 1) { @@ -4061,10 +4061,10 @@ byte *VulkanReplay::GetTextureData(ResourceId tex, uint32_t arrayIdx, uint32_t m }; vkr = vt->AllocateMemory(Unwrap(dev), &allocInfo, NULL, &tmpMemory); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vkr = vt->BindImageMemory(Unwrap(dev), tmpImage, tmpMemory, 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkImageMemoryBarrier dstimBarrier = { VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, NULL, @@ -4156,7 +4156,7 @@ byte *VulkanReplay::GetTextureData(ResourceId tex, uint32_t arrayIdx, uint32_t m }; vkr = vt->CreateFramebuffer(Unwrap(dev), &fbinfo, NULL, &tmpFB[i]); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkClearValue clearval = {0}; VkRenderPassBeginInfo rpbegin = { @@ -4177,7 +4177,7 @@ byte *VulkanReplay::GetTextureData(ResourceId tex, uint32_t arrayIdx, uint32_t m cmd = m_pDriver->GetNextCmd(); vkr = vt->BeginCommandBuffer(Unwrap(cmd), &beginInfo); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // ensure all writes happen before copy & readback dstimBarrier.oldLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -4216,10 +4216,10 @@ byte *VulkanReplay::GetTextureData(ResourceId tex, uint32_t arrayIdx, uint32_t m }; vkr = vt->AllocateMemory(Unwrap(dev), &allocInfo, NULL, &tmpMemory); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vkr = vt->BindImageMemory(Unwrap(dev), tmpImage, tmpMemory, 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkImageResolve resolveRegion = { { VkImageAspectFlags(isDepth ? VK_IMAGE_ASPECT_DEPTH_BIT : VK_IMAGE_ASPECT_COLOR_BIT), mip, arrayIdx, 1 }, @@ -4340,7 +4340,7 @@ byte *VulkanReplay::GetTextureData(ResourceId tex, uint32_t arrayIdx, uint32_t m VkBuffer readbackBuf = VK_NULL_HANDLE; vkr = vt->CreateBuffer(Unwrap(dev), &bufInfo, NULL, &readbackBuf); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkMemoryRequirements mrq = { 0 }; @@ -4353,10 +4353,10 @@ byte *VulkanReplay::GetTextureData(ResourceId tex, uint32_t arrayIdx, uint32_t m VkDeviceMemory readbackMem = VK_NULL_HANDLE; vkr = vt->AllocateMemory(Unwrap(dev), &allocInfo, NULL, &readbackMem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); vkr = vt->BindBufferMemory(Unwrap(dev), readbackBuf, readbackMem, 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // copy from desired subresource in srcImage to buffer vt->CmdCopyImageToBuffer(Unwrap(cmd), srcImage, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, readbackBuf, 1, ©region); @@ -4392,7 +4392,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, VK_WHOLE_SIZE, 0, (void **)&pData); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); RDCASSERT(pData != NULL); diff --git a/renderdoc/driver/vulkan/vk_win32.cpp b/renderdoc/driver/vulkan/vk_win32.cpp index 9c3e9216b..b9a712f4d 100644 --- a/renderdoc/driver/vulkan/vk_win32.cpp +++ b/renderdoc/driver/vulkan/vk_win32.cpp @@ -45,7 +45,7 @@ void VulkanReplay::OutputWindow::CreateSurface(VkInstance inst) (const char *)&dllLocator, (HMODULE *)&createInfo.hinstance); VkResult vkr = ObjDisp(inst)->CreateWin32SurfaceKHR(Unwrap(inst), &createInfo, NULL, &surface); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } void VulkanReplay::GetOutputWindowDimensions(uint64_t id, int32_t &w, int32_t &h) diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp index 495cfc1c2..15476842a 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp @@ -103,7 +103,7 @@ void WrappedVulkan::Initialise(VkInitParams ¶ms) m_Instance = VK_NULL_HANDLE; VkResult ret = GetInstanceDispatchTable(NULL)->CreateInstance(&instinfo, NULL, &m_Instance); - RDCASSERT(ret == VK_SUCCESS); + RDCASSERTEQUAL(ret, VK_SUCCESS); InitInstanceReplayTables(m_Instance); @@ -325,13 +325,13 @@ bool WrappedVulkan::Serialise_vkEnumeratePhysicalDevices( instance = GetResourceManager()->GetLiveHandle(inst); VkResult vkr = ObjDisp(instance)->EnumeratePhysicalDevices(Unwrap(instance), &count, NULL); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); RDCASSERT(count > physIndex); devices = new VkPhysicalDevice[count]; vkr = ObjDisp(instance)->EnumeratePhysicalDevices(Unwrap(instance), &count, devices); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // PORTABILITY match up physical devices to those available on replay @@ -373,7 +373,7 @@ VkResult WrappedVulkan::vkEnumeratePhysicalDevices( VkPhysicalDevice *devices = new VkPhysicalDevice[count]; vkr = ObjDisp(instance)->EnumeratePhysicalDevices(Unwrap(instance), &count, devices); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); m_PhysicalDevices.resize(count); @@ -596,12 +596,12 @@ bool WrappedVulkan::Serialise_vkCreateDevice( uint32_t numExts = 0; VkResult vkr = ObjDisp(physicalDevice)->EnumerateDeviceExtensionProperties(Unwrap(physicalDevice), NULL, &numExts, NULL); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); VkExtensionProperties *exts = new VkExtensionProperties[numExts]; vkr = ObjDisp(physicalDevice)->EnumerateDeviceExtensionProperties(Unwrap(physicalDevice), NULL, &numExts, exts); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); for(uint32_t i=0; i < numExts; i++) RDCLOG("Ext %u: %s (%u)", i, exts[i].extensionName, exts[i].specVersion); @@ -628,7 +628,7 @@ bool WrappedVulkan::Serialise_vkCreateDevice( { VkCommandPoolCreateInfo poolInfo = { VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, NULL, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, qFamilyIdx }; vkr = ObjDisp(device)->CreateCommandPool(Unwrap(device), &poolInfo, NULL, &m_InternalCmds.cmdpool); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(device), m_InternalCmds.cmdpool); } @@ -848,7 +848,7 @@ VkResult WrappedVulkan::vkCreateDevice( { VkCommandPoolCreateInfo poolInfo = { VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, NULL, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, qFamilyIdx }; vkr = ObjDisp(device)->CreateCommandPool(Unwrap(device), &poolInfo, NULL, &m_InternalCmds.cmdpool); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(device), m_InternalCmds.cmdpool); } diff --git a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp index 6acab7e9f..5618110a0 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp @@ -584,7 +584,7 @@ bool WrappedVulkan::Serialise_vkCreateRenderPass( } ret = ObjDisp(device)->CreateRenderPass(Unwrap(device), &info, NULL, &rpinfo.loadRP); - RDCASSERT(ret == VK_SUCCESS); + RDCASSERTEQUAL(ret, VK_SUCCESS); // handle the loadRP being a duplicate if(GetResourceManager()->HasWrapper(ToTypedHandle(rpinfo.loadRP))) @@ -667,7 +667,7 @@ VkResult WrappedVulkan::vkCreateRenderPass( info.pAttachments = atts; ret = ObjDisp(device)->CreateRenderPass(Unwrap(device), &info, NULL, &rpinfo.loadRP); - RDCASSERT(ret == VK_SUCCESS); + RDCASSERTEQUAL(ret, VK_SUCCESS); ResourceId loadRPid = GetResourceManager()->WrapResource(Unwrap(device), rpinfo.loadRP); diff --git a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp index be1044ff2..4a326c93d 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp @@ -184,7 +184,7 @@ bool WrappedVulkan::Serialise_vkAllocateMemory( }; ret = ObjDisp(device)->CreateBuffer(Unwrap(device), &bufInfo, NULL, &buf); - RDCASSERT(ret == VK_SUCCESS); + RDCASSERTEQUAL(ret, VK_SUCCESS); ResourceId bufid = GetResourceManager()->WrapResource(Unwrap(device), buf); @@ -262,7 +262,7 @@ VkResult WrappedVulkan::vkAllocateMemory( }; ret = ObjDisp(device)->CreateBuffer(Unwrap(device), &bufInfo, NULL, &buf); - RDCASSERT(ret == VK_SUCCESS); + RDCASSERTEQUAL(ret, VK_SUCCESS); ResourceId bufid = GetResourceManager()->WrapResource(Unwrap(device), buf); diff --git a/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp index d3c7850ed..4109faf51 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp @@ -80,7 +80,7 @@ bool WrappedVulkan::Serialise_vkGetSwapchainImagesKHR( // use original ID because we don't create a live version of the swapchain auto &swapInfo = m_CreationInfo.m_SwapChain[swapId]; - RDCASSERT(idx < swapInfo.images.size()); + RDCASSERT(idx < swapInfo.images.size(), idx, swapInfo.images.size()); GetResourceManager()->AddLiveResource(id, swapInfo.images[idx].im); m_CreationInfo.m_Image[GetResID(swapInfo.images[idx].im)] = m_CreationInfo.m_Image[swapId]; @@ -186,7 +186,7 @@ bool WrappedVulkan::Serialise_vkCreateSwapchainKHR( VkResult vkr = VK_SUCCESS; vkr = ObjDisp(device)->GetSwapchainImagesKHR(Unwrap(device), Unwrap(*pSwapChain), &numIms, NULL); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); } SERIALISE_ELEMENT(uint32_t, numSwapImages, numIms); @@ -224,7 +224,7 @@ bool WrappedVulkan::Serialise_vkCreateSwapchainKHR( VkImage im = VK_NULL_HANDLE; VkResult vkr = ObjDisp(device)->CreateImage(Unwrap(device), &imInfo, NULL, &im); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); ResourceId liveId = GetResourceManager()->WrapResource(Unwrap(device), im); @@ -238,14 +238,14 @@ bool WrappedVulkan::Serialise_vkCreateSwapchainKHR( }; vkr = ObjDisp(device)->AllocateMemory(Unwrap(device), &allocInfo, NULL, &mem); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); ResourceId memid = GetResourceManager()->WrapResource(Unwrap(device), mem); // register as a live-only resource, so it is cleaned up properly GetResourceManager()->AddLiveResource(memid, mem); vkr = ObjDisp(device)->BindImageMemory(Unwrap(device), Unwrap(im), Unwrap(mem), 0); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); // image live ID will be assigned separately in Serialise_vkGetSwapChainInfoWSI // memory doesn't have a live ID @@ -368,7 +368,7 @@ VkResult WrappedVulkan::vkCreateSwapchainKHR( }; vkr = vt->CreateRenderPass(Unwrap(device), &rpinfo, NULL, &swapInfo.rp); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(device), swapInfo.rp); } @@ -377,7 +377,7 @@ VkResult WrappedVulkan::vkCreateSwapchainKHR( { uint32_t numSwapImages; VkResult ret = vt->GetSwapchainImagesKHR(Unwrap(device), Unwrap(*pSwapChain), &numSwapImages, NULL); - RDCASSERT(ret == VK_SUCCESS); + RDCASSERTEQUAL(ret, VK_SUCCESS); swapInfo.lastPresent = 0; swapInfo.images.resize(numSwapImages); @@ -392,7 +392,7 @@ VkResult WrappedVulkan::vkCreateSwapchainKHR( // go through our own function so we assign these images IDs ret = vkGetSwapchainImagesKHR(device, *pSwapChain, &numSwapImages, images); - RDCASSERT(ret == VK_SUCCESS); + RDCASSERTEQUAL(ret, VK_SUCCESS); for(uint32_t i=0; i < numSwapImages; i++) { @@ -426,7 +426,7 @@ VkResult WrappedVulkan::vkCreateSwapchainKHR( }; vkr = vt->CreateImageView(Unwrap(device), &info, NULL, &swapImInfo.view); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(device), swapImInfo.view); @@ -438,7 +438,7 @@ VkResult WrappedVulkan::vkCreateSwapchainKHR( }; vkr = vt->CreateFramebuffer(Unwrap(device), &fbinfo, NULL, &swapImInfo.fb); - RDCASSERT(vkr == VK_SUCCESS); + RDCASSERTEQUAL(vkr, VK_SUCCESS); GetResourceManager()->WrapResource(Unwrap(device), swapImInfo.fb); }