From 3c72341f63a2b40398df45393390dda256356107 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 12 Feb 2018 19:39:07 +0000 Subject: [PATCH] Set category name for all API's built-in counters, not just D3D11 --- renderdoc/driver/d3d11/d3d11_counters.cpp | 2 +- renderdoc/driver/d3d12/d3d12_counters.cpp | 2 ++ renderdoc/driver/gl/gl_counters.cpp | 2 ++ renderdoc/driver/vulkan/vk_counters.cpp | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/renderdoc/driver/d3d11/d3d11_counters.cpp b/renderdoc/driver/d3d11/d3d11_counters.cpp index fd528fc3f..26ab4e66c 100644 --- a/renderdoc/driver/d3d11/d3d11_counters.cpp +++ b/renderdoc/driver/d3d11/d3d11_counters.cpp @@ -79,7 +79,7 @@ CounterDescription D3D11Replay::DescribeCounter(GPUCounter counterID) desc.uuid.words[2] = 0xA6DCCFE7; desc.uuid.words[3] = 0x222FC1AC ^ (uint32_t)counterID; - desc.category = "D3D11"; + desc.category = "D3D11 Built-in"; switch(counterID) { diff --git a/renderdoc/driver/d3d12/d3d12_counters.cpp b/renderdoc/driver/d3d12/d3d12_counters.cpp index 8007cbcb6..57542159b 100644 --- a/renderdoc/driver/d3d12/d3d12_counters.cpp +++ b/renderdoc/driver/d3d12/d3d12_counters.cpp @@ -57,6 +57,8 @@ CounterDescription D3D12Replay::DescribeCounter(GPUCounter counterID) desc.uuid.words[2] = 0x81F78549; desc.uuid.words[3] = 0x4E648F22 ^ (uint32_t)counterID; + desc.category = "D3D12 Built-in"; + switch(counterID) { case GPUCounter::EventGPUDuration: diff --git a/renderdoc/driver/gl/gl_counters.cpp b/renderdoc/driver/gl/gl_counters.cpp index 08b5ceedc..94841f872 100644 --- a/renderdoc/driver/gl/gl_counters.cpp +++ b/renderdoc/driver/gl/gl_counters.cpp @@ -74,6 +74,8 @@ CounterDescription GLReplay::DescribeCounter(GPUCounter counterID) desc.uuid.words[2] = 0xBA18F032; desc.uuid.words[3] = 0x9DA370A0 ^ (uint32_t)counterID; + desc.category = "OpenGL Built-in"; + switch(counterID) { case GPUCounter::EventGPUDuration: diff --git a/renderdoc/driver/vulkan/vk_counters.cpp b/renderdoc/driver/vulkan/vk_counters.cpp index 7e84b7e52..fc0af9a01 100644 --- a/renderdoc/driver/vulkan/vk_counters.cpp +++ b/renderdoc/driver/vulkan/vk_counters.cpp @@ -68,6 +68,8 @@ CounterDescription VulkanReplay::DescribeCounter(GPUCounter counterID) desc.uuid.words[2] = 0xB6068C65; desc.uuid.words[3] = 0x157C684C ^ (uint32_t)counterID; + desc.category = "Vulkan Built-in"; + switch(counterID) { case GPUCounter::EventGPUDuration: