Skip to content

Commit 90c4c98

Browse files
baldurkbaldurk
committed
Remove unnecessary STL includes from header files
* Some of these were leftover and no longer needed, some only needed in a subset of cpp files.
1 parent 8db0811 commit 90c4c98

30 files changed

+100
-80
lines changed

‎renderdoc/android/android.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
******************************************************************************/
2424

2525
#include "android.h"
26+
#include <set>
2627
#include <sstream>
2728
#include "api/replay/version.h"
2829
#include "core/core.h"

‎renderdoc/core/core.cpp

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,13 @@ void RenderDoc::ProcessGlobalEnvironment(GlobalEnvironment env, const std::vecto
638638
}
639639
}
640640

641+
void RenderDoc::RegisterShutdownFunction(ShutdownFunction func)
642+
{
643+
auto it = std::lower_bound(m_ShutdownFunctions.begin(), m_ShutdownFunctions.end(), func);
644+
if(it == m_ShutdownFunctions.end() || *it != func)
645+
m_ShutdownFunctions.insert(it, func);
646+
}
647+
641648
bool RenderDoc::MatchClosestWindow(void *&dev, void *&wnd)
642649
{
643650
DeviceWnd dw(dev, wnd);
@@ -920,14 +927,21 @@ std::string RenderDoc::GetOverlayText(RDCDriver driver, uint32_t frameNumber, in
920927
return overlayText;
921928
}
922929

930+
void RenderDoc::QueueCapture(uint32_t frameNumber)
931+
{
932+
auto it = std::lower_bound(m_QueuedFrameCaptures.begin(), m_QueuedFrameCaptures.end(), frameNumber);
933+
if(it == m_QueuedFrameCaptures.end() || *it != frameNumber)
934+
m_QueuedFrameCaptures.insert(it, frameNumber);
935+
}
936+
923937
bool RenderDoc::ShouldTriggerCapture(uint32_t frameNumber)
924938
{
925939
bool ret = m_Cap > 0;
926940

927941
if(m_Cap > 0)
928942
m_Cap--;
929943

930-
std::set<uint32_t> frames;
944+
std::vector<uint32_t> frames;
931945
frames.swap(m_QueuedFrameCaptures);
932946
for(auto it = frames.begin(); it != frames.end(); ++it)
933947
{
@@ -943,7 +957,7 @@ bool RenderDoc::ShouldTriggerCapture(uint32_t frameNumber)
943957
else
944958
{
945959
// not hit this yet, keep it around
946-
m_QueuedFrameCaptures.insert(*it);
960+
m_QueuedFrameCaptures.push_back(*it);
947961
}
948962
}
949963

‎renderdoc/core/core.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727

2828
#include <stdint.h>
2929
#include <map>
30-
#include <set>
3130
#include <string>
32-
#include <utility>
3331
#include <vector>
3432
#include "api/app/renderdoc_app.h"
3533
#include "api/replay/renderdoc_replay.h"
@@ -428,7 +426,7 @@ class RenderDoc
428426
void ProcessGlobalEnvironment(GlobalEnvironment env, const std::vector<std::string> &args);
429427

430428
int32_t GetForwardedPortSlot() { return Atomic::Inc32(&m_PortSlot); }
431-
void RegisterShutdownFunction(ShutdownFunction func) { m_ShutdownFunctions.insert(func); }
429+
void RegisterShutdownFunction(ShutdownFunction func);
432430
void SetReplayApp(bool replay) { m_Replay = replay; }
433431
bool IsReplayApp() const { return m_Replay; }
434432
const std::string &GetConfigSetting(std::string name) { return m_ConfigSettings[name]; }
@@ -574,7 +572,7 @@ class RenderDoc
574572
void TriggerCapture(uint32_t numFrames) { m_Cap = numFrames; }
575573
uint32_t GetOverlayBits() { return m_Overlay; }
576574
void MaskOverlayBits(uint32_t And, uint32_t Or) { m_Overlay = (m_Overlay & And) | Or; }
577-
void QueueCapture(uint32_t frameNumber) { m_QueuedFrameCaptures.insert(frameNumber); }
575+
void QueueCapture(uint32_t frameNumber);
578576
void SetFocusKeys(RENDERDOC_InputButton *keys, int num)
579577
{
580578
m_FocusKeys.resize(num);
@@ -631,7 +629,7 @@ class RenderDoc
631629
CaptureOptions m_Options;
632630
uint32_t m_Overlay;
633631

634-
std::set<uint32_t> m_QueuedFrameCaptures;
632+
std::vector<uint32_t> m_QueuedFrameCaptures;
635633

636634
uint32_t m_RemoteIdent;
637635
Threading::ThreadHandle m_RemoteThread;
@@ -667,7 +665,7 @@ class RenderDoc
667665
VulkanLayerCheck m_VulkanCheck;
668666
VulkanLayerInstall m_VulkanInstall;
669667

670-
std::set<ShutdownFunction> m_ShutdownFunctions;
668+
std::vector<ShutdownFunction> m_ShutdownFunctions;
671669

672670
struct FrameCap
673671
{

‎renderdoc/core/intervals.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
******************************************************************************/
2424
#pragma once
2525

26-
#include <algorithm>
2726
#include <map>
2827
#include "common/common.h"
2928

‎renderdoc/driver/d3d11/d3d11_context.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
******************************************************************************/
2525

2626
#include "driver/d3d11/d3d11_context.h"
27+
#include <algorithm>
2728
#include "driver/d3d11/d3d11_device.h"
2829
#include "driver/d3d11/d3d11_manager.h"
2930
#include "driver/d3d11/d3d11_renderstate.h"

‎renderdoc/driver/d3d11/d3d11_debug.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
#include <list>
2929
#include <map>
30-
#include <utility>
3130
#include "api/replay/renderdoc_replay.h"
3231
#include "driver/dx/official/d3d11_4.h"
3332
#include "replay/replay_driver.h"

‎renderdoc/driver/d3d11/d3d11_postvs.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
* THE SOFTWARE.
2323
******************************************************************************/
2424

25+
#include <algorithm>
2526
#include "data/resource.h"
2627
#include "driver/d3d11/d3d11_resources.h"
2728
#include "strings/string_utils.h"

‎renderdoc/driver/d3d11/d3d11_resources.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
#pragma once
2727

28-
#include <algorithm>
2928
#include "driver/d3d11/d3d11_device.h"
3029
#include "driver/d3d11/d3d11_manager.h"
3130
#include "driver/shaders/dxbc/dxbc_container.h"

‎renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
******************************************************************************/
2424

2525
#include "d3d12_command_list.h"
26+
#include <algorithm>
2627
#include "driver/dxgi/dxgi_common.h"
2728
#include "driver/ihv/amd/official/DXExt/AmdExtD3DCommandListMarkerApi.h"
2829
#include "d3d12_command_queue.h"

‎renderdoc/driver/d3d12/d3d12_device.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
******************************************************************************/
2424

2525
#include "d3d12_device.h"
26+
#include <algorithm>
2627
#include "core/core.h"
2728
#include "driver/dxgi/dxgi_common.h"
2829
#include "driver/dxgi/dxgi_wrapped.h"

‎renderdoc/driver/d3d12/d3d12_manager.cpp

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
******************************************************************************/
2424

2525
#include "d3d12_manager.h"
26+
#include <algorithm>
2627
#include "driver/dxgi/dxgi_common.h"
2728
#include "d3d12_command_list.h"
2829
#include "d3d12_command_queue.h"
@@ -761,3 +762,63 @@ bool D3D12ResourceManager::ResourceTypeRelease(ID3D12DeviceChild *res)
761762

762763
return true;
763764
}
765+
766+
void GPUAddressRangeTracker::AddTo(const GPUAddressRange &range)
767+
{
768+
SCOPED_WRITELOCK(addressLock);
769+
auto it = std::lower_bound(addresses.begin(), addresses.end(), range.start);
770+
771+
addresses.insert(it, range);
772+
}
773+
774+
void GPUAddressRangeTracker::RemoveFrom(const GPUAddressRange &range)
775+
{
776+
{
777+
SCOPED_WRITELOCK(addressLock);
778+
auto it = std::lower_bound(addresses.begin(), addresses.end(), range.start);
779+
780+
// there might be multiple buffers with the same range start, find the exact range for this
781+
// buffer
782+
while(it != addresses.end() && it->start == range.start)
783+
{
784+
if(it->id == range.id)
785+
{
786+
addresses.erase(it);
787+
return;
788+
}
789+
790+
++it;
791+
}
792+
}
793+
794+
RDCERR("Couldn't find matching range to remove for %s", ToStr(range.id).c_str());
795+
}
796+
797+
void GPUAddressRangeTracker::GetResIDFromAddr(D3D12_GPU_VIRTUAL_ADDRESS addr, ResourceId &id,
798+
UINT64 &offs)
799+
{
800+
id = ResourceId();
801+
offs = 0;
802+
803+
if(addr == 0)
804+
return;
805+
806+
GPUAddressRange range;
807+
808+
// this should really be a read-write lock
809+
{
810+
SCOPED_READLOCK(addressLock);
811+
812+
auto it = std::lower_bound(addresses.begin(), addresses.end(), addr);
813+
if(it == addresses.end())
814+
return;
815+
816+
range = *it;
817+
}
818+
819+
if(addr < range.start || addr >= range.end)
820+
return;
821+
822+
id = range.id;
823+
offs = addr - range.start;
824+
}

‎renderdoc/driver/d3d12/d3d12_manager.h

Lines changed: 3 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
#pragma once
2626

27-
#include <algorithm>
2827
#include "api/replay/renderdoc_replay.h"
2928
#include "common/wrapped_pool.h"
3029
#include "core/core.h"
@@ -464,64 +463,9 @@ struct GPUAddressRangeTracker
464463
std::vector<GPUAddressRange> addresses;
465464
Threading::RWLock addressLock;
466465

467-
void AddTo(const GPUAddressRange &range)
468-
{
469-
SCOPED_WRITELOCK(addressLock);
470-
auto it = std::lower_bound(addresses.begin(), addresses.end(), range.start);
471-
472-
addresses.insert(it, range);
473-
}
474-
475-
void RemoveFrom(const GPUAddressRange &range)
476-
{
477-
{
478-
SCOPED_WRITELOCK(addressLock);
479-
auto it = std::lower_bound(addresses.begin(), addresses.end(), range.start);
480-
481-
// there might be multiple buffers with the same range start, find the exact range for this
482-
// buffer
483-
while(it != addresses.end() && it->start == range.start)
484-
{
485-
if(it->id == range.id)
486-
{
487-
addresses.erase(it);
488-
return;
489-
}
490-
491-
++it;
492-
}
493-
}
494-
495-
RDCERR("Couldn't find matching range to remove for %s", ToStr(range.id).c_str());
496-
}
497-
498-
void GetResIDFromAddr(D3D12_GPU_VIRTUAL_ADDRESS addr, ResourceId &id, UINT64 &offs)
499-
{
500-
id = ResourceId();
501-
offs = 0;
502-
503-
if(addr == 0)
504-
return;
505-
506-
GPUAddressRange range;
507-
508-
// this should really be a read-write lock
509-
{
510-
SCOPED_READLOCK(addressLock);
511-
512-
auto it = std::lower_bound(addresses.begin(), addresses.end(), addr);
513-
if(it == addresses.end())
514-
return;
515-
516-
range = *it;
517-
}
518-
519-
if(addr < range.start || addr >= range.end)
520-
return;
521-
522-
id = range.id;
523-
offs = addr - range.start;
524-
}
466+
void AddTo(const GPUAddressRange &range);
467+
void RemoveFrom(const GPUAddressRange &range);
468+
void GetResIDFromAddr(D3D12_GPU_VIRTUAL_ADDRESS addr, ResourceId &id, UINT64 &offs);
525469
};
526470

527471
struct MapState

‎renderdoc/driver/d3d12/d3d12_postvs.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
* THE SOFTWARE.
2323
******************************************************************************/
2424

25+
#include <algorithm>
2526
#include "driver/dxgi/dxgi_common.h"
2627
#include "strings/string_utils.h"
2728
#include "d3d12_command_list.h"

‎renderdoc/driver/d3d12/d3d12_replay.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
#pragma once
2626

27-
#include <memory>
2827
#include "api/replay/renderdoc_replay.h"
2928
#include "core/core.h"
3029
#include "replay/replay_driver.h"

‎renderdoc/driver/d3d8/d3d8_debug.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424

2525
#pragma once
2626

27-
#include <list>
2827
#include <map>
29-
#include <utility>
3028
#include "driver/dx/official/d3d8.h"
3129
#include "stb/stb_truetype.h"
3230
#include "d3d8_common.h"

‎renderdoc/driver/d3d9/d3d9_debug.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424

2525
#pragma once
2626

27-
#include <list>
2827
#include <map>
29-
#include <utility>
3028
#include "driver/dx/official/d3d9.h"
3129
#include "stb/stb_truetype.h"
3230
#include "d3d9_common.h"

‎renderdoc/driver/shaders/dxbc/dxbc_container.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
#include <map>
2929
#include <string>
30-
#include <utility>
3130
#include <vector>
3231
#include "api/replay/renderdoc_replay.h"
3332
#include "common/common.h"

‎renderdoc/driver/shaders/dxbc/dxbc_sdbg.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
#include <map>
2929
#include <string>
30-
#include <utility>
3130
#include <vector>
3231
#include "dxbc_bytecode.h"
3332

‎renderdoc/driver/shaders/dxbc/dxbc_spdb.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include <guiddef.h>
2929
#include <map>
3030
#include <string>
31-
#include <utility>
3231
#include <vector>
3332
#include "dxbc_bytecode.h"
3433

‎renderdoc/driver/vulkan/vk_core.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
******************************************************************************/
2424

2525
#include "vk_core.h"
26+
#include <algorithm>
2627
#include "driver/ihv/amd/amd_rgp.h"
2728
#include "driver/shaders/spirv/spirv_compile.h"
2829
#include "jpeg-compressor/jpge.h"

‎renderdoc/driver/vulkan/vk_manager.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
******************************************************************************/
2424

2525
#include "vk_manager.h"
26+
#include <algorithm>
2627
#include "vk_core.h"
2728

2829
// debugging logging for barriers

‎renderdoc/driver/vulkan/vk_manager.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424

2525
#pragma once
2626

27-
#include <algorithm>
28-
#include <utility>
2927
#include "core/resource_manager.h"
3028
#include "vk_resources.h"
3129

‎renderdoc/driver/vulkan/vk_overlay.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
******************************************************************************/
2424

2525
#include <float.h>
26+
#include <algorithm>
2627
#include "data/glsl_shaders.h"
2728
#include "driver/shaders/spirv/spirv_common.h"
2829
#include "driver/shaders/spirv/spirv_gen.h"

0 commit comments

Comments
 (0)