From 462772af91036afcb05b7df6dc6e54f225787f11 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 17 May 2019 13:50:18 +0100 Subject: [PATCH] Remove 'using std::set' --- renderdoc/core/core.cpp | 2 +- renderdoc/core/core.h | 5 ++--- renderdoc/core/replay_proxy.h | 4 ++-- renderdoc/core/resource_manager.h | 6 ++---- renderdoc/driver/d3d11/d3d11_context.h | 6 +++--- renderdoc/driver/d3d11/d3d11_device.h | 4 ++-- renderdoc/driver/d3d11/d3d11_resources.h | 10 +++++----- renderdoc/driver/d3d11/d3d11_shaderdebug.cpp | 2 +- renderdoc/driver/d3d12/d3d12_counters.cpp | 2 +- renderdoc/driver/d3d12/d3d12_device.h | 4 ++-- renderdoc/driver/d3d12/d3d12_manager.h | 2 +- renderdoc/driver/gl/gl_driver.h | 8 ++++---- renderdoc/driver/gl/gl_resources.h | 2 +- renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp | 4 ++-- renderdoc/driver/vulkan/vk_counters.cpp | 2 +- renderdoc/driver/vulkan/vk_resources.h | 6 +++--- renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp | 2 +- renderdoc/os/win32/win32_stringio.cpp | 4 +--- 18 files changed, 35 insertions(+), 40 deletions(-) diff --git a/renderdoc/core/core.cpp b/renderdoc/core/core.cpp index 50cd229d8..cd9d46a41 100644 --- a/renderdoc/core/core.cpp +++ b/renderdoc/core/core.cpp @@ -746,7 +746,7 @@ bool RenderDoc::ShouldTriggerCapture(uint32_t frameNumber) if(m_Cap > 0) m_Cap--; - set frames; + std::set frames; frames.swap(m_QueuedFrameCaptures); for(auto it = frames.begin(); it != frames.end(); ++it) { diff --git a/renderdoc/core/core.h b/renderdoc/core/core.h index 6ad8e932f..782b21c70 100644 --- a/renderdoc/core/core.h +++ b/renderdoc/core/core.h @@ -40,7 +40,6 @@ using std::vector; using std::pair; -using std::set; class Chunk; struct RDCThumb; @@ -604,7 +603,7 @@ private: CaptureOptions m_Options; uint32_t m_Overlay; - set m_QueuedFrameCaptures; + std::set m_QueuedFrameCaptures; uint32_t m_RemoteIdent; Threading::ThreadHandle m_RemoteThread; @@ -635,7 +634,7 @@ private: VulkanLayerCheck m_VulkanCheck; VulkanLayerInstall m_VulkanInstall; - set m_ShutdownFunctions; + std::set m_ShutdownFunctions; struct FrameCap { diff --git a/renderdoc/core/replay_proxy.h b/renderdoc/core/replay_proxy.h index 940b6ac15..5b92e05dc 100644 --- a/renderdoc/core/replay_proxy.h +++ b/renderdoc/core/replay_proxy.h @@ -594,8 +594,8 @@ private: // this cache only exists on the client side, with the proxy renderer. This denotes cases where we // already have up-to-date texture data for the current event so we don't need to check for any // deltas. It is cleared any time we set event. - set m_TextureProxyCache; - set m_BufferProxyCache; + std::set m_TextureProxyCache; + std::set m_BufferProxyCache; struct ProxyTextureProperties { diff --git a/renderdoc/core/resource_manager.h b/renderdoc/core/resource_manager.h index a592b7b4e..d3326ae2e 100644 --- a/renderdoc/core/resource_manager.h +++ b/renderdoc/core/resource_manager.h @@ -33,8 +33,6 @@ #include "os/os_specific.h" #include "serialise/serialiser.h" -using std::set; - // In what way (read, write, etc) was a resource referenced in a frame - // used to determine if initial contents are needed and to what degree. // These values are used both as states (representing the cumulative previous @@ -591,7 +589,7 @@ protected: std::map m_FrameReferencedResources; // used during capture - holds resources marked as dirty, needing initial contents - set m_DirtyResources; + std::set m_DirtyResources; struct InitialContentDataOrChunk { @@ -842,7 +840,7 @@ void ResourceManager::CreateInitialContents(ReadSerialiser &ser) { using namespace ResourceManagerInternal; - set neededInitials; + std::set neededInitials; std::vector WrittenRecords; SERIALISE_ELEMENT(WrittenRecords); diff --git a/renderdoc/driver/d3d11/d3d11_context.h b/renderdoc/driver/d3d11/d3d11_context.h index 1370bbff4..282480c9d 100644 --- a/renderdoc/driver/d3d11/d3d11_context.h +++ b/renderdoc/driver/d3d11/d3d11_context.h @@ -120,10 +120,10 @@ private: } }; - set m_DeferredDirty; - set m_DeferredReferences; + std::set m_DeferredDirty; + std::set m_DeferredReferences; - set m_HighTrafficResources; + std::set m_HighTrafficResources; std::map m_OpenMaps; struct StreamOutData diff --git a/renderdoc/driver/d3d11/d3d11_device.h b/renderdoc/driver/d3d11/d3d11_device.h index cf6f0dde0..7021c15da 100644 --- a/renderdoc/driver/d3d11/d3d11_device.h +++ b/renderdoc/driver/d3d11/d3d11_device.h @@ -348,7 +348,7 @@ private: ReplayStatus m_FailedReplayStatus = ReplayStatus::APIReplayFailed; - set m_CachedStateObjects; + std::set m_CachedStateObjects; // This function will check if m_CachedStateObjects is growing too large, and if so // go through m_CachedStateObjects and release any state objects that are purely @@ -365,7 +365,7 @@ private: // Must be called while m_D3DLock is held. void CachedObjectsGarbageCollect(); - set m_DeferredContexts; + std::set m_DeferredContexts; std::map > m_LayoutDescs; std::map m_LayoutShaders; diff --git a/renderdoc/driver/d3d11/d3d11_resources.h b/renderdoc/driver/d3d11/d3d11_resources.h index 812c13005..d01d1be70 100644 --- a/renderdoc/driver/d3d11/d3d11_resources.h +++ b/renderdoc/driver/d3d11/d3d11_resources.h @@ -1265,8 +1265,8 @@ class WrappedID3D11CommandList : public WrappedDeviceChild11 bool m_Successful; // indicates whether we have all of the commands serialised for this command // list - set m_Dirty; - set m_References; + std::set m_Dirty; + std::set m_References; public: ALLOCATE_WITH_WRAPPED_POOL(WrappedID3D11CommandList); @@ -1294,14 +1294,14 @@ public: WrappedID3D11DeviceContext *GetContext() { return m_pContext; } bool IsCaptured() { return m_Successful; } - void SwapReferences(set &refs) { m_References.swap(refs); } - void SwapDirtyResources(set &dirty) { m_Dirty.swap(dirty); } + void SwapReferences(std::set &refs) { m_References.swap(refs); } + void SwapDirtyResources(std::set &dirty) { m_Dirty.swap(dirty); } void MarkDirtyResources(D3D11ResourceManager *manager) { for(auto it = m_Dirty.begin(); it != m_Dirty.end(); ++it) manager->MarkDirtyResource(*it); } - void MarkDirtyResources(set &missingTracks) + void MarkDirtyResources(std::set &missingTracks) { for(auto it = m_Dirty.begin(); it != m_Dirty.end(); ++it) missingTracks.insert(*it); diff --git a/renderdoc/driver/d3d11/d3d11_shaderdebug.cpp b/renderdoc/driver/d3d11/d3d11_shaderdebug.cpp index 11982a97f..890a2d3ea 100644 --- a/renderdoc/driver/d3d11/d3d11_shaderdebug.cpp +++ b/renderdoc/driver/d3d11/d3d11_shaderdebug.cpp @@ -774,7 +774,7 @@ ShaderDebugTrace D3D11Replay::DebugVertex(uint32_t eventId, uint32_t vertid, uin vector inputlayout = m_pDevice->GetLayoutDesc(rs->IA.Layout); - set vertexbuffers; + std::set vertexbuffers; uint32_t trackingOffs[32] = {0}; UINT MaxStepRate = 1U; diff --git a/renderdoc/driver/d3d12/d3d12_counters.cpp b/renderdoc/driver/d3d12/d3d12_counters.cpp index 254a7accd..073299da8 100644 --- a/renderdoc/driver/d3d12/d3d12_counters.cpp +++ b/renderdoc/driver/d3d12/d3d12_counters.cpp @@ -262,7 +262,7 @@ struct D3D12AMDDrawCallback : public D3D12DrawcallCallback WrappedID3D12Device *m_pDevice; D3D12Replay *m_pReplay; vector *m_pEventIds; - set m_begunCommandLists; + std::set m_begunCommandLists; // events which are the 'same' from being the same command buffer resubmitted // multiple times in the frame. We will only get the full callback when we're diff --git a/renderdoc/driver/d3d12/d3d12_device.h b/renderdoc/driver/d3d12/d3d12_device.h index a0baa4dab..914c5c98f 100644 --- a/renderdoc/driver/d3d12/d3d12_device.h +++ b/renderdoc/driver/d3d12/d3d12_device.h @@ -321,7 +321,7 @@ private: D3D12ShaderCache *m_ShaderCache = NULL; D3D12TextRenderer *m_TextRenderer = NULL; - set m_UploadResourceIds; + std::set m_UploadResourceIds; std::map m_UploadBuffers; Threading::CriticalSection m_MapsLock; @@ -394,7 +394,7 @@ private: std::map m_ResourceStates; Threading::CriticalSection m_ResourceStatesLock; - set m_Cubemaps; + std::set m_Cubemaps; std::map m_ResourceNames; diff --git a/renderdoc/driver/d3d12/d3d12_manager.h b/renderdoc/driver/d3d12/d3d12_manager.h index c839b71cd..d1ffaf433 100644 --- a/renderdoc/driver/d3d12/d3d12_manager.h +++ b/renderdoc/driver/d3d12/d3d12_manager.h @@ -423,7 +423,7 @@ struct CmdListRecordingInfo vector barriers; // a list of all resources dirtied by this command list - set dirtied; + std::set dirtied; // a list of descriptors that are bound at any point in this command list // used to look up all the frame refs per-descriptor and apply them on queue diff --git a/renderdoc/driver/gl/gl_driver.h b/renderdoc/driver/gl/gl_driver.h index b11789314..75445b8c7 100644 --- a/renderdoc/driver/gl/gl_driver.h +++ b/renderdoc/driver/gl/gl_driver.h @@ -184,7 +184,7 @@ private: CaptureFailReason m_FailureReason; bool m_SuccessfulCapture; - set m_HighTrafficResources; + std::set m_HighTrafficResources; int m_ReplayEventCount = 0; @@ -192,12 +192,12 @@ private: // we need to flush both types of maps, but for implicit sync points we only // want to consider coherent maps, and since that happens often we want it to // be as efficient as possible. - set m_CoherentMaps; - set m_PersistentMaps; + std::set m_CoherentMaps; + std::set m_PersistentMaps; // this function iterates over all the maps, checking for any changes between // the shadow pointers, and propogates that to 'real' GL - void PersistentMapMemoryBarrier(const set &maps); + void PersistentMapMemoryBarrier(const std::set &maps); // this function is called at any point that could possibly pick up a change // in a coherent persistent mapped buffer, to propogate changes across. In most diff --git a/renderdoc/driver/gl/gl_resources.h b/renderdoc/driver/gl/gl_resources.h index 32d872dad..7b412f72a 100644 --- a/renderdoc/driver/gl/gl_resources.h +++ b/renderdoc/driver/gl/gl_resources.h @@ -261,7 +261,7 @@ struct GLResourceRecord : public ResourceRecord // for anything that is viewed if the viewer is frame referenced. Otherwise we might // lose the underlying data for the view. // Since it's 1-to-many, we keep a set here. - set viewTextures; + std::set viewTextures; GLResource Resource; diff --git a/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp index cc34be897..e2bc8def4 100644 --- a/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp @@ -2650,14 +2650,14 @@ void WrappedOpenGL::glFlushMappedBufferRange(GLenum target, GLintptr offset, GLs return GL.glFlushMappedBufferRange(target, offset, length); } -void WrappedOpenGL::PersistentMapMemoryBarrier(const set &maps) +void WrappedOpenGL::PersistentMapMemoryBarrier(const std::set &maps) { PUSH_CURRENT_CHUNK; // this function iterates over all the maps, checking for any changes between // the shadow pointers, and propogates that to 'real' GL - for(set::const_iterator it = maps.begin(); it != maps.end(); ++it) + for(std::set::const_iterator it = maps.begin(); it != maps.end(); ++it) { GLResourceRecord *record = *it; diff --git a/renderdoc/driver/vulkan/vk_counters.cpp b/renderdoc/driver/vulkan/vk_counters.cpp index 2f8c42c90..b934098d7 100644 --- a/renderdoc/driver/vulkan/vk_counters.cpp +++ b/renderdoc/driver/vulkan/vk_counters.cpp @@ -272,7 +272,7 @@ struct VulkanAMDDrawCallback : public VulkanDrawcallCallback WrappedVulkan *m_pDriver; VulkanReplay *m_pReplay; vector *m_pEventIds; - set m_begunCommandBuffers; + std::set m_begunCommandBuffers; // events which are the 'same' from being the same command buffer resubmitted // multiple times in the frame. We will only get the full callback when we're // recording the command buffer, and will be given the first EID. After that diff --git a/renderdoc/driver/vulkan/vk_resources.h b/renderdoc/driver/vulkan/vk_resources.h index 5d75da0ea..b60ca5c7c 100644 --- a/renderdoc/driver/vulkan/vk_resources.h +++ b/renderdoc/driver/vulkan/vk_resources.h @@ -921,15 +921,15 @@ struct CmdBufferRecordingInfo // sparse resources referenced by this command buffer (at submit time // need to go through the sparse mapping and reference all memory) - set sparse; + std::set sparse; // a list of all resources dirtied by this command buffer - set dirtied; + std::set dirtied; // a list of descriptor sets that are bound at any point in this command buffer // used to look up all the frame refs per-desc set and apply them on queue // submit with latest binding refs. - set boundDescSets; + std::set boundDescSets; vector subcmds; diff --git a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp index a1cdd60f2..1b3b65551 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp @@ -786,7 +786,7 @@ VkResult WrappedVulkan::vkQueueSubmit(VkQueue queue, uint32_t submitCount, capframe = IsActiveCapturing(m_State); } - set refdIDs; + std::set refdIDs; VkResourceRecord *queueRecord = GetRecord(queue); diff --git a/renderdoc/os/win32/win32_stringio.cpp b/renderdoc/os/win32/win32_stringio.cpp index 3bd847cec..26b9ef09a 100644 --- a/renderdoc/os/win32/win32_stringio.cpp +++ b/renderdoc/os/win32/win32_stringio.cpp @@ -35,8 +35,6 @@ #include "os/os_specific.h" #include "strings/string_utils.h" -using std::set; - // gives us an address to identify this dll with static int dllLocator = 0; @@ -79,7 +77,7 @@ bool PlatformHasKeyInput() return true; } -set inputWindows; +std::set inputWindows; void AddInputWindow(void *wnd) {