mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-04-29 12:23:53 +00:00
Code Issues Releases Wiki Activity

improved error reporting

Browse Source
This commit is contained in:
Marcos Slomp 2023-09-11 12:53:42 -07:00
parent 42b088d085
commit 7b2acd2c6d
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
public/tracy/TracyD3D12.hpp
View File

@ -42,6 +42,8 @@ using TracyD3D12Ctx = void*;
#include <dxgi.h> #include <dxgi.h>
#include <queue> #include <queue>
#define TracyD3D12Panic(msg, ...) do { assert(false && "TracyD3D12: " msg); TracyMessageLC("TracyD3D12: " msg, tracy::Color::Red4); __VA_ARGS__; } while(false);
namespace tracy namespace tracy
{ {
@ -81,8 +83,7 @@ namespace tracy
UINT64 gpuTimestamp; UINT64 gpuTimestamp;
if (FAILED(m_queue->GetClockCalibration(&gpuTimestamp, &cpuTimestamp))) if (FAILED(m_queue->GetClockCalibration(&gpuTimestamp, &cpuTimestamp)))
{ {
assert(false && "failed to obtain queue clock calibration counters."); TracyD3D12Panic("failed to obtain queue clock calibration counters.", return);
return;
} }
int64_t cpuDeltaTicks = cpuTimestamp - m_prevCalibrationTicksCPU; int64_t cpuDeltaTicks = cpuTimestamp - m_prevCalibrationTicksCPU;
@ -124,8 +125,11 @@ namespace tracy
{ {
D3D12_FEATURE_DATA_D3D12_OPTIONS3 featureData{}; D3D12_FEATURE_DATA_D3D12_OPTIONS3 featureData{};
bool Success = SUCCEEDED(device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS3, &featureData, sizeof(featureData))); HRESULT hr = device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS3, &featureData, sizeof(featureData));
assert(Success && featureData.CopyQueueTimestampQueriesSupported && "Platform does not support profiling of copy queues."); if (FAILED(hr) || (featureData.CopyQueueTimestampQueriesSupported == FALSE))
{
TracyD3D12Panic("Platform does not support profiling of copy queues.", return);
}
} }
D3D12_QUERY_HEAP_DESC heapDesc{}; D3D12_QUERY_HEAP_DESC heapDesc{};
@ -163,12 +167,12 @@ namespace tracy
if (FAILED(device->CreateCommittedResource(&readbackHeapProps, D3D12_HEAP_FLAG_NONE, &readbackBufferDesc, D3D12_RESOURCE_STATE_COPY_DEST, nullptr, IID_PPV_ARGS(&m_readbackBuffer)))) if (FAILED(device->CreateCommittedResource(&readbackHeapProps, D3D12_HEAP_FLAG_NONE, &readbackBufferDesc, D3D12_RESOURCE_STATE_COPY_DEST, nullptr, IID_PPV_ARGS(&m_readbackBuffer))))
{ {
assert(false && "Failed to create query readback buffer."); TracyD3D12Panic("Failed to create query readback buffer.", return);
} }
if (FAILED(device->CreateFence(0, D3D12_FENCE_FLAG_NONE, IID_PPV_ARGS(&m_payloadFence)))) if (FAILED(device->CreateFence(0, D3D12_FENCE_FLAG_NONE, IID_PPV_ARGS(&m_payloadFence))))
{ {
assert(false && "Failed to create payload fence."); TracyD3D12Panic("Failed to create payload fence.", return);
} }
float period = [queue]() float period = [queue]()
@ -183,14 +187,14 @@ namespace tracy
if (period == 0.0f) if (period == 0.0f)
{ {
assert(false && "Failed to get timestamp frequency."); TracyD3D12Panic("Failed to get timestamp frequency.", return);
} }
uint64_t cpuTimestamp; uint64_t cpuTimestamp;
uint64_t gpuTimestamp; uint64_t gpuTimestamp;
if (FAILED(queue->GetClockCalibration(&gpuTimestamp, &cpuTimestamp))) if (FAILED(queue->GetClockCalibration(&gpuTimestamp, &cpuTimestamp)))
{ {
assert(false && "Failed to get queue clock calibration."); TracyD3D12Panic("Failed to get queue clock calibration.", return);
} }
// Save the device cpu timestamp, not the profiler's timestamp. // Save the device cpu timestamp, not the profiler's timestamp.
@ -282,7 +286,7 @@ namespace tracy
if (FAILED(m_readbackBuffer->Map(0, &mapRange, &readbackBufferMapping))) if (FAILED(m_readbackBuffer->Map(0, &mapRange, &readbackBufferMapping)))
{ {
assert(false && "Failed to map readback buffer."); TracyD3D12Panic("Failed to map readback buffer.", return);
} }
auto* timestampData = static_cast<uint64_t*>(readbackBufferMapping); auto* timestampData = static_cast<uint64_t*>(readbackBufferMapping);
@ -319,7 +323,11 @@ namespace tracy
tracy_force_inline uint32_t NextQueryId() tracy_force_inline uint32_t NextQueryId()
{ {
uint32_t queryCounter = m_queryCounter.fetch_add(2); uint32_t queryCounter = m_queryCounter.fetch_add(2);
assert(queryCounter < m_queryLimit && "Submitted too many GPU queries! Consider increasing MaxQueries."); if (queryCounter >= m_queryLimit)
{
TracyD3D12Panic("Submitted too many GPU queries! Consider increasing MaxQueries.");
// #TODO: consider returning an invalid id or sentinel value here
}
const uint32_t id = (m_previousQueryCounter + queryCounter) % m_queryLimit; const uint32_t id = (m_previousQueryCounter + queryCounter) % m_queryLimit;
@ -442,6 +450,8 @@ namespace tracy
} }
#undef TracyD3D12Panic
using TracyD3D12Ctx = tracy::D3D12QueueCtx*; using TracyD3D12Ctx = tracy::D3D12QueueCtx*;
#define TracyD3D12Context(device, queue) tracy::CreateD3D12Context(device, queue); #define TracyD3D12Context(device, queue) tracy::CreateD3D12Context(device, queue);