Skip to content

Commit 6904b1d

Browse files
committed
Fix GPU profile scope
1 parent 34d0835 commit 6904b1d

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

src/gfx/Profiler/Profiler.h

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,17 @@ inline const char * getGpuEventString(const vg::core::string & _value)
2424
return _value.c_str();
2525
}
2626

27-
#define VG_PROFILE_CATEGORY(name, cat) OPTICK_CATEGORY(name, Optick::Category::cat)
28-
#define VG_PROFILE_GPU(name) { const char * staticName = getGpuEventString(name); OPTICK_GPU_EVENT_DYNAMIC(staticName); vg::gfx::ScopedGPUEvent scopedGPUEvent##__COUNTER__(staticName); }
29-
#define VG_PROFILE_SAVE() Profiler::save();
27+
#define VG_PROFILE_CATEGORY(name, cat) OPTICK_CATEGORY(name, Optick::Category::cat)
28+
#define VG_PROFILE_GPU_INTERNAL(name, counter) const char * gpuEventName##counter = name; OPTICK_GPU_EVENT_DYNAMIC(gpuEventName##counter); vg::gfx::ScopedGPUEvent scopedGPUEvent##counter(gpuEventName##counter);
29+
#define VG_PROFILE_GPU(name) VG_PROFILE_GPU_INTERNAL(getGpuEventString(name), __COUNTER__)
30+
#define VG_PROFILE_SAVE() Profiler::save();
3031

3132
#ifdef VG_DX12
32-
#define VG_PROFILE_GPU_SWAP(dev) OPTICK_GPU_FLIP(dev->getd3d12SwapChain())
33-
#define VG_PROFILE_GPU_CONTEXT(cmd) OPTICK_GPU_CONTEXT(cmd->getd3d12CommandList()) Profiler::setCommandList(cmd)
33+
#define VG_PROFILE_GPU_SWAP(dev) OPTICK_GPU_FLIP(dev->getd3d12SwapChain())
34+
#define VG_PROFILE_GPU_CONTEXT(cmd) OPTICK_GPU_CONTEXT(cmd->getd3d12CommandList()) Profiler::setCommandList(cmd)
3435
#elif VG_VULKAN
35-
#define VG_PROFILE_GPU_SWAP(dev) OPTICK_GPU_FLIP(dev->getVulkanSwapchain());
36-
#define VG_PROFILE_GPU_CONTEXT(cmd) OPTICK_GPU_CONTEXT(cmd->getVulkanCommandBuffer()) Profiler::setCommandList(cmd)
36+
#define VG_PROFILE_GPU_SWAP(dev) OPTICK_GPU_FLIP(dev->getVulkanSwapchain());
37+
#define VG_PROFILE_GPU_CONTEXT(cmd) OPTICK_GPU_CONTEXT(cmd->getVulkanCommandBuffer()) Profiler::setCommandList(cmd)
3738
#endif
3839

3940
namespace vg::gfx

0 commit comments

Comments
 (0)