From 7206a0cd2550fecf34335a8b01048dfbd54a23f9 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 17 May 2019 15:25:28 +0100 Subject: [PATCH] Removing 'use std::vector' --- renderdoc/common/common.cpp | 2 +- renderdoc/common/timing.h | 2 +- renderdoc/core/core.cpp | 4 +- renderdoc/core/core.h | 18 ++-- renderdoc/core/image_viewer.cpp | 35 ++++---- renderdoc/core/remote_server.cpp | 8 +- renderdoc/core/replay_proxy.cpp | 5 +- renderdoc/core/replay_proxy.h | 11 +-- renderdoc/driver/d3d11/d3d11_context.cpp | 2 +- renderdoc/driver/d3d11/d3d11_context.h | 8 +- renderdoc/driver/d3d11/d3d11_counters.cpp | 49 +++++------ renderdoc/driver/d3d11/d3d11_device.h | 14 ++-- renderdoc/driver/d3d11/d3d11_overlay.cpp | 8 +- renderdoc/driver/d3d11/d3d11_pixelhistory.cpp | 14 ++-- renderdoc/driver/d3d11/d3d11_postvs.cpp | 6 +- renderdoc/driver/d3d11/d3d11_rendermesh.cpp | 8 +- renderdoc/driver/d3d11/d3d11_renderstate.cpp | 2 +- renderdoc/driver/d3d11/d3d11_replay.cpp | 16 ++-- renderdoc/driver/d3d11/d3d11_replay.h | 47 ++++++----- renderdoc/driver/d3d11/d3d11_resources.cpp | 4 +- renderdoc/driver/d3d11/d3d11_resources.h | 4 +- renderdoc/driver/d3d11/d3d11_shaderdebug.cpp | 14 ++-- .../driver/d3d12/d3d12_command_list_wrap.cpp | 6 +- renderdoc/driver/d3d12/d3d12_command_queue.h | 6 +- .../driver/d3d12/d3d12_command_queue_wrap.cpp | 4 +- renderdoc/driver/d3d12/d3d12_commands.cpp | 12 +-- renderdoc/driver/d3d12/d3d12_commands.h | 34 ++++---- renderdoc/driver/d3d12/d3d12_counters.cpp | 34 ++++---- renderdoc/driver/d3d12/d3d12_device.cpp | 4 +- renderdoc/driver/d3d12/d3d12_device.h | 26 +++--- renderdoc/driver/d3d12/d3d12_initstate.cpp | 13 +-- renderdoc/driver/d3d12/d3d12_manager.cpp | 2 +- renderdoc/driver/d3d12/d3d12_manager.h | 10 +-- renderdoc/driver/d3d12/d3d12_overlay.cpp | 16 ++-- renderdoc/driver/d3d12/d3d12_postvs.cpp | 10 +-- renderdoc/driver/d3d12/d3d12_rendermesh.cpp | 8 +- .../driver/d3d12/d3d12_rendertexture.cpp | 3 +- renderdoc/driver/d3d12/d3d12_replay.cpp | 30 +++---- renderdoc/driver/d3d12/d3d12_replay.h | 37 ++++---- renderdoc/driver/d3d12/d3d12_resources.cpp | 4 +- renderdoc/driver/d3d12/d3d12_resources.h | 8 +- renderdoc/driver/d3d12/d3d12_state.cpp | 4 +- renderdoc/driver/d3d12/d3d12_state.h | 18 ++-- renderdoc/driver/gl/egl_hooks.cpp | 2 +- renderdoc/driver/gl/gl_counters.cpp | 36 ++++---- renderdoc/driver/gl/gl_debug.cpp | 2 +- renderdoc/driver/gl/gl_driver.cpp | 6 +- renderdoc/driver/gl/gl_driver.h | 34 ++++---- renderdoc/driver/gl/gl_initstate.cpp | 4 +- renderdoc/driver/gl/gl_overlay.cpp | 8 +- renderdoc/driver/gl/gl_postvs.cpp | 6 +- renderdoc/driver/gl/gl_rendermesh.cpp | 8 +- renderdoc/driver/gl/gl_rendertext.cpp | 2 +- renderdoc/driver/gl/gl_replay.cpp | 29 +++---- renderdoc/driver/gl/gl_replay.h | 41 ++++----- renderdoc/driver/gl/gl_shader_refl.cpp | 14 ++-- renderdoc/driver/gl/gl_shader_refl.h | 2 +- renderdoc/driver/gl/glx_hooks.cpp | 2 +- renderdoc/driver/gl/wgl_hooks.cpp | 2 +- .../driver/gl/wrappers/gl_shader_funcs.cpp | 2 +- renderdoc/driver/ihv/amd/amd_isa.cpp | 6 +- .../driver/ihv/intel/intel_gl_counters.cpp | 2 +- renderdoc/driver/shaders/dxbc/dxbc_debug.cpp | 4 +- renderdoc/driver/shaders/dxbc/dxbc_debug.h | 2 +- .../driver/shaders/dxbc/dxbc_disassemble.cpp | 2 +- .../driver/shaders/dxbc/dxbc_disassemble.h | 12 ++- .../driver/shaders/dxbc/dxbc_inspect.cpp | 8 +- renderdoc/driver/shaders/dxbc/dxbc_inspect.h | 30 ++++--- .../driver/shaders/dxbc/dxbc_reflect.cpp | 3 +- renderdoc/driver/shaders/dxbc/dxbc_sdbg.cpp | 16 ++-- renderdoc/driver/shaders/dxbc/dxbc_sdbg.h | 19 ++--- renderdoc/driver/shaders/dxbc/dxbc_spdb.cpp | 4 +- renderdoc/driver/shaders/dxbc/dxbc_spdb.h | 6 +- renderdoc/driver/shaders/spirv/spirv_common.h | 28 +++---- .../driver/shaders/spirv/spirv_compile.cpp | 2 +- .../shaders/spirv/spirv_disassemble.cpp | 84 +++++++++---------- renderdoc/driver/vulkan/vk_core.cpp | 17 ++-- renderdoc/driver/vulkan/vk_core.h | 72 ++++++++-------- renderdoc/driver/vulkan/vk_counters.cpp | 38 ++++----- renderdoc/driver/vulkan/vk_info.h | 38 ++++----- renderdoc/driver/vulkan/vk_initstate.cpp | 2 +- renderdoc/driver/vulkan/vk_manager.cpp | 15 ++-- renderdoc/driver/vulkan/vk_manager.h | 10 +-- renderdoc/driver/vulkan/vk_outputwindow.cpp | 2 +- renderdoc/driver/vulkan/vk_overlay.cpp | 14 ++-- renderdoc/driver/vulkan/vk_posix.cpp | 2 +- renderdoc/driver/vulkan/vk_postvs.cpp | 6 +- renderdoc/driver/vulkan/vk_rendermesh.cpp | 8 +- renderdoc/driver/vulkan/vk_rendertexture.cpp | 2 +- renderdoc/driver/vulkan/vk_replay.cpp | 36 ++++---- renderdoc/driver/vulkan/vk_replay.h | 31 +++---- renderdoc/driver/vulkan/vk_resources.h | 14 ++-- renderdoc/driver/vulkan/vk_shader_cache.cpp | 4 +- .../driver/vulkan/vk_sparse_initstate.cpp | 2 +- renderdoc/driver/vulkan/vk_state.cpp | 8 +- renderdoc/driver/vulkan/vk_state.h | 14 ++-- renderdoc/driver/vulkan/vk_win32.cpp | 2 +- .../driver/vulkan/wrappers/vk_cmd_funcs.cpp | 2 +- .../vulkan/wrappers/vk_device_funcs.cpp | 2 +- .../driver/vulkan/wrappers/vk_queue_funcs.cpp | 2 +- .../driver/vulkan/wrappers/vk_wsi_funcs.cpp | 4 +- renderdoc/os/os_specific.h | 4 +- renderdoc/os/posix/linux/linux_callstack.cpp | 4 +- renderdoc/os/posix/posix_process.cpp | 8 +- renderdoc/os/posix/posix_threading.cpp | 6 +- renderdoc/os/win32/win32_callstack.cpp | 6 +- renderdoc/os/win32/win32_hook.cpp | 8 +- renderdoc/os/win32/win32_process.cpp | 2 +- renderdoc/os/win32/win32_threading.cpp | 6 +- renderdoc/replay/app_api.cpp | 4 +- renderdoc/replay/replay_controller.cpp | 6 +- renderdoc/replay/replay_controller.h | 4 +- renderdoc/replay/replay_driver.cpp | 12 +-- renderdoc/replay/replay_driver.h | 35 ++++---- renderdoc/replay/replay_output.cpp | 4 +- renderdoccmd/renderdoccmd_android.cpp | 11 +-- renderdoccmd/renderdoccmd_linux.cpp | 2 - renderdoccmd/renderdoccmd_win32.cpp | 2 - 118 files changed, 731 insertions(+), 738 deletions(-) diff --git a/renderdoc/common/common.cpp b/renderdoc/common/common.cpp index f27d959c6..fa480c317 100644 --- a/renderdoc/common/common.cpp +++ b/renderdoc/common/common.cpp @@ -318,7 +318,7 @@ void rdclog_filename(const char *filename) if(logfileOpened && previous.c_str()) { - vector previousContents; + std::vector previousContents; FileIO::slurp(previous.c_str(), previousContents); if(!previousContents.empty()) diff --git a/renderdoc/common/timing.h b/renderdoc/common/timing.h index ee34423d9..bb9d2462d 100644 --- a/renderdoc/common/timing.h +++ b/renderdoc/common/timing.h @@ -94,7 +94,7 @@ public: double GetMaxFrameTime() const { return m_MaxFrametime; } private: PerformanceTimer m_HighPrecisionTimer; - vector m_FrameTimes; + std::vector m_FrameTimes; double m_TotalTime; double m_AvgFrametime; double m_MinFrametime; diff --git a/renderdoc/core/core.cpp b/renderdoc/core/core.cpp index cd9d46a41..1e0c2fc26 100644 --- a/renderdoc/core/core.cpp +++ b/renderdoc/core/core.cpp @@ -654,7 +654,7 @@ std::string RenderDoc::GetOverlayText(RDCDriver driver, uint32_t frameNumber, in if(activeWindow) { - vector keys = GetCaptureKeys(); + std::vector keys = GetCaptureKeys(); if(capturesEnabled) { @@ -716,7 +716,7 @@ std::string RenderDoc::GetOverlayText(RDCDriver driver, uint32_t frameNumber, in } else if(capturesEnabled) { - vector keys = GetFocusKeys(); + std::vector keys = GetFocusKeys(); overlayText += "Inactive window."; diff --git a/renderdoc/core/core.h b/renderdoc/core/core.h index c6641bd28..d52a8ffef 100644 --- a/renderdoc/core/core.h +++ b/renderdoc/core/core.h @@ -38,8 +38,6 @@ #include "maths/vec.h" #include "os/os_specific.h" -using std::vector; - class Chunk; struct RDCThumb; @@ -438,13 +436,13 @@ public: SCOPED_LOCK(m_ChildLock); m_Children.push_back(make_rdcpair(pid, ident)); } - vector > GetChildProcesses() + std::vector > GetChildProcesses() { SCOPED_LOCK(m_ChildLock); return m_Children; } - vector GetCaptures() + std::vector GetCaptures() { SCOPED_LOCK(m_CaptureLock); return m_Captures; @@ -563,8 +561,8 @@ public: m_CaptureKeys[i] = keys[i]; } - const vector &GetFocusKeys() { return m_FocusKeys; } - const vector &GetCaptureKeys() { return m_CaptureKeys; } + const std::vector &GetFocusKeys() { return m_FocusKeys; } + const std::vector &GetCaptureKeys() { return m_CaptureKeys; } bool ShouldTriggerCapture(uint32_t frameNumber); enum @@ -587,8 +585,8 @@ private: uint32_t m_Cap; - vector m_FocusKeys; - vector m_CaptureKeys; + std::vector m_FocusKeys; + std::vector m_CaptureKeys; GlobalEnvironment m_GlobalEnv; @@ -614,10 +612,10 @@ private: std::map m_ProgressCallbacks; Threading::CriticalSection m_CaptureLock; - vector m_Captures; + std::vector m_Captures; Threading::CriticalSection m_ChildLock; - vector > m_Children; + std::vector > m_Children; std::map m_ConfigSettings; diff --git a/renderdoc/core/image_viewer.cpp b/renderdoc/core/image_viewer.cpp index 864069242..8303d536d 100644 --- a/renderdoc/core/image_viewer.cpp +++ b/renderdoc/core/image_viewer.cpp @@ -70,7 +70,7 @@ public: bool IsRemoteProxy() { return true; } void Shutdown() { delete this; } // pass through necessary operations to proxy - vector GetSupportedWindowSystems() + std::vector GetSupportedWindowSystems() { return m_Proxy->GetSupportedWindowSystems(); } @@ -116,7 +116,7 @@ public: } bool GetHistogram(ResourceId texid, uint32_t sliceFace, uint32_t mip, uint32_t sample, CompType typeHint, float minval, float maxval, bool channels[4], - vector &histogram) + std::vector &histogram) { return m_Proxy->GetHistogram(m_TextureID, sliceFace, mip, sample, typeHint, minval, maxval, channels, histogram); @@ -174,11 +174,12 @@ public: return ReplayStatus::Succeeded; } const SDFile &GetStructuredFile() { return m_File; } - void RenderMesh(uint32_t eventId, const vector &secondaryDraws, const MeshDisplay &cfg) + void RenderMesh(uint32_t eventId, const std::vector &secondaryDraws, + const MeshDisplay &cfg) { } - std::vector GetBuffers() { return vector(); } - vector GetDebugMessages() { return vector(); } + std::vector GetBuffers() { return std::vector(); } + std::vector GetDebugMessages() { return std::vector(); } BufferDescription GetBuffer(ResourceId id) { BufferDescription ret; @@ -195,20 +196,20 @@ public: const GLPipe::State *GetGLPipelineState() { return NULL; } const VKPipe::State *GetVulkanPipelineState() { return NULL; } void ReplayLog(uint32_t endEventID, ReplayLogType replayType) {} - vector GetPassEvents(uint32_t eventId) { return vector(); } - vector GetUsage(ResourceId id) { return vector(); } + std::vector GetPassEvents(uint32_t eventId) { return std::vector(); } + std::vector GetUsage(ResourceId id) { return std::vector(); } bool IsRenderOutput(ResourceId id) { return false; } ResourceId GetLiveID(ResourceId id) { return id; } - vector EnumerateCounters() { return vector(); } + std::vector EnumerateCounters() { return std::vector(); } CounterDescription DescribeCounter(GPUCounter counterID) { CounterDescription desc = {}; desc.counter = counterID; return desc; } - vector FetchCounters(const vector &counters) + std::vector FetchCounters(const std::vector &counters) { - return vector(); + return std::vector(); } void FillCBufferVariables(ResourceId shader, std::string entryPoint, uint32_t cbufSlot, rdcarray &outvars, const bytebuf &data) @@ -216,7 +217,7 @@ public: } void GetBufferData(ResourceId buff, uint64_t offset, uint64_t len, bytebuf &retData) {} void InitPostVSBuffers(uint32_t eventId) {} - void InitPostVSBuffers(const vector &eventId) {} + void InitPostVSBuffers(const std::vector &eventId) {} MeshFormat GetPostVSBuffers(uint32_t eventId, uint32_t instID, uint32_t viewID, MeshDataStage stage) { MeshFormat ret; @@ -224,24 +225,24 @@ public: return ret; } ResourceId RenderOverlay(ResourceId texid, CompType typeHint, DebugOverlay overlay, - uint32_t eventId, const vector &passEvents) + uint32_t eventId, const std::vector &passEvents) { return ResourceId(); } rdcarray GetShaderEntryPoints(ResourceId shader) { return {}; } ShaderReflection *GetShader(ResourceId shader, ShaderEntryPoint entry) { return NULL; } - vector GetDisassemblyTargets() { return {"N/A"}; } + std::vector GetDisassemblyTargets() { return {"N/A"}; } std::string DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, const std::string &target) { return ""; } void FreeTargetResource(ResourceId id) {} - vector PixelHistory(vector events, ResourceId target, uint32_t x, - uint32_t y, uint32_t slice, uint32_t mip, - uint32_t sampleIdx, CompType typeHint) + std::vector PixelHistory(std::vector events, ResourceId target, + uint32_t x, uint32_t y, uint32_t slice, uint32_t mip, + uint32_t sampleIdx, CompType typeHint) { - return vector(); + return std::vector(); } ShaderDebugTrace DebugVertex(uint32_t eventId, uint32_t vertid, uint32_t instid, uint32_t idx, uint32_t instOffset, uint32_t vertOffset) diff --git a/renderdoc/core/remote_server.cpp b/renderdoc/core/remote_server.cpp index 9bc81668e..c251adcb9 100644 --- a/renderdoc/core/remote_server.cpp +++ b/renderdoc/core/remote_server.cpp @@ -1199,13 +1199,13 @@ public: std::string adbStdout = Android::adbExecCommand(deviceID, "shell pm list packages -3").strStdout; - using namespace std; - istringstream stdoutStream(adbStdout); + + std::istringstream stdoutStream(adbStdout); std::string line; - vector packages; + std::vector packages; while(getline(stdoutStream, line)) { - vector tokens; + std::vector tokens; split(line, tokens, ':'); if(tokens.size() == 2 && tokens[0] == "package") { diff --git a/renderdoc/core/replay_proxy.cpp b/renderdoc/core/replay_proxy.cpp index a00e1793e..c992fe3d4 100644 --- a/renderdoc/core/replay_proxy.cpp +++ b/renderdoc/core/replay_proxy.cpp @@ -2629,10 +2629,11 @@ bool ReplayProxy::Tick(int type) break; } case eReplayProxy_RenderOverlay: - RenderOverlay(ResourceId(), CompType::Typeless, DebugOverlay::NoOverlay, 0, vector()); + RenderOverlay(ResourceId(), CompType::Typeless, DebugOverlay::NoOverlay, 0, + std::vector()); break; case eReplayProxy_PixelHistory: - PixelHistory(vector(), ResourceId(), 0, 0, 0, 0, 0, CompType::Typeless); + PixelHistory(std::vector(), ResourceId(), 0, 0, 0, 0, 0, CompType::Typeless); break; case eReplayProxy_DisassembleShader: DisassembleShader(ResourceId(), NULL, ""); break; case eReplayProxy_GetDisassemblyTargets: GetDisassemblyTargets(); break; diff --git a/renderdoc/core/replay_proxy.h b/renderdoc/core/replay_proxy.h index 5b92e05dc..3ba53d8df 100644 --- a/renderdoc/core/replay_proxy.h +++ b/renderdoc/core/replay_proxy.h @@ -167,11 +167,11 @@ public: return ReplayStatus::Succeeded; } AMDRGPControl *GetRGPControl() { return NULL; } - vector GetSupportedWindowSystems() + std::vector GetSupportedWindowSystems() { if(m_Proxy) return m_Proxy->GetSupportedWindowSystems(); - return vector(); + return std::vector(); } uint64_t MakeOutputWindow(WindowingData window, bool depth) { @@ -261,7 +261,7 @@ public: bool GetHistogram(ResourceId texid, uint32_t sliceFace, uint32_t mip, uint32_t sample, CompType typeHint, float minval, float maxval, bool channels[4], - vector &histogram) + std::vector &histogram) { if(m_Proxy) { @@ -325,7 +325,8 @@ public: } } - void RenderMesh(uint32_t eventId, const vector &secondaryDraws, const MeshDisplay &cfg) + void RenderMesh(uint32_t eventId, const std::vector &secondaryDraws, + const MeshDisplay &cfg) { if(m_Proxy && cfg.position.vertexResourceId != ResourceId()) { @@ -349,7 +350,7 @@ public: proxiedCfg.position.indexResourceId = m_ProxyBufferIds[proxiedCfg.position.indexResourceId]; } - vector secDraws = secondaryDraws; + std::vector secDraws = secondaryDraws; for(size_t i = 0; i < secDraws.size(); i++) { diff --git a/renderdoc/driver/d3d11/d3d11_context.cpp b/renderdoc/driver/d3d11/d3d11_context.cpp index 79bc558bf..712f9630c 100644 --- a/renderdoc/driver/d3d11/d3d11_context.cpp +++ b/renderdoc/driver/d3d11/d3d11_context.cpp @@ -1247,7 +1247,7 @@ ReplayStatus WrappedID3D11DeviceContext::ReplayLog(CaptureState readType, uint32 // we don't have duplicate uses for(auto it = m_ResourceUses.begin(); it != m_ResourceUses.end(); ++it) { - vector &v = it->second; + std::vector &v = it->second; std::sort(v.begin(), v.end()); v.erase(std::unique(v.begin(), v.end()), v.end()); diff --git a/renderdoc/driver/d3d11/d3d11_context.h b/renderdoc/driver/d3d11/d3d11_context.h index 95f829ca2..f41d4e941 100644 --- a/renderdoc/driver/d3d11/d3d11_context.h +++ b/renderdoc/driver/d3d11/d3d11_context.h @@ -134,7 +134,7 @@ private: std::map m_StreamOutCounters; - std::map > m_ResourceUses; + std::map > m_ResourceUses; WrappedID3D11Device *m_pDevice; ID3D11DeviceContext *m_pRealContext; @@ -185,7 +185,7 @@ private: D3D11RenderState *m_DeferredSavedState; - vector m_CurEvents, m_Events; + std::vector m_CurEvents, m_Events; bool m_AddedDrawcall; bool HasNonMarkerEvents(); @@ -204,7 +204,7 @@ private: uint32_t m_Col; std::wstring m_Name; }; - vector m_AnnotationQueue; + std::vector m_AnnotationQueue; Threading::CriticalSection m_AnnotLock; SDFile *m_StructuredFile = NULL; @@ -316,7 +316,7 @@ public: void SetFrameReader(StreamReader *reader) { m_FrameReader = reader; } void MarkResourceReferenced(ResourceId id, FrameRefType refType); - vector GetUsage(ResourceId id) { return m_ResourceUses[id]; } + std::vector GetUsage(ResourceId id) { return m_ResourceUses[id]; } void ClearMaps(); uint32_t GetEventID() { return m_CurEventID; } diff --git a/renderdoc/driver/d3d11/d3d11_counters.cpp b/renderdoc/driver/d3d11/d3d11_counters.cpp index 357b4b751..4fe3a280f 100644 --- a/renderdoc/driver/d3d11/d3d11_counters.cpp +++ b/renderdoc/driver/d3d11/d3d11_counters.cpp @@ -32,9 +32,9 @@ #include "d3d11_debug.h" #include "d3d11_device.h" -vector D3D11Replay::EnumerateCounters() +std::vector D3D11Replay::EnumerateCounters() { - vector ret; + std::vector ret; ret.push_back(GPUCounter::EventGPUDuration); ret.push_back(GPUCounter::InputVerticesRead); @@ -52,19 +52,19 @@ vector D3D11Replay::EnumerateCounters() if(m_pAMDCounters) { - vector amdCounters = m_pAMDCounters->GetPublicCounterIds(); + std::vector amdCounters = m_pAMDCounters->GetPublicCounterIds(); ret.insert(ret.end(), amdCounters.begin(), amdCounters.end()); } if(m_pNVCounters) { - vector nvCounters = m_pNVCounters->GetPublicCounterIds(); + std::vector nvCounters = m_pNVCounters->GetPublicCounterIds(); ret.insert(ret.end(), nvCounters.begin(), nvCounters.end()); } if(m_pIntelCounters) { - vector intelCounters = m_pIntelCounters->GetPublicCounterIds(); + std::vector intelCounters = m_pIntelCounters->GetPublicCounterIds(); ret.insert(ret.end(), intelCounters.begin(), intelCounters.end()); } @@ -231,7 +231,7 @@ struct GPUTimer struct D3D11CounterContext { uint32_t eventStart; - vector timers; + std::vector timers; }; void D3D11Replay::FillTimers(D3D11CounterContext &ctx, const DrawcallDescription &drawnode) @@ -333,7 +333,7 @@ void D3D11Replay::SerializeImmediateContext() } void D3D11Replay::FillTimersAMD(uint32_t &eventStartID, uint32_t &sampleIndex, - vector &eventIDs, const DrawcallDescription &drawnode) + std::vector &eventIDs, const DrawcallDescription &drawnode) { if(drawnode.children.empty()) return; @@ -365,7 +365,7 @@ void D3D11Replay::FillTimersAMD(uint32_t &eventStartID, uint32_t &sampleIndex, } void D3D11Replay::FillTimersNV(uint32_t &eventStartID, uint32_t &sampleIndex, - vector &eventIDs, const DrawcallDescription &drawnode) + std::vector &eventIDs, const DrawcallDescription &drawnode) { if(drawnode.children.empty()) return; @@ -400,7 +400,8 @@ void D3D11Replay::FillTimersNV(uint32_t &eventStartID, uint32_t &sampleIndex, } void D3D11Replay::FillTimersIntel(uint32_t &eventStartID, uint32_t &sampleIndex, - vector &eventIDs, const DrawcallDescription &drawnode) + std::vector &eventIDs, + const DrawcallDescription &drawnode) { if(drawnode.children.empty()) return; @@ -434,13 +435,13 @@ void D3D11Replay::FillTimersIntel(uint32_t &eventStartID, uint32_t &sampleIndex, } } -vector D3D11Replay::FetchCountersAMD(const vector &counters) +std::vector D3D11Replay::FetchCountersAMD(const std::vector &counters) { ID3D11Device *d3dDevice = m_pDevice->GetReal(); if(!m_pAMDCounters->BeginMeasurementMode(AMDCounters::ApiType::Dx11, (void *)d3dDevice)) { - return vector(); + return std::vector(); } uint32_t sessionID = m_pAMDCounters->CreateSession(); @@ -461,7 +462,7 @@ vector D3D11Replay::FetchCountersAMD(const vector &co uint32_t sampleIndex = 0; - vector eventIDs; + std::vector eventIDs; for(uint32_t p = 0; p < passCount; p++) { @@ -480,7 +481,7 @@ vector D3D11Replay::FetchCountersAMD(const vector &co m_pAMDCounters->EndSesssion(sessionID); - vector ret = + std::vector ret = m_pAMDCounters->GetCounterData(sessionID, sampleIndex, eventIDs, counters); m_pAMDCounters->EndMeasurementMode(); @@ -488,14 +489,14 @@ vector D3D11Replay::FetchCountersAMD(const vector &co return ret; } -vector D3D11Replay::FetchCountersNV(const vector &counters) +std::vector D3D11Replay::FetchCountersNV(const std::vector &counters) { const FrameRecord &frameRecord = m_pDevice->GetFrameRecord(); const FrameStatistics &frameStats = frameRecord.frameInfo.stats; const uint32_t objectsCount = frameStats.draws.calls + frameStats.dispatches.calls + 1; - vector ret; + std::vector ret; if(m_pNVCounters->PrepareExperiment(counters, objectsCount)) { @@ -503,7 +504,7 @@ vector D3D11Replay::FetchCountersNV(const vector &cou uint32_t passCount = m_pNVCounters->BeginExperiment(); uint32_t sampleIndex = 0; - vector eventIDs; + std::vector eventIDs; for(uint32_t passIdx = 0; passIdx < passCount; ++passIdx) { @@ -523,7 +524,7 @@ vector D3D11Replay::FetchCountersNV(const vector &cou return ret; } -vector D3D11Replay::FetchCountersIntel(const vector &counters) +std::vector D3D11Replay::FetchCountersIntel(const std::vector &counters) { m_pIntelCounters->DisableAllCounters(); @@ -542,7 +543,7 @@ vector D3D11Replay::FetchCountersIntel(const vector & uint32_t sampleIndex = 0; - vector eventIDs; + std::vector eventIDs; for(uint32_t p = 0; p < passCount; p++) { @@ -562,9 +563,9 @@ vector D3D11Replay::FetchCountersIntel(const vector & return m_pIntelCounters->GetCounterData(eventIDs, counters); } -vector D3D11Replay::FetchCounters(const vector &counters) +std::vector D3D11Replay::FetchCounters(const std::vector &counters) { - vector ret; + std::vector ret; if(counters.empty()) { @@ -574,14 +575,14 @@ vector D3D11Replay::FetchCounters(const vector &count SCOPED_TIMER("Fetch Counters, counters to fetch %u", counters.size()); - vector d3dCounters; + std::vector d3dCounters; std::copy_if(counters.begin(), counters.end(), std::back_inserter(d3dCounters), [](const GPUCounter &c) { return IsGenericCounter(c); }); if(m_pAMDCounters) { // Filter out the AMD counters - vector amdCounters; + std::vector amdCounters; std::copy_if(counters.begin(), counters.end(), std::back_inserter(amdCounters), [](const GPUCounter &c) { return IsAMDCounter(c); }); @@ -594,7 +595,7 @@ vector D3D11Replay::FetchCounters(const vector &count if(m_pNVCounters) { // Filter out the AMD counters - vector nvCounters; + std::vector nvCounters; std::copy_if(counters.begin(), counters.end(), std::back_inserter(nvCounters), [](const GPUCounter &c) { return IsNvidiaCounter(c); }); @@ -606,7 +607,7 @@ vector D3D11Replay::FetchCounters(const vector &count if(m_pIntelCounters) { - vector intelCounters; + std::vector intelCounters; std::copy_if(counters.begin(), counters.end(), std::back_inserter(intelCounters), [](const GPUCounter &c) { return IsIntelCounter(c); }); diff --git a/renderdoc/driver/d3d11/d3d11_device.h b/renderdoc/driver/d3d11/d3d11_device.h index 7021c15da..da0857633 100644 --- a/renderdoc/driver/d3d11/d3d11_device.h +++ b/renderdoc/driver/d3d11/d3d11_device.h @@ -314,7 +314,7 @@ private: D3D11ShaderCache *m_ShaderCache = NULL; D3D11ResourceManager *m_ResourceManager = NULL; - vector m_ShaderSearchPaths; + std::vector m_ShaderSearchPaths; D3D11InitParams m_InitParams; uint64_t m_SectionVersion; @@ -366,7 +366,7 @@ private: void CachedObjectsGarbageCollect(); std::set m_DeferredContexts; - std::map > m_LayoutDescs; + std::map > m_LayoutDescs; std::map m_LayoutShaders; static WrappedID3D11Device *m_pCurrentWrappedDevice; @@ -381,11 +381,11 @@ private: SDFile *m_StructuredFile = NULL; SDFile m_StoredStructuredData; - vector m_DebugMessages; + std::vector m_DebugMessages; - vector m_CapturedFrames; + std::vector m_CapturedFrames; FrameRecord m_FrameRecord; - vector m_Drawcalls; + std::vector m_Drawcalls; public: static const int AllocPoolCount = 4; @@ -445,12 +445,12 @@ public: std::vector GetDebugMessages(); void AddDebugMessage(DebugMessage msg); void AddDebugMessage(MessageCategory c, MessageSeverity sv, MessageSource src, std::string d); - const vector &GetLayoutDesc(ID3D11InputLayout *layout) + const std::vector &GetLayoutDesc(ID3D11InputLayout *layout) { return m_LayoutDescs[layout]; } - vector *GetShaderDebugInfoSearchPaths() { return &m_ShaderSearchPaths; } + std::vector *GetShaderDebugInfoSearchPaths() { return &m_ShaderSearchPaths; } template bool Serialise_CaptureScope(SerialiserType &ser); diff --git a/renderdoc/driver/d3d11/d3d11_overlay.cpp b/renderdoc/driver/d3d11/d3d11_overlay.cpp index 64dba45d3..da0159113 100644 --- a/renderdoc/driver/d3d11/d3d11_overlay.cpp +++ b/renderdoc/driver/d3d11/d3d11_overlay.cpp @@ -40,7 +40,7 @@ #include "data/hlsl/hlsl_cbuffers.h" ResourceId D3D11Replay::RenderOverlay(ResourceId texid, CompType typeHint, DebugOverlay overlay, - uint32_t eventId, const vector &passEvents) + uint32_t eventId, const std::vector &passEvents) { TextureShaderDetails details = GetDebugManager()->GetShaderDetails(texid, typeHint, false); @@ -572,7 +572,7 @@ ResourceId D3D11Replay::RenderOverlay(ResourceId texid, CompType typeHint, Debug } else if(overlay == DebugOverlay::ClearBeforePass || overlay == DebugOverlay::ClearBeforeDraw) { - vector events = passEvents; + std::vector events = passEvents; if(overlay == DebugOverlay::ClearBeforeDraw) events.clear(); @@ -659,7 +659,7 @@ ResourceId D3D11Replay::RenderOverlay(ResourceId texid, CompType typeHint, Debug float overlayConsts[] = {0.0f, 0.0f, 0.0f, 0.0f}; m_pImmediateContext->ClearRenderTargetView(rtv, overlayConsts); - vector events = passEvents; + std::vector events = passEvents; if(overlay == DebugOverlay::TriangleSizeDraw) events.clear(); @@ -785,7 +785,7 @@ ResourceId D3D11Replay::RenderOverlay(ResourceId texid, CompType typeHint, Debug { SCOPED_TIMER("Quad Overdraw"); - vector events = passEvents; + std::vector events = passEvents; if(overlay == DebugOverlay::QuadOverdrawDraw) events.clear(); diff --git a/renderdoc/driver/d3d11/d3d11_pixelhistory.cpp b/renderdoc/driver/d3d11/d3d11_pixelhistory.cpp index ae8617a3d..da3bebe34 100644 --- a/renderdoc/driver/d3d11/d3d11_pixelhistory.cpp +++ b/renderdoc/driver/d3d11/d3d11_pixelhistory.cpp @@ -280,12 +280,12 @@ void D3D11DebugManager::PixelHistoryCopyPixel(CopyPixelParams &p, uint32_t x, ui SAFE_RELEASE(curCSUAV[i]); } -vector D3D11Replay::PixelHistory(vector events, ResourceId target, - uint32_t x, uint32_t y, uint32_t slice, - uint32_t mip, uint32_t sampleIdx, - CompType typeHint) +std::vector D3D11Replay::PixelHistory(std::vector events, + ResourceId target, uint32_t x, uint32_t y, + uint32_t slice, uint32_t mip, + uint32_t sampleIdx, CompType typeHint) { - vector history; + std::vector history; // this function needs a *huge* amount of tidying, refactoring and documenting. @@ -331,7 +331,7 @@ vector D3D11Replay::PixelHistory(vector events, R (uint32_t)events.size()); // these occlusion queries are run with every test possible disabled - vector occl; + std::vector occl; occl.reserve(events.size()); ID3D11Query *testQueries[6] = {0}; // one query for each test we do per-drawcall @@ -649,7 +649,7 @@ vector D3D11Replay::PixelHistory(vector events, R // while issuing the above queries we can check to see which tests are enabled so we don't // bother checking if depth testing failed if the depth test was disabled - vector flags(events.size()); + std::vector flags(events.size()); enum { TestEnabled_BackfaceCulling = 1 << 0, diff --git a/renderdoc/driver/d3d11/d3d11_postvs.cpp b/renderdoc/driver/d3d11/d3d11_postvs.cpp index 5137d773d..1fe298596 100644 --- a/renderdoc/driver/d3d11/d3d11_postvs.cpp +++ b/renderdoc/driver/d3d11/d3d11_postvs.cpp @@ -244,7 +244,7 @@ void D3D11Replay::InitPostVSBuffers(uint32_t eventId) RDCASSERT(dxbcDS); } - vector sodecls; + std::vector sodecls; UINT stride = 0; int posidx = -1; @@ -356,7 +356,7 @@ void D3D11Replay::InitPostVSBuffers(uint32_t eventId) SAFE_RELEASE(idxBuf); - vector indices; + std::vector indices; uint16_t *idx16 = (uint16_t *)&idxdata[0]; uint32_t *idx32 = (uint32_t *)&idxdata[0]; @@ -1068,7 +1068,7 @@ void D3D11Replay::InitPostVSBuffers(uint32_t eventId) } } -void D3D11Replay::InitPostVSBuffers(const vector &passEvents) +void D3D11Replay::InitPostVSBuffers(const std::vector &passEvents) { uint32_t prev = 0; diff --git a/renderdoc/driver/d3d11/d3d11_rendermesh.cpp b/renderdoc/driver/d3d11/d3d11_rendermesh.cpp index 9b592a6a0..bb6c659cc 100644 --- a/renderdoc/driver/d3d11/d3d11_rendermesh.cpp +++ b/renderdoc/driver/d3d11/d3d11_rendermesh.cpp @@ -32,7 +32,7 @@ #include "data/hlsl/hlsl_cbuffers.h" -void D3D11Replay::RenderMesh(uint32_t eventId, const vector &secondaryDraws, +void D3D11Replay::RenderMesh(uint32_t eventId, const std::vector &secondaryDraws, const MeshDisplay &cfg) { if(cfg.position.vertexResourceId == ResourceId() || cfg.position.numIndices == 0) @@ -367,16 +367,16 @@ void D3D11Replay::RenderMesh(uint32_t eventId, const vector &seconda FloatVector activeVertex; // primitive this vert is a part of (red prim, optional) - vector activePrim; + std::vector activePrim; // for patch lists, to show other verts in patch (green dots, optional) // for non-patch lists, we use the activePrim and adjacentPrimVertices // to show what other verts are related - vector inactiveVertices; + std::vector inactiveVertices; // adjacency (line or tri, strips or lists) (green prims, optional) // will be N*M long, N adjacent prims of M verts each. M = primSize below - vector adjacentPrimVertices; + std::vector adjacentPrimVertices; D3D11_PRIMITIVE_TOPOLOGY primTopo = D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST; // tri or line list diff --git a/renderdoc/driver/d3d11/d3d11_renderstate.cpp b/renderdoc/driver/d3d11/d3d11_renderstate.cpp index 0b7e48f25..6118a8c13 100644 --- a/renderdoc/driver/d3d11/d3d11_renderstate.cpp +++ b/renderdoc/driver/d3d11/d3d11_renderstate.cpp @@ -1154,7 +1154,7 @@ bool D3D11RenderState::InputAssembler::Used_VB(WrappedID3D11Device *device, uint if(Layout == NULL) return false; - const vector &vec = device->GetLayoutDesc(Layout); + const std::vector &vec = device->GetLayoutDesc(Layout); for(size_t i = 0; i < vec.size(); i++) if(vec[i].InputSlot == slot) diff --git a/renderdoc/driver/d3d11/d3d11_replay.cpp b/renderdoc/driver/d3d11/d3d11_replay.cpp index fc2bb7165..7353de563 100644 --- a/renderdoc/driver/d3d11/d3d11_replay.cpp +++ b/renderdoc/driver/d3d11/d3d11_replay.cpp @@ -450,9 +450,9 @@ ShaderReflection *D3D11Replay::GetShader(ResourceId shader, ShaderEntryPoint ent return &ret; } -vector D3D11Replay::GetDisassemblyTargets() +std::vector D3D11Replay::GetDisassemblyTargets() { - vector ret; + std::vector ret; // DXBC is always first ret.insert(ret.begin(), DXBCDisassemblyTarget); @@ -502,12 +502,12 @@ FrameRecord D3D11Replay::GetFrameRecord() return m_pDevice->GetFrameRecord(); } -vector D3D11Replay::GetUsage(ResourceId id) +std::vector D3D11Replay::GetUsage(ResourceId id) { return m_pDevice->GetImmediateContext()->GetUsage(id); } -vector D3D11Replay::GetDebugMessages() +std::vector D3D11Replay::GetDebugMessages() { return m_pDevice->GetDebugMessages(); } @@ -654,7 +654,7 @@ void D3D11Replay::SavePipelineState(uint32_t eventId) if(rs->IA.Layout) { - const vector &vec = m_pDevice->GetLayoutDesc(rs->IA.Layout); + const std::vector &vec = m_pDevice->GetLayoutDesc(rs->IA.Layout); ResourceId layoutId = GetIDForResource(rs->IA.Layout); @@ -1488,9 +1488,9 @@ const SDFile &D3D11Replay::GetStructuredFile() return m_pDevice->GetStructuredFile(); } -vector D3D11Replay::GetPassEvents(uint32_t eventId) +std::vector D3D11Replay::GetPassEvents(uint32_t eventId) { - vector passEvents; + std::vector passEvents; const DrawcallDescription *draw = m_pDevice->GetDrawcall(eventId); @@ -1529,7 +1529,7 @@ ResourceId D3D11Replay::GetLiveID(ResourceId id) bool D3D11Replay::GetHistogram(ResourceId texid, uint32_t sliceFace, uint32_t mip, uint32_t sample, CompType typeHint, float minval, float maxval, bool channels[4], - vector &histogram) + std::vector &histogram) { if(minval >= maxval) return false; diff --git a/renderdoc/driver/d3d11/d3d11_replay.h b/renderdoc/driver/d3d11/d3d11_replay.h index 00fac57b9..ec6e131b9 100644 --- a/renderdoc/driver/d3d11/d3d11_replay.h +++ b/renderdoc/driver/d3d11/d3d11_replay.h @@ -116,16 +116,16 @@ public: std::vector GetTextures(); TextureDescription GetTexture(ResourceId id); - vector GetDebugMessages(); + std::vector GetDebugMessages(); rdcarray GetShaderEntryPoints(ResourceId shader); ShaderReflection *GetShader(ResourceId shader, ShaderEntryPoint entry); - vector GetDisassemblyTargets(); + std::vector GetDisassemblyTargets(); std::string DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, const std::string &target); - vector GetUsage(ResourceId id); + std::vector GetUsage(ResourceId id); FrameRecord GetFrameRecord(); @@ -141,11 +141,11 @@ public: void ReplayLog(uint32_t endEventID, ReplayLogType replayType); const SDFile &GetStructuredFile(); - vector GetPassEvents(uint32_t eventId); + std::vector GetPassEvents(uint32_t eventId); - vector GetSupportedWindowSystems() + std::vector GetSupportedWindowSystems() { - vector ret; + std::vector ret; ret.push_back(WindowingSystem::Win32); return ret; } @@ -164,7 +164,7 @@ public: void FlipOutputWindow(uint64_t id); void InitPostVSBuffers(uint32_t eventId); - void InitPostVSBuffers(const vector &passEvents); + void InitPostVSBuffers(const std::vector &passEvents); ResourceId GetLiveID(ResourceId id); @@ -172,7 +172,7 @@ public: CompType typeHint, float *minval, float *maxval); bool GetHistogram(ResourceId texid, uint32_t sliceFace, uint32_t mip, uint32_t sample, CompType typeHint, float minval, float maxval, bool channels[4], - vector &histogram); + std::vector &histogram); MeshFormat GetPostVSBuffers(uint32_t eventId, uint32_t instID, uint32_t viewID, MeshDataStage stage); @@ -191,9 +191,9 @@ public: void ReplaceResource(ResourceId from, ResourceId to); void RemoveReplacement(ResourceId id); - vector EnumerateCounters(); + std::vector EnumerateCounters(); CounterDescription DescribeCounter(GPUCounter counterID); - vector FetchCounters(const vector &counters); + std::vector FetchCounters(const std::vector &counters); ResourceId CreateProxyTexture(const TextureDescription &templateTex); void SetProxyTextureData(ResourceId texid, uint32_t arrayIdx, uint32_t mip, byte *data, @@ -204,7 +204,8 @@ public: ResourceId CreateProxyBuffer(const BufferDescription &templateBuf); void SetProxyBufferData(ResourceId bufid, byte *data, size_t dataSize); - void RenderMesh(uint32_t eventId, const vector &secondaryDraws, const MeshDisplay &cfg); + void RenderMesh(uint32_t eventId, const std::vector &secondaryDraws, + const MeshDisplay &cfg); bool RenderTexture(TextureDisplay cfg); @@ -215,9 +216,9 @@ public: void FillCBufferVariables(ResourceId shader, std::string entryPoint, uint32_t cbufSlot, rdcarray &outvars, const bytebuf &data); - vector PixelHistory(vector events, ResourceId target, uint32_t x, - uint32_t y, uint32_t slice, uint32_t mip, - uint32_t sampleIdx, CompType typeHint); + std::vector PixelHistory(std::vector events, ResourceId target, + uint32_t x, uint32_t y, uint32_t slice, uint32_t mip, + uint32_t sampleIdx, CompType typeHint); ShaderDebugTrace DebugVertex(uint32_t eventId, uint32_t vertid, uint32_t instid, uint32_t idx, uint32_t instOffset, uint32_t vertOffset); ShaderDebugTrace DebugPixel(uint32_t eventId, uint32_t x, uint32_t y, uint32_t sample, @@ -230,7 +231,7 @@ public: uint32_t x, uint32_t y); ResourceId RenderOverlay(ResourceId texid, CompType typeHint, DebugOverlay overlay, - uint32_t eventId, const vector &passEvents); + uint32_t eventId, const std::vector &passEvents); void BuildCustomShader(std::string source, std::string entry, const ShaderCompileFlags &compileFlags, ShaderStage type, ResourceId *id, @@ -257,17 +258,17 @@ private: void CreateSOBuffers(); void ShutdownStreamOut(); - std::vector FetchCountersAMD(const vector &counters); - std::vector FetchCountersNV(const vector &counters); - std::vector FetchCountersIntel(const vector &counters); + std::vector FetchCountersAMD(const std::vector &counters); + std::vector FetchCountersNV(const std::vector &counters); + std::vector FetchCountersIntel(const std::vector &counters); void FillTimers(D3D11CounterContext &ctx, const DrawcallDescription &drawnode); - void FillTimersAMD(uint32_t &eventStartID, uint32_t &sampleIndex, vector &eventIDs, + void FillTimersAMD(uint32_t &eventStartID, uint32_t &sampleIndex, std::vector &eventIDs, const DrawcallDescription &drawnode); - void FillTimersNV(uint32_t &eventStartID, uint32_t &sampleIndex, vector &eventIDs, + void FillTimersNV(uint32_t &eventStartID, uint32_t &sampleIndex, std::vector &eventIDs, const DrawcallDescription &drawnode); - void FillTimersIntel(uint32_t &eventStartID, uint32_t &sampleIndex, vector &eventIDs, - const DrawcallDescription &drawnode); + void FillTimersIntel(uint32_t &eventStartID, uint32_t &sampleIndex, + std::vector &eventIDs, const DrawcallDescription &drawnode); void SerializeImmediateContext(); @@ -281,7 +282,7 @@ private: m_OutputHeight = float(h); } - vector m_ProxyResources; + std::vector m_ProxyResources; struct OutputWindow { diff --git a/renderdoc/driver/d3d11/d3d11_resources.cpp b/renderdoc/driver/d3d11/d3d11_resources.cpp index b4e6a9dc5..a5afc2778 100644 --- a/renderdoc/driver/d3d11/d3d11_resources.cpp +++ b/renderdoc/driver/d3d11/d3d11_resources.cpp @@ -126,7 +126,7 @@ void WrappedShader::ShaderEntry::TryReplaceOriginalByteCode() if(lz4 || originalShaderSize >= m_Bytecode.size()) { - vector originalBytecode; + std::vector originalBytecode; originalBytecode.resize((size_t)originalShaderSize); FileIO::fread(&originalBytecode[0], sizeof(byte), (size_t)originalShaderSize, @@ -134,7 +134,7 @@ void WrappedShader::ShaderEntry::TryReplaceOriginalByteCode() if(lz4) { - vector decompressed; + std::vector decompressed; // first try decompressing to 1MB flat decompressed.resize(100 * 1024); diff --git a/renderdoc/driver/d3d11/d3d11_resources.h b/renderdoc/driver/d3d11/d3d11_resources.h index d01d1be70..9fcffb915 100644 --- a/renderdoc/driver/d3d11/d3d11_resources.h +++ b/renderdoc/driver/d3d11/d3d11_resources.h @@ -938,9 +938,9 @@ public: ResourceId m_ID; std::string m_DebugInfoPath; - vector *m_DebugInfoSearchPaths; + std::vector *m_DebugInfoSearchPaths; - vector m_Bytecode; + std::vector m_Bytecode; bool m_Built = false; DXBC::DXBCFile *m_DXBCFile; diff --git a/renderdoc/driver/d3d11/d3d11_shaderdebug.cpp b/renderdoc/driver/d3d11/d3d11_shaderdebug.cpp index 1d5162a15..6f93f9b86 100644 --- a/renderdoc/driver/d3d11/d3d11_shaderdebug.cpp +++ b/renderdoc/driver/d3d11/d3d11_shaderdebug.cpp @@ -772,7 +772,7 @@ ShaderDebugTrace D3D11Replay::DebugVertex(uint32_t eventId, uint32_t vertid, uin D3D11RenderState *rs = m_pImmediateContext->GetCurrentPipelineState(); - vector inputlayout = m_pDevice->GetLayoutDesc(rs->IA.Layout); + std::vector inputlayout = m_pDevice->GetLayoutDesc(rs->IA.Layout); std::set vertexbuffers; uint32_t trackingOffs[32] = {0}; @@ -1088,7 +1088,7 @@ ShaderDebugTrace D3D11Replay::DebugVertex(uint32_t eventId, uint32_t vertid, uin State last; - vector states; + std::vector states; if(dxbc->m_DebugInfo) dxbc->m_DebugInfo->GetLocals(0, dxbc->GetInstruction(0).offset, initialState.locals); @@ -1197,7 +1197,7 @@ ShaderDebugTrace D3D11Replay::DebugPixel(uint32_t eventId, uint32_t x, uint32_t if(prevdxbc == NULL && vs != NULL) prevdxbc = vs->GetDXBC(); - vector initialValues; + std::vector initialValues; std::string extractHlsl = "struct PSInput\n{\n"; @@ -1212,9 +1212,9 @@ ShaderDebugTrace D3D11Replay::DebugPixel(uint32_t eventId, uint32_t x, uint32_t structureStride += 4; } - vector floatInputs; + std::vector floatInputs; // name, pair - vector>> arrays; + std::vector>> arrays; std::vector inputVarNames; uint32_t nextreg = 0; @@ -2261,7 +2261,7 @@ void ExtractInputsPS(PSInput IN, float4 debug_pixelPos : SV_Position, uint prim SAFE_DELETE_ARRAY(initialData); SAFE_DELETE_ARRAY(evalData); - vector states; + std::vector states; if(dxbc->m_DebugInfo) dxbc->m_DebugInfo->GetLocals(0, dxbc->GetInstruction(0).offset, quad[destIdx].locals); @@ -2467,7 +2467,7 @@ ShaderDebugTrace D3D11Replay::DebugThread(uint32_t eventId, const uint32_t group initialState.semantics.ThreadID[i] = threadid[i]; } - vector states; + std::vector states; if(dxbc->m_DebugInfo) dxbc->m_DebugInfo->GetLocals(0, dxbc->GetInstruction(0).offset, initialState.locals); diff --git a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp index b2fc6ff96..41d76fa5e 100644 --- a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp +++ b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp @@ -1594,7 +1594,7 @@ void WrappedID3D12GraphicsCommandList::SetComputeRootDescriptorTable( m_ListRecord->MarkResourceFrameReferenced(GetWrapped(BaseDescriptor)->GetHeapResourceId(), eFrameRef_Read); - vector &ranges = + std::vector &ranges = GetWrapped(m_CurCompRootSig)->sig.params[RootParameterIndex].ranges; D3D12Descriptor *base = GetWrapped(BaseDescriptor); @@ -2157,7 +2157,7 @@ void WrappedID3D12GraphicsCommandList::SetGraphicsRootDescriptorTable( m_ListRecord->MarkResourceFrameReferenced(GetWrapped(BaseDescriptor)->GetHeapResourceId(), eFrameRef_Read); - vector &ranges = + std::vector &ranges = GetWrapped(m_CurGfxRootSig)->sig.params[RootParameterIndex].ranges; D3D12Descriptor *base = GetWrapped(BaseDescriptor); @@ -3800,7 +3800,7 @@ void WrappedID3D12GraphicsCommandList::ReplayExecuteIndirect(ID3D12GraphicsComma byte *dataPtr = &data[0]; - vector &sigelems = + std::vector &sigelems = gfx ? m_Cmd->m_RenderState.graphics.sigelems : m_Cmd->m_RenderState.compute.sigelems; // while executing, decide where to start and stop. We do this by modifying the max count and diff --git a/renderdoc/driver/d3d12/d3d12_command_queue.h b/renderdoc/driver/d3d12/d3d12_command_queue.h index 4d6beb14f..c615f4c4f 100644 --- a/renderdoc/driver/d3d12/d3d12_command_queue.h +++ b/renderdoc/driver/d3d12/d3d12_command_queue.h @@ -91,7 +91,7 @@ class WrappedID3D12CommandQueue : public ID3D12CommandQueue, WrappedID3D12DebugCommandQueue m_WrappedDebug; - vector m_CmdListRecords; + std::vector m_CmdListRecords; // D3D12 guarantees that queues are thread-safe Threading::CriticalSection m_Lock; @@ -126,7 +126,7 @@ public: ID3D12CommandQueue *GetReal() { return m_pReal; } D3D12ResourceRecord *GetResourceRecord() { return m_QueueRecord; } WrappedID3D12Device *GetWrappedDevice() { return m_pDevice; } - const vector &GetCmdLists() { return m_CmdListRecords; } + const std::vector &GetCmdLists() { return m_CmdListRecords; } D3D12DrawcallTreeNode &GetParentDrawcall() { return m_Cmd.m_ParentDrawcall; } const APIEvent &GetEvent(uint32_t eventId); uint32_t GetMaxEID() { return m_Cmd.m_Events.back().eventId; } @@ -137,7 +137,7 @@ public: bool partial); void SetFrameReader(StreamReader *reader) { m_FrameReader = reader; } D3D12CommandData *GetCommandData() { return &m_Cmd; } - const vector &GetUsage(ResourceId id) { return m_Cmd.m_ResourceUses[id]; } + const std::vector &GetUsage(ResourceId id) { return m_Cmd.m_ResourceUses[id]; } // interface for DXGI virtual IUnknown *GetRealIUnknown() { return GetReal(); } virtual IID GetBackbufferUUID() { return __uuidof(ID3D12Resource); } diff --git a/renderdoc/driver/d3d12/d3d12_command_queue_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_queue_wrap.cpp index 1efb93766..b5419470d 100644 --- a/renderdoc/driver/d3d12/d3d12_command_queue_wrap.cpp +++ b/renderdoc/driver/d3d12/d3d12_command_queue_wrap.cpp @@ -193,8 +193,8 @@ bool WrappedID3D12CommandQueue::Serialise_ExecuteCommandLists(SerialiserType &se for(size_t e = 0; e < cmdListInfo.draw->executedCmds.size(); e++) { - vector &submits = m_Cmd.m_Partial[D3D12CommandData::Secondary] - .cmdListExecs[cmdListInfo.draw->executedCmds[e]]; + std::vector &submits = m_Cmd.m_Partial[D3D12CommandData::Secondary] + .cmdListExecs[cmdListInfo.draw->executedCmds[e]]; for(size_t s = 0; s < submits.size(); s++) submits[s] += m_Cmd.m_RootEventID; diff --git a/renderdoc/driver/d3d12/d3d12_commands.cpp b/renderdoc/driver/d3d12/d3d12_commands.cpp index 754faaca0..8008b655a 100644 --- a/renderdoc/driver/d3d12/d3d12_commands.cpp +++ b/renderdoc/driver/d3d12/d3d12_commands.cpp @@ -1453,7 +1453,7 @@ void D3D12CommandData::AddUsage(const D3D12RenderState &state, D3D12DrawcallTree make_rdcpair(state.streamouts[i].countbuf, EventUsage(e, ResourceUsage::StreamOut))); } - vector rts = state.GetRTVIDs(); + std::vector rts = state.GetRTVIDs(); for(size_t i = 0; i < rts.size(); i++) { @@ -1619,7 +1619,7 @@ void D3D12CommandData::AddDrawcall(const DrawcallDescription &d, bool hasEvents, draw.topology = MakePrimitiveTopology(m_BakedCmdListInfo[m_LastCmdListID].state.topo); draw.indexByteWidth = m_BakedCmdListInfo[m_LastCmdListID].state.ibuffer.bytewidth; - vector rts = m_BakedCmdListInfo[m_LastCmdListID].state.GetRTVIDs(); + std::vector rts = m_BakedCmdListInfo[m_LastCmdListID].state.GetRTVIDs(); for(size_t i = 0; i < ARRAY_COUNT(draw.outputs); i++) { @@ -1645,9 +1645,9 @@ void D3D12CommandData::AddDrawcall(const DrawcallDescription &d, bool hasEvents, if(hasEvents) { - vector &srcEvents = m_LastCmdListID != ResourceId() - ? m_BakedCmdListInfo[m_LastCmdListID].curEvents - : m_RootEvents; + std::vector &srcEvents = m_LastCmdListID != ResourceId() + ? m_BakedCmdListInfo[m_LastCmdListID].curEvents + : m_RootEvents; draw.events = srcEvents; srcEvents.clear(); @@ -1672,7 +1672,7 @@ void D3D12CommandData::AddDrawcall(const DrawcallDescription &d, bool hasEvents, } void D3D12CommandData::InsertDrawsAndRefreshIDs(ResourceId cmd, - vector &cmdBufNodes) + std::vector &cmdBufNodes) { // assign new drawcall IDs for(size_t i = 0; i < cmdBufNodes.size(); i++) diff --git a/renderdoc/driver/d3d12/d3d12_commands.h b/renderdoc/driver/d3d12/d3d12_commands.h index dbc21a268..8f95d69fb 100644 --- a/renderdoc/driver/d3d12/d3d12_commands.h +++ b/renderdoc/driver/d3d12/d3d12_commands.h @@ -36,13 +36,13 @@ struct D3D12DrawcallTreeNode D3D12DrawcallTreeNode(const D3D12DrawcallTreeNode &other) { *this = other; } ~D3D12DrawcallTreeNode() { SAFE_DELETE(state); } DrawcallDescription draw; - vector children; + std::vector children; D3D12RenderState *state = NULL; - vector > resourceUsage; + std::vector > resourceUsage; - vector executedCmds; + std::vector executedCmds; D3D12DrawcallTreeNode &operator=(const DrawcallDescription &d) { @@ -86,9 +86,9 @@ struct D3D12DrawcallTreeNode } } - vector Bake() + std::vector Bake() { - vector ret; + std::vector ret; if(children.empty()) return ret; @@ -189,21 +189,21 @@ struct BakedCmdListInfo UINT realCount = 0; }; - vector crackedLists; - vector executeEvents; + std::vector crackedLists; + std::vector executeEvents; - vector curEvents; - vector debugMessages; + std::vector curEvents; + std::vector debugMessages; std::list drawStack; - vector > resourceUsage; + std::vector > resourceUsage; ResourceId allocator; D3D12_COMMAND_LIST_TYPE type; UINT nodeMask; D3D12RenderState state; - vector barriers; + std::vector barriers; ResourceId parentList; @@ -237,7 +237,7 @@ struct D3D12CommandData std::map m_CrackedAllocators; - vector m_IndirectBuffers; + std::vector m_IndirectBuffers; static const uint64_t m_IndirectSize = 4 * 1024 * 1024; uint64_t m_IndirectOffset; @@ -298,7 +298,7 @@ struct D3D12CommandData // so we just set this command list ID3D12GraphicsCommandList4 *m_OutsideCmdList = NULL; - void InsertDrawsAndRefreshIDs(ResourceId cmd, vector &cmdBufNodes); + void InsertDrawsAndRefreshIDs(ResourceId cmd, std::vector &cmdBufNodes); // this is a list of uint64_t file offset -> uint32_t EIDs of where each // drawcall is used. E.g. the drawcall at offset 873954 is EID 50. If a @@ -322,16 +322,16 @@ struct D3D12CommandData return eventId < o.eventId; } }; - vector m_DrawcallUses; + std::vector m_DrawcallUses; - vector m_EventMessages; + std::vector m_EventMessages; std::map m_RerecordCmds; std::vector m_RerecordCmdList; bool m_AddedDrawcall; - vector m_RootEvents, m_Events; + std::vector m_RootEvents, m_Events; uint64_t m_CurChunkOffset; SDChunkMetaData m_ChunkMetadata; @@ -340,7 +340,7 @@ struct D3D12CommandData SDFile *m_StructuredFile; - std::map > m_ResourceUses; + std::map > m_ResourceUses; D3D12DrawcallTreeNode m_ParentDrawcall; diff --git a/renderdoc/driver/d3d12/d3d12_counters.cpp b/renderdoc/driver/d3d12/d3d12_counters.cpp index be0862158..fd7ead99a 100644 --- a/renderdoc/driver/d3d12/d3d12_counters.cpp +++ b/renderdoc/driver/d3d12/d3d12_counters.cpp @@ -30,9 +30,9 @@ #include "d3d12_common.h" #include "d3d12_device.h" -vector D3D12Replay::EnumerateCounters() +std::vector D3D12Replay::EnumerateCounters() { - vector ret; + std::vector ret; ret.push_back(GPUCounter::EventGPUDuration); ret.push_back(GPUCounter::InputVerticesRead); @@ -50,7 +50,7 @@ vector D3D12Replay::EnumerateCounters() if(m_pAMDCounters) { - vector amdCounters = m_pAMDCounters->GetPublicCounterIds(); + std::vector amdCounters = m_pAMDCounters->GetPublicCounterIds(); ret.insert(ret.end(), amdCounters.begin(), amdCounters.end()); } @@ -191,7 +191,7 @@ CounterDescription D3D12Replay::DescribeCounter(GPUCounter counterID) struct D3D12AMDDrawCallback : public D3D12DrawcallCallback { D3D12AMDDrawCallback(WrappedID3D12Device *dev, D3D12Replay *rp, uint32_t &sampleIndex, - vector &eventIDs) + std::vector &eventIDs) : m_pDevice(dev), m_pReplay(rp), m_pSampleId(&sampleIndex), m_pEventIds(&eventIDs) { m_pDevice->GetQueue()->GetCommandData()->m_DrawcallCallback = this; @@ -261,18 +261,18 @@ struct D3D12AMDDrawCallback : public D3D12DrawcallCallback uint32_t *m_pSampleId; WrappedID3D12Device *m_pDevice; D3D12Replay *m_pReplay; - vector *m_pEventIds; + std::vector *m_pEventIds; 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 // recording the command buffer, and will be given the first EID. After that // we'll just be told which other EIDs alias this event. - vector > m_AliasEvents; + std::vector > m_AliasEvents; }; void D3D12Replay::FillTimersAMD(uint32_t *eventStartID, uint32_t *sampleIndex, - vector *eventIDs) + std::vector *eventIDs) { uint32_t maxEID = m_pDevice->GetQueue()->GetMaxEID(); @@ -282,13 +282,13 @@ void D3D12Replay::FillTimersAMD(uint32_t *eventStartID, uint32_t *sampleIndex, m_pDevice->ReplayLog(*eventStartID, maxEID, eReplay_Full); } -vector D3D12Replay::FetchCountersAMD(const vector &counters) +std::vector D3D12Replay::FetchCountersAMD(const std::vector &counters) { ID3D12Device *d3dDevice = m_pDevice->GetReal(); if(!m_pAMDCounters->BeginMeasurementMode(AMDCounters::ApiType::Dx12, (void *)d3dDevice)) { - return vector(); + return std::vector(); } uint32_t sessionID = m_pAMDCounters->CreateSession(); @@ -309,7 +309,7 @@ vector D3D12Replay::FetchCountersAMD(const vector &co uint32_t sampleIndex = 0; - vector eventIDs; + std::vector eventIDs; for(uint32_t i = 0; i < passCount; i++) { @@ -328,7 +328,7 @@ vector D3D12Replay::FetchCountersAMD(const vector &co m_pAMDCounters->EndSesssion(sessionID); - vector ret = + std::vector ret = m_pAMDCounters->GetCounterData(sessionID, sampleIndex, eventIDs, counters); for(size_t i = 0; i < m_pAMDDrawCallback->m_AliasEvents.size(); i++) @@ -427,7 +427,7 @@ struct D3D12GPUTimerCallback : public D3D12DrawcallCallback ID3D12QueryHeap *m_TimerQueryHeap; ID3D12QueryHeap *m_PipeStatsQueryHeap; ID3D12QueryHeap *m_OcclusionQueryHeap; - vector > m_Results; + std::vector > m_Results; uint32_t m_NumStatsQueries; uint32_t m_NumTimestampQueries; @@ -436,14 +436,14 @@ struct D3D12GPUTimerCallback : public D3D12DrawcallCallback // 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 // we'll just be told which other EIDs alias this event. - vector > m_AliasEvents; + std::vector > m_AliasEvents; }; -vector D3D12Replay::FetchCounters(const vector &counters) +std::vector D3D12Replay::FetchCounters(const std::vector &counters) { uint32_t maxEID = m_pDevice->GetQueue()->GetMaxEID(); - vector ret; + std::vector ret; if(counters.empty()) { RDCERR("No counters specified to FetchCounters"); @@ -452,14 +452,14 @@ vector D3D12Replay::FetchCounters(const vector &count SCOPED_TIMER("Fetch Counters, counters to fetch %u", counters.size()); - vector d3dCounters; + std::vector d3dCounters; std::copy_if(counters.begin(), counters.end(), std::back_inserter(d3dCounters), [](const GPUCounter &c) { return !IsAMDCounter(c); }); if(m_pAMDCounters) { // Filter out the AMD counters - vector amdCounters; + std::vector amdCounters; std::copy_if(counters.begin(), counters.end(), std::back_inserter(amdCounters), [](const GPUCounter &c) { return IsAMDCounter(c); }); diff --git a/renderdoc/driver/d3d12/d3d12_device.cpp b/renderdoc/driver/d3d12/d3d12_device.cpp index 02a35e790..6ef867022 100644 --- a/renderdoc/driver/d3d12/d3d12_device.cpp +++ b/renderdoc/driver/d3d12/d3d12_device.cpp @@ -799,7 +799,7 @@ void WrappedID3D12Device::FirstFrame(WrappedIDXGISwapChain4 *swap) } } -void WrappedID3D12Device::ApplyBarriers(vector &barriers) +void WrappedID3D12Device::ApplyBarriers(std::vector &barriers) { SCOPED_LOCK(m_ResourceStatesLock); GetResourceManager()->ApplyBarriers(barriers, m_ResourceStates); @@ -2590,7 +2590,7 @@ void WrappedID3D12Device::ExecuteLists(WrappedID3D12CommandQueue *queue, bool In if(m_InternalCmds.pendingcmds.empty()) return; - vector cmds; + std::vector cmds; cmds.resize(m_InternalCmds.pendingcmds.size()); for(size_t i = 0; i < cmds.size(); i++) cmds[i] = m_InternalCmds.pendingcmds[i]; diff --git a/renderdoc/driver/d3d12/d3d12_device.h b/renderdoc/driver/d3d12/d3d12_device.h index 914c5c98f..90accde1c 100644 --- a/renderdoc/driver/d3d12/d3d12_device.h +++ b/renderdoc/driver/d3d12/d3d12_device.h @@ -325,7 +325,7 @@ private: std::map m_UploadBuffers; Threading::CriticalSection m_MapsLock; - vector m_Maps; + std::vector m_Maps; bool ProcessChunk(ReadSerialiser &ser, D3D12Chunk context); @@ -347,17 +347,17 @@ private: size_t size; }; Threading::CriticalSection m_ThreadTempMemLock; - vector m_ThreadTempMem; + std::vector m_ThreadTempMem; - vector m_DebugMessages; + std::vector m_DebugMessages; SDFile *m_StructuredFile = NULL; SDFile m_StoredStructuredData; uint32_t m_FrameCounter; - vector m_CapturedFrames; + std::vector m_CapturedFrames; FrameRecord m_FrameRecord; - vector m_Drawcalls; + std::vector m_Drawcalls; ReplayStatus m_FailedReplayStatus = ReplayStatus::APIReplayFailed; @@ -465,7 +465,7 @@ public: ResourceId GetFrameCaptureResourceId() { return m_FrameCaptureRecord->GetResourceID(); } void AddDebugMessage(MessageCategory c, MessageSeverity sv, MessageSource src, std::string d); void AddDebugMessage(const DebugMessage &msg); - vector GetDebugMessages(); + std::vector GetDebugMessages(); void AddResource(ResourceId id, ResourceType type, const char *defaultNamePrefix); void DerivedResource(ResourceId parent, ResourceId child); @@ -474,7 +474,7 @@ public: void AddResourceCurChunk(ResourceId id); const std::string &GetResourceName(ResourceId id) { return m_ResourceNames[id]; } - vector &GetSubresourceStates(ResourceId id) + std::vector &GetSubresourceStates(ResourceId id) { return m_ResourceStates[id]; } @@ -494,7 +494,7 @@ public: D3D12Replay *GetReplay() { return &m_Replay; } WrappedID3D12CommandQueue *GetQueue() { return m_Queue; } ID3D12CommandAllocator *GetAlloc() { return m_Alloc; } - void ApplyBarriers(vector &barriers); + void ApplyBarriers(std::vector &barriers); void GetDynamicDescriptorReferences(std::vector &refs) { @@ -525,11 +525,11 @@ public: submittedcmds.clear(); } - vector freecmds; + std::vector freecmds; // -> GetNextCmd() -> - vector pendingcmds; + std::vector pendingcmds; // -> ExecuteLists() -> - vector submittedcmds; + std::vector submittedcmds; // -> FlushLists()--------back to freecmds--------^ } m_InternalCmds; @@ -674,9 +674,9 @@ public: UINT Subresource, const D3D12_BOX *pDstBox, const void *pSrcData, UINT SrcRowPitch, UINT SrcDepthPitch); - vector GetMaps() + std::vector GetMaps() { - vector ret; + std::vector ret; { SCOPED_LOCK(m_MapsLock); ret = m_Maps; diff --git a/renderdoc/driver/d3d12/d3d12_initstate.cpp b/renderdoc/driver/d3d12/d3d12_initstate.cpp index 9e1fb20dc..49b61e276 100644 --- a/renderdoc/driver/d3d12/d3d12_initstate.cpp +++ b/renderdoc/driver/d3d12/d3d12_initstate.cpp @@ -107,7 +107,8 @@ bool D3D12ResourceManager::Prepare_InitialState(ID3D12DeviceChild *res) if(nonresident) m_Device->MakeResident(1, &pageable); - const vector &states = m_Device->GetSubresourceStates(GetResID(res)); + const std::vector &states = + m_Device->GetSubresourceStates(GetResID(res)); RDCASSERT(states.size() == 1); D3D12_RESOURCE_BARRIER barrier; @@ -203,10 +204,11 @@ bool D3D12ResourceManager::Prepare_InitialState(ID3D12DeviceChild *res) ID3D12GraphicsCommandList *list = Unwrap(m_Device->GetInitialStateList()); - vector barriers; + std::vector barriers; { - const vector &states = m_Device->GetSubresourceStates(GetResID(r)); + const std::vector &states = + m_Device->GetSubresourceStates(GetResID(r)); barriers.reserve(states.size()); @@ -909,9 +911,10 @@ void D3D12ResourceManager::Apply_InitialState(ID3D12DeviceChild *live, ID3D12GraphicsCommandList *list = Unwrap(m_Device->GetInitialStateList()); - vector barriers; + std::vector barriers; - const vector &states = m_Device->GetSubresourceStates(GetResID(live)); + const std::vector &states = + m_Device->GetSubresourceStates(GetResID(live)); barriers.reserve(states.size()); diff --git a/renderdoc/driver/d3d12/d3d12_manager.cpp b/renderdoc/driver/d3d12/d3d12_manager.cpp index c612c9f9d..88428eb73 100644 --- a/renderdoc/driver/d3d12/d3d12_manager.cpp +++ b/renderdoc/driver/d3d12/d3d12_manager.cpp @@ -650,7 +650,7 @@ D3D12Descriptor *DescriptorFromPortableHandle(D3D12ResourceManager *manager, Por #define BARRIER_ASSERT(...) #endif -void D3D12ResourceManager::ApplyBarriers(vector &barriers, +void D3D12ResourceManager::ApplyBarriers(std::vector &barriers, std::map &states) { for(size_t b = 0; b < barriers.size(); b++) diff --git a/renderdoc/driver/d3d12/d3d12_manager.h b/renderdoc/driver/d3d12/d3d12_manager.h index a2ad4147f..a02195004 100644 --- a/renderdoc/driver/d3d12/d3d12_manager.h +++ b/renderdoc/driver/d3d12/d3d12_manager.h @@ -420,7 +420,7 @@ struct D3D12ResourceRecord; struct CmdListRecordingInfo { - vector barriers; + std::vector barriers; // a list of all resources dirtied by this command list std::set dirtied; @@ -432,10 +432,10 @@ struct CmdListRecordingInfo // expand a bit more to contain duplicates and then deal with it during frame // capture, than to constantly be deduplicating during record (e.g. with a // set or sorted vector). - vector boundDescs; + std::vector boundDescs; // bundles executed - vector bundles; + std::vector bundles; }; class WrappedID3D12Resource1; @@ -580,7 +580,7 @@ struct D3D12ResourceRecord : public ResourceRecord size_t m_MapsCount; }; -typedef vector SubresourceStateVector; +typedef std::vector SubresourceStateVector; struct D3D12InitialContents { @@ -694,7 +694,7 @@ public: return (T *)GetCurrentResource(id); } - void ApplyBarriers(vector &barriers, + void ApplyBarriers(std::vector &barriers, std::map &states); template diff --git a/renderdoc/driver/d3d12/d3d12_overlay.cpp b/renderdoc/driver/d3d12/d3d12_overlay.cpp index 785abc74a..e3a6497d9 100644 --- a/renderdoc/driver/d3d12/d3d12_overlay.cpp +++ b/renderdoc/driver/d3d12/d3d12_overlay.cpp @@ -43,7 +43,7 @@ struct D3D12QuadOverdrawCallback : public D3D12DrawcallCallback { D3D12QuadOverdrawCallback(WrappedID3D12Device *dev, D3D12_SHADER_BYTECODE quadWrite, - const vector &events, PortableHandle uav) + const std::vector &events, PortableHandle uav) : m_pDevice(dev), m_QuadWritePS(quadWrite), m_Events(events), m_UAV(uav) { m_pDevice->GetQueue()->GetCommandData()->m_DrawcallCallback = this; @@ -252,7 +252,7 @@ struct D3D12QuadOverdrawCallback : public D3D12DrawcallCallback WrappedID3D12Device *m_pDevice; D3D12_SHADER_BYTECODE m_QuadWritePS; - const vector &m_Events; + const std::vector &m_Events; PortableHandle m_UAV; // cache modified pipelines @@ -268,7 +268,7 @@ struct D3D12QuadOverdrawCallback : public D3D12DrawcallCallback }; ResourceId D3D12Replay::RenderOverlay(ResourceId texid, CompType typeHint, DebugOverlay overlay, - uint32_t eventId, const vector &passEvents) + uint32_t eventId, const std::vector &passEvents) { ID3D12Resource *resource = WrappedID3D12Resource1::GetList()[texid]; @@ -371,10 +371,10 @@ ResourceId D3D12Replay::RenderOverlay(ResourceId texid, CompType typeHint, Debug ID3D12GraphicsCommandList *list = m_pDevice->GetNewList(); - const vector &states = + const std::vector &states = m_pDevice->GetSubresourceStates(GetResID(realDepth)); - vector depthBarriers; + std::vector depthBarriers; depthBarriers.reserve(states.size()); for(size_t i = 0; i < states.size(); i++) { @@ -713,7 +713,7 @@ ResourceId D3D12Replay::RenderOverlay(ResourceId texid, CompType typeHint, Debug } else if(overlay == DebugOverlay::ClearBeforePass || overlay == DebugOverlay::ClearBeforeDraw) { - vector events = passEvents; + std::vector events = passEvents; if(overlay == DebugOverlay::ClearBeforeDraw) events.clear(); @@ -825,7 +825,7 @@ ResourceId D3D12Replay::RenderOverlay(ResourceId texid, CompType typeHint, Debug { SCOPED_TIMER("Triangle size"); - vector events = passEvents; + std::vector events = passEvents; if(overlay == DebugOverlay::TriangleSizeDraw) events.clear(); @@ -1019,7 +1019,7 @@ ResourceId D3D12Replay::RenderOverlay(ResourceId texid, CompType typeHint, Debug { SCOPED_TIMER("Quad Overdraw"); - vector events = passEvents; + std::vector events = passEvents; if(overlay == DebugOverlay::QuadOverdrawDraw) events.clear(); diff --git a/renderdoc/driver/d3d12/d3d12_postvs.cpp b/renderdoc/driver/d3d12/d3d12_postvs.cpp index 9896d8e92..36f99e971 100644 --- a/renderdoc/driver/d3d12/d3d12_postvs.cpp +++ b/renderdoc/driver/d3d12/d3d12_postvs.cpp @@ -236,7 +236,7 @@ void D3D12Replay::InitPostVSBuffers(uint32_t eventId) } } - vector sodecls; + std::vector sodecls; UINT stride = 0; int posidx = -1; @@ -381,7 +381,7 @@ void D3D12Replay::InitPostVSBuffers(uint32_t eventId) GetBufferData(rs.ibuffer.buf, rs.ibuffer.offs + drawcall->indexOffset * rs.ibuffer.bytewidth, RDCMIN(drawcall->numIndices * rs.ibuffer.bytewidth, rs.ibuffer.size), idxdata); - vector indices; + std::vector indices; uint16_t *idx16 = (uint16_t *)&idxdata[0]; uint32_t *idx32 = (uint32_t *)&idxdata[0]; @@ -1302,7 +1302,7 @@ void D3D12Replay::InitPostVSBuffers(uint32_t eventId) struct D3D12InitPostVSCallback : public D3D12DrawcallCallback { D3D12InitPostVSCallback(WrappedID3D12Device *dev, D3D12Replay *replay, - const vector &events) + const std::vector &events) : m_pDevice(dev), m_Replay(replay), m_Events(events) { m_pDevice->GetQueue()->GetCommandData()->m_DrawcallCallback = this; @@ -1329,10 +1329,10 @@ struct D3D12InitPostVSCallback : public D3D12DrawcallCallback WrappedID3D12Device *m_pDevice; D3D12Replay *m_Replay; - const vector &m_Events; + const std::vector &m_Events; }; -void D3D12Replay::InitPostVSBuffers(const vector &events) +void D3D12Replay::InitPostVSBuffers(const std::vector &events) { // first we must replay up to the first event without replaying it. This ensures any // non-command buffer calls like memory unmaps etc all happen correctly before this diff --git a/renderdoc/driver/d3d12/d3d12_rendermesh.cpp b/renderdoc/driver/d3d12/d3d12_rendermesh.cpp index bfd12c072..742059528 100644 --- a/renderdoc/driver/d3d12/d3d12_rendermesh.cpp +++ b/renderdoc/driver/d3d12/d3d12_rendermesh.cpp @@ -213,7 +213,7 @@ MeshDisplayPipelines D3D12DebugManager::CacheMeshDisplayPipelines(const MeshForm return cache; } -void D3D12Replay::RenderMesh(uint32_t eventId, const vector &secondaryDraws, +void D3D12Replay::RenderMesh(uint32_t eventId, const std::vector &secondaryDraws, const MeshDisplay &cfg) { if(cfg.position.vertexResourceId == ResourceId() || cfg.position.numIndices == 0) @@ -645,16 +645,16 @@ void D3D12Replay::RenderMesh(uint32_t eventId, const vector &seconda FloatVector activeVertex; // primitive this vert is a part of (red prim, optional) - vector activePrim; + std::vector activePrim; // for patch lists, to show other verts in patch (green dots, optional) // for non-patch lists, we use the activePrim and adjacentPrimVertices // to show what other verts are related - vector inactiveVertices; + std::vector inactiveVertices; // adjacency (line or tri, strips or lists) (green prims, optional) // will be N*M long, N adjacent prims of M verts each. M = primSize below - vector adjacentPrimVertices; + std::vector adjacentPrimVertices; helper.topology = Topology::TriangleList; uint32_t primSize = 3; // number of verts per primitive diff --git a/renderdoc/driver/d3d12/d3d12_rendertexture.cpp b/renderdoc/driver/d3d12/d3d12_rendertexture.cpp index 112ee41be..eecb9ecf3 100644 --- a/renderdoc/driver/d3d12/d3d12_rendertexture.cpp +++ b/renderdoc/driver/d3d12/d3d12_rendertexture.cpp @@ -168,7 +168,8 @@ void D3D12DebugManager::PrepareTextureSampling(ID3D12Resource *resource, CompTyp } // transition resource to D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE - const vector &states = m_pDevice->GetSubresourceStates(GetResID(resource)); + const std::vector &states = + m_pDevice->GetSubresourceStates(GetResID(resource)); barriers.reserve(states.size()); for(size_t i = 0; i < states.size(); i++) diff --git a/renderdoc/driver/d3d12/d3d12_replay.cpp b/renderdoc/driver/d3d12/d3d12_replay.cpp index 29e20003e..d26f3d03a 100644 --- a/renderdoc/driver/d3d12/d3d12_replay.cpp +++ b/renderdoc/driver/d3d12/d3d12_replay.cpp @@ -420,9 +420,9 @@ ShaderReflection *D3D12Replay::GetShader(ResourceId shader, ShaderEntryPoint ent return NULL; } -vector D3D12Replay::GetDisassemblyTargets() +std::vector D3D12Replay::GetDisassemblyTargets() { - vector ret; + std::vector ret; // DXBC is always first ret.insert(ret.begin(), DXBCDisassemblyTarget); @@ -604,7 +604,7 @@ ResourceId D3D12Replay::GetLiveID(ResourceId id) return m_pDevice->GetResourceManager()->GetLiveID(id); } -vector D3D12Replay::GetUsage(ResourceId id) +std::vector D3D12Replay::GetUsage(ResourceId id) { return m_pDevice->GetQueue()->GetUsage(id); } @@ -2386,7 +2386,7 @@ bool D3D12Replay::GetMinMax(ResourceId texid, uint32_t sliceFace, uint32_t mip, bool D3D12Replay::GetHistogram(ResourceId texid, uint32_t sliceFace, uint32_t mip, uint32_t sample, CompType typeHint, float minval, float maxval, bool channels[4], - vector &histogram) + std::vector &histogram) { if(minval >= maxval) return false; @@ -2562,9 +2562,9 @@ bool D3D12Replay::IsRenderOutput(ResourceId id) return false; } -vector D3D12Replay::GetPassEvents(uint32_t eventId) +std::vector D3D12Replay::GetPassEvents(uint32_t eventId) { - vector passEvents; + std::vector passEvents; const DrawcallDescription *draw = m_pDevice->GetDrawcall(eventId); @@ -2731,7 +2731,7 @@ void D3D12Replay::FillCBufferVariables(ResourceId shader, std::string entryPoint StandardFillCBufferVariables(c.variables, outvars, rootData.empty() ? data : rootData); } -vector D3D12Replay::GetDebugMessages() +std::vector D3D12Replay::GetDebugMessages() { return m_pDevice->GetDebugMessages(); } @@ -3074,7 +3074,7 @@ void D3D12Replay::GetTextureData(ResourceId tex, uint32_t arrayIdx, uint32_t mip list = m_pDevice->GetNewList(); // put source texture into resolve source state - const vector &states = m_pDevice->GetSubresourceStates(tex); + const std::vector &states = m_pDevice->GetSubresourceStates(tex); std::vector barriers; barriers.reserve(states.size()); @@ -3142,7 +3142,7 @@ void D3D12Replay::GetTextureData(ResourceId tex, uint32_t arrayIdx, uint32_t mip list = m_pDevice->GetNewList(); // put source texture into shader read state - const vector &states = m_pDevice->GetSubresourceStates(tex); + const std::vector &states = m_pDevice->GetSubresourceStates(tex); std::vector barriers; barriers.reserve(states.size()); @@ -3204,7 +3204,7 @@ void D3D12Replay::GetTextureData(ResourceId tex, uint32_t arrayIdx, uint32_t mip // if we have no tmpImage, we're copying directly from the real image if(tmpTexture == NULL) { - const vector &states = m_pDevice->GetSubresourceStates(tex); + const std::vector &states = m_pDevice->GetSubresourceStates(tex); barriers.reserve(states.size()); for(size_t i = 0; i < states.size(); i++) { @@ -3534,12 +3534,12 @@ ResourceId D3D12Replay::ApplyCustomShader(ResourceId shader, ResourceId texid, u #pragma region not yet implemented -vector D3D12Replay::PixelHistory(vector events, ResourceId target, - uint32_t x, uint32_t y, uint32_t slice, - uint32_t mip, uint32_t sampleIdx, - CompType typeHint) +std::vector D3D12Replay::PixelHistory(std::vector events, + ResourceId target, uint32_t x, uint32_t y, + uint32_t slice, uint32_t mip, + uint32_t sampleIdx, CompType typeHint) { - return vector(); + return std::vector(); } ShaderDebugTrace D3D12Replay::DebugVertex(uint32_t eventId, uint32_t vertid, uint32_t instid, diff --git a/renderdoc/driver/d3d12/d3d12_replay.h b/renderdoc/driver/d3d12/d3d12_replay.h index d89c5d4ad..4b419516b 100644 --- a/renderdoc/driver/d3d12/d3d12_replay.h +++ b/renderdoc/driver/d3d12/d3d12_replay.h @@ -75,16 +75,16 @@ public: std::vector GetTextures(); TextureDescription GetTexture(ResourceId id); - vector GetDebugMessages(); + std::vector GetDebugMessages(); rdcarray GetShaderEntryPoints(ResourceId shader); ShaderReflection *GetShader(ResourceId shader, ShaderEntryPoint entry); - vector GetDisassemblyTargets(); + std::vector GetDisassemblyTargets(); std::string DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, const std::string &target); - vector GetUsage(ResourceId id); + std::vector GetUsage(ResourceId id); FrameRecord GetFrameRecord(); @@ -100,11 +100,11 @@ public: void ReplayLog(uint32_t endEventID, ReplayLogType replayType); const SDFile &GetStructuredFile(); - vector GetPassEvents(uint32_t eventId); + std::vector GetPassEvents(uint32_t eventId); - vector GetSupportedWindowSystems() + std::vector GetSupportedWindowSystems() { - vector ret; + std::vector ret; ret.push_back(WindowingSystem::Win32); return ret; } @@ -123,7 +123,7 @@ public: void FlipOutputWindow(uint64_t id); void InitPostVSBuffers(uint32_t eventId); - void InitPostVSBuffers(const vector &passEvents); + void InitPostVSBuffers(const std::vector &passEvents); // indicates that EID alias is the same as eventId void AliasPostVSBuffers(uint32_t eventId, uint32_t alias) { m_PostVSAlias[alias] = eventId; } @@ -133,7 +133,7 @@ public: CompType typeHint, float *minval, float *maxval); bool GetHistogram(ResourceId texid, uint32_t sliceFace, uint32_t mip, uint32_t sample, CompType typeHint, float minval, float maxval, bool channels[4], - vector &histogram); + std::vector &histogram); MeshFormat GetPostVSBuffers(uint32_t eventId, uint32_t instID, uint32_t viewID, MeshDataStage stage); @@ -152,9 +152,9 @@ public: void ReplaceResource(ResourceId from, ResourceId to); void RemoveReplacement(ResourceId id); - vector EnumerateCounters(); + std::vector EnumerateCounters(); CounterDescription DescribeCounter(GPUCounter counterID); - vector FetchCounters(const vector &counters); + std::vector FetchCounters(const std::vector &counters); ResourceId CreateProxyTexture(const TextureDescription &templateTex); void SetProxyTextureData(ResourceId texid, uint32_t arrayIdx, uint32_t mip, byte *data, @@ -165,7 +165,8 @@ public: ResourceId CreateProxyBuffer(const BufferDescription &templateBuf); void SetProxyBufferData(ResourceId bufid, byte *data, size_t dataSize); - void RenderMesh(uint32_t eventId, const vector &secondaryDraws, const MeshDisplay &cfg); + void RenderMesh(uint32_t eventId, const std::vector &secondaryDraws, + const MeshDisplay &cfg); bool RenderTexture(TextureDisplay cfg); @@ -176,9 +177,9 @@ public: void FillCBufferVariables(ResourceId shader, std::string entryPoint, uint32_t cbufSlot, rdcarray &outvars, const bytebuf &data); - vector PixelHistory(vector events, ResourceId target, uint32_t x, - uint32_t y, uint32_t slice, uint32_t mip, - uint32_t sampleIdx, CompType typeHint); + std::vector PixelHistory(std::vector events, ResourceId target, + uint32_t x, uint32_t y, uint32_t slice, uint32_t mip, + uint32_t sampleIdx, CompType typeHint); ShaderDebugTrace DebugVertex(uint32_t eventId, uint32_t vertid, uint32_t instid, uint32_t idx, uint32_t instOffset, uint32_t vertOffset); ShaderDebugTrace DebugPixel(uint32_t eventId, uint32_t x, uint32_t y, uint32_t sample, @@ -191,7 +192,7 @@ public: uint32_t x, uint32_t y); ResourceId RenderOverlay(ResourceId texid, CompType typeHint, DebugOverlay overlay, - uint32_t eventId, const vector &passEvents); + uint32_t eventId, const std::vector &passEvents); void BuildCustomShader(std::string source, std::string entry, const ShaderCompileFlags &compileFlags, ShaderStage type, ResourceId *id, @@ -283,7 +284,7 @@ private: bool m_Proxy; - vector m_ProxyResources; + std::vector m_ProxyResources; struct OutputWindow { @@ -421,7 +422,7 @@ private: D3D12AMDDrawCallback *m_pAMDDrawCallback = NULL; - void FillTimersAMD(uint32_t *eventStartID, uint32_t *sampleIndex, vector *eventIDs); + void FillTimersAMD(uint32_t *eventStartID, uint32_t *sampleIndex, std::vector *eventIDs); - vector FetchCountersAMD(const vector &counters); + std::vector FetchCountersAMD(const std::vector &counters); }; diff --git a/renderdoc/driver/d3d12/d3d12_resources.cpp b/renderdoc/driver/d3d12/d3d12_resources.cpp index 767652175..e9a3a9a70 100644 --- a/renderdoc/driver/d3d12/d3d12_resources.cpp +++ b/renderdoc/driver/d3d12/d3d12_resources.cpp @@ -89,7 +89,7 @@ void WrappedID3D12Shader::TryReplaceOriginalByteCode() if(lz4 || originalShaderSize >= m_Bytecode.size()) { - vector originalBytecode; + std::vector originalBytecode; originalBytecode.resize((size_t)originalShaderSize); FileIO::fread(&originalBytecode[0], sizeof(byte), (size_t)originalShaderSize, @@ -97,7 +97,7 @@ void WrappedID3D12Shader::TryReplaceOriginalByteCode() if(lz4) { - vector decompressed; + std::vector decompressed; // first try decompressing to 1MB flat decompressed.resize(100 * 1024); diff --git a/renderdoc/driver/d3d12/d3d12_resources.h b/renderdoc/driver/d3d12/d3d12_resources.h index 7bb027054..36be694a2 100644 --- a/renderdoc/driver/d3d12/d3d12_resources.h +++ b/renderdoc/driver/d3d12/d3d12_resources.h @@ -707,7 +707,7 @@ public: } DXBCKey GetKey() { return m_Key; } - void SetDebugInfoPath(vector *searchPaths, const std::string &path) + void SetDebugInfoPath(std::vector *searchPaths, const std::string &path) { m_DebugInfoSearchPaths = searchPaths; m_DebugInfoPath = path; @@ -746,7 +746,7 @@ public: return m_Mapping; } - vector m_Pipes; + std::vector m_Pipes; private: ShaderEntry(const ShaderEntry &e); @@ -758,9 +758,9 @@ public: DXBCKey m_Key; std::string m_DebugInfoPath; - vector *m_DebugInfoSearchPaths; + std::vector *m_DebugInfoSearchPaths; - vector m_Bytecode; + std::vector m_Bytecode; bool m_Built; DXBC::DXBCFile *m_DXBCFile; diff --git a/renderdoc/driver/d3d12/d3d12_state.cpp b/renderdoc/driver/d3d12/d3d12_state.cpp index cfece9fdb..482ef931e 100644 --- a/renderdoc/driver/d3d12/d3d12_state.cpp +++ b/renderdoc/driver/d3d12/d3d12_state.cpp @@ -55,9 +55,9 @@ D3D12RenderState &D3D12RenderState::operator=(const D3D12RenderState &o) return *this; } -vector D3D12RenderState::GetRTVIDs() const +std::vector D3D12RenderState::GetRTVIDs() const { - vector ret; + std::vector ret; for(UINT i = 0; i < rts.size(); i++) { diff --git a/renderdoc/driver/d3d12/d3d12_state.h b/renderdoc/driver/d3d12/d3d12_state.h index 2c861b16a..adba4dd9c 100644 --- a/renderdoc/driver/d3d12/d3d12_state.h +++ b/renderdoc/driver/d3d12/d3d12_state.h @@ -50,15 +50,15 @@ struct D3D12RenderState void ApplyComputeRootElements(ID3D12GraphicsCommandList4 *cmd) const; void ApplyGraphicsRootElements(ID3D12GraphicsCommandList4 *cmd) const; - vector views; - vector scissors; + std::vector views; + std::vector scissors; // these are D3D12Descriptor copies since the values of the descriptors are read during // OMSetRenderTargets and may not exist anywhere after that if they are immediately overwritten. - vector rts; + std::vector rts; D3D12Descriptor dsv; - vector GetRTVIDs() const; + std::vector GetRTVIDs() const; ResourceId GetDSVID() const; struct SignatureElement @@ -140,10 +140,10 @@ struct D3D12RenderState ResourceId id; UINT64 offset; - vector constants; + std::vector constants; }; - vector heaps; + std::vector heaps; struct StreamOut { @@ -154,13 +154,13 @@ struct D3D12RenderState ResourceId countbuf; UINT64 countoffs; }; - vector streamouts; + std::vector streamouts; struct RootSignature { ResourceId rootsig; - vector sigelems; + std::vector sigelems; } compute, graphics; ResourceId pipe; @@ -194,7 +194,7 @@ struct D3D12RenderState UINT stride; UINT size; }; - vector vbuffers; + std::vector vbuffers; D3D12ResourceManager *GetResourceManager() const { return m_ResourceManager; } D3D12ResourceManager *m_ResourceManager = NULL; diff --git a/renderdoc/driver/gl/egl_hooks.cpp b/renderdoc/driver/gl/egl_hooks.cpp index c136f49fb..b622ab567 100644 --- a/renderdoc/driver/gl/egl_hooks.cpp +++ b/renderdoc/driver/gl/egl_hooks.cpp @@ -158,7 +158,7 @@ HOOK_EXPORT EGLContext EGLAPIENTRY eglCreateContext_renderdoc_hooked(EGLDisplay LibraryHooks::Refresh(); - vector attribs; + std::vector attribs; // modify attribList to our liking { diff --git a/renderdoc/driver/gl/gl_counters.cpp b/renderdoc/driver/gl/gl_counters.cpp index 9fa59d48c..ef8ef5298 100644 --- a/renderdoc/driver/gl/gl_counters.cpp +++ b/renderdoc/driver/gl/gl_counters.cpp @@ -30,9 +30,9 @@ #include "gl_replay.h" #include "gl_resources.h" -vector GLReplay::EnumerateCounters() +std::vector GLReplay::EnumerateCounters() { - vector ret; + std::vector ret; ret.push_back(GPUCounter::EventGPUDuration); @@ -56,13 +56,13 @@ vector GLReplay::EnumerateCounters() if(m_pAMDCounters) { - vector amdCounters = m_pAMDCounters->GetPublicCounterIds(); + std::vector amdCounters = m_pAMDCounters->GetPublicCounterIds(); ret.insert(ret.end(), amdCounters.begin(), amdCounters.end()); } if(m_pIntelCounters) { - vector intelCounters = m_pIntelCounters->GetPublicCounterIds(); + std::vector intelCounters = m_pIntelCounters->GetPublicCounterIds(); ret.insert(ret.end(), intelCounters.begin(), intelCounters.end()); } @@ -220,7 +220,7 @@ struct GPUQueries struct GLCounterContext { uint32_t eventStart; - vector queries; + std::vector queries; }; GLenum glCounters[] = { @@ -241,7 +241,7 @@ GLenum glCounters[] = { }; void GLReplay::FillTimers(GLCounterContext &ctx, const DrawcallDescription &drawnode, - const vector &counters) + const std::vector &counters) { if(drawnode.children.empty()) return; @@ -301,7 +301,7 @@ void GLReplay::FillTimers(GLCounterContext &ctx, const DrawcallDescription &draw } void GLReplay::FillTimersAMD(uint32_t *eventStartID, uint32_t *sampleIndex, - vector *eventIDs, const DrawcallDescription &drawnode) + std::vector *eventIDs, const DrawcallDescription &drawnode) { if(drawnode.children.empty()) return; @@ -330,11 +330,11 @@ void GLReplay::FillTimersAMD(uint32_t *eventStartID, uint32_t *sampleIndex, } } -vector GLReplay::FetchCountersAMD(const vector &counters) +std::vector GLReplay::FetchCountersAMD(const std::vector &counters) { if(!m_pAMDCounters->BeginMeasurementMode(AMDCounters::ApiType::Ogl, m_ReplayCtx.ctx)) { - return vector(); + return std::vector(); } uint32_t sessionID = m_pAMDCounters->CreateSession(); @@ -355,7 +355,7 @@ vector GLReplay::FetchCountersAMD(const vector &count uint32_t sampleIndex = 0; - vector eventIDs; + std::vector eventIDs; m_pDriver->ReplayMarkers(false); @@ -387,7 +387,7 @@ vector GLReplay::FetchCountersAMD(const vector &count } void GLReplay::FillTimersIntel(uint32_t *eventStartID, uint32_t *sampleIndex, - vector *eventIDs, const DrawcallDescription &drawnode) + std::vector *eventIDs, const DrawcallDescription &drawnode) { if(drawnode.children.empty()) return; @@ -416,7 +416,7 @@ void GLReplay::FillTimersIntel(uint32_t *eventStartID, uint32_t *sampleIndex, } } -vector GLReplay::FetchCountersIntel(const vector &counters) +std::vector GLReplay::FetchCountersIntel(const std::vector &counters) { m_pIntelCounters->DisableAllCounters(); @@ -435,7 +435,7 @@ vector GLReplay::FetchCountersIntel(const vector &cou uint32_t sampleIndex = 0; - vector eventIDs; + std::vector eventIDs; m_pDriver->ReplayMarkers(false); @@ -462,9 +462,9 @@ vector GLReplay::FetchCountersIntel(const vector &cou return ret; } -vector GLReplay::FetchCounters(const vector &allCounters) +std::vector GLReplay::FetchCounters(const std::vector &allCounters) { - vector ret; + std::vector ret; if(allCounters.empty()) { @@ -474,14 +474,14 @@ vector GLReplay::FetchCounters(const vector &allCount MakeCurrentReplayContext(&m_ReplayCtx); - vector counters; + std::vector counters; std::copy_if(allCounters.begin(), allCounters.end(), std::back_inserter(counters), [](const GPUCounter &c) { return IsGenericCounter(c); }); if(m_pAMDCounters) { // Filter out the AMD counters - vector amdCounters; + std::vector amdCounters; std::copy_if(allCounters.begin(), allCounters.end(), std::back_inserter(amdCounters), [](const GPUCounter &c) { return IsAMDCounter(c); }); @@ -494,7 +494,7 @@ vector GLReplay::FetchCounters(const vector &allCount if(m_pIntelCounters) { // Filter out the Intel counters - vector intelCounters; + std::vector intelCounters; std::copy_if(allCounters.begin(), allCounters.end(), std::back_inserter(intelCounters), [](const GPUCounter &c) { return IsIntelCounter(c); }); diff --git a/renderdoc/driver/gl/gl_debug.cpp b/renderdoc/driver/gl/gl_debug.cpp index 531021512..67c361c41 100644 --- a/renderdoc/driver/gl/gl_debug.cpp +++ b/renderdoc/driver/gl/gl_debug.cpp @@ -1498,7 +1498,7 @@ bool GLReplay::GetMinMax(ResourceId texid, uint32_t sliceFace, uint32_t mip, uin bool GLReplay::GetHistogram(ResourceId texid, uint32_t sliceFace, uint32_t mip, uint32_t sample, CompType typeHint, float minval, float maxval, bool channels[4], - vector &histogram) + std::vector &histogram) { if(minval >= maxval || texid == ResourceId()) return false; diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp index bdf785280..fce4bf2ab 100644 --- a/renderdoc/driver/gl/gl_driver.cpp +++ b/renderdoc/driver/gl/gl_driver.cpp @@ -1190,7 +1190,7 @@ void WrappedOpenGL::ActivateContext(GLWindowingData winData) RDCLOG("Activating new GL context: %s / %s / %s", GL.glGetString(eGL_VENDOR), GL.glGetString(eGL_RENDERER), GL.glGetString(eGL_VERSION)); - const vector &globalExts = IsGLES ? m_GLESExtensions : m_GLExtensions; + const std::vector &globalExts = IsGLES ? m_GLESExtensions : m_GLExtensions; if(HasExt[KHR_debug] && GL.glDebugMessageCallback && RenderDoc::Inst().GetCaptureOptions().apiValidation) @@ -1199,7 +1199,7 @@ void WrappedOpenGL::ActivateContext(GLWindowingData winData) GL.glEnable(eGL_DEBUG_OUTPUT_SYNCHRONOUS); } - vector implExts; + std::vector implExts; int ctxVersion = 0; bool ctxGLES = false; @@ -4571,7 +4571,7 @@ ReplayStatus WrappedOpenGL::ContextReplayLog(CaptureState readType, uint32_t sta // we don't have duplicate uses for(auto it = m_ResourceUses.begin(); it != m_ResourceUses.end(); ++it) { - vector &v = it->second; + std::vector &v = it->second; std::sort(v.begin(), v.end()); v.erase(std::unique(v.begin(), v.end()), v.end()); } diff --git a/renderdoc/driver/gl/gl_driver.h b/renderdoc/driver/gl/gl_driver.h index 5e5e3d576..c845cdd05 100644 --- a/renderdoc/driver/gl/gl_driver.h +++ b/renderdoc/driver/gl/gl_driver.h @@ -79,10 +79,10 @@ private: GLPlatform &m_Platform; - vector m_DebugMessages; + std::vector m_DebugMessages; template void Serialise_DebugMessages(SerialiserType &ser); - vector GetDebugMessages(); + std::vector GetDebugMessages(); std::string m_DebugMsgContext; @@ -213,13 +213,13 @@ private: } } - vector m_CapturedFrames; + std::vector m_CapturedFrames; FrameRecord m_FrameRecord; - vector m_Drawcalls; + std::vector m_Drawcalls; // replay - vector m_CurEvents, m_Events; + std::vector m_CurEvents, m_Events; bool m_AddedDrawcall; bool HasNonDebugMarkers(); @@ -238,12 +238,12 @@ private: std::list m_DrawcallStack; - std::map> m_ResourceUses; + std::map> m_ResourceUses; bool m_FetchCounters; // buffer used - vector m_ScratchBuf; + std::vector m_ScratchBuf; struct BufferData { @@ -255,7 +255,7 @@ private: std::map m_Buffers; - vector> m_DependentReplacements; + std::vector> m_DependentReplacements; // this object is only created on old captures where VAO0 was a single global object. In new // captures each context has its own VAO0. @@ -380,7 +380,7 @@ private: float CharAspect; // extensions - vector glExts; + std::vector glExts; std::string glExtsString; // state @@ -479,8 +479,8 @@ private: } }; - vector m_QueuedInitialFetches; - vector m_QueuedReleases; + std::vector m_QueuedInitialFetches; + std::vector m_QueuedReleases; void QueuePrepareInitialState(GLResource res); void QueueResourceRelease(GLResource res); @@ -503,8 +503,8 @@ private: void BuildGLExtensions(); void BuildGLESExtensions(); - vector m_GLExtensions; - vector m_GLESExtensions; + std::vector m_GLExtensions; + std::vector m_GLESExtensions; std::set m_UnsafeDraws; @@ -574,7 +574,7 @@ public: const DrawcallDescription *GetDrawcall(uint32_t eventId); void SuppressDebugMessages(bool suppress) { m_SuppressDebugMessages = suppress; } - vector GetUsage(ResourceId id) { return m_ResourceUses[id]; } + std::vector GetUsage(ResourceId id) { return m_ResourceUses[id]; } void CreateContext(GLWindowingData winData, void *shareContext, GLInitParams initParams, bool core, bool attribsCreate); void RegisterReplayContext(GLWindowingData winData, void *shareContext, bool core, @@ -603,8 +603,8 @@ public: { ShaderData() : type(eGL_NONE), version(0) {} GLenum type; - vector sources; - vector includepaths; + std::vector sources; + std::vector includepaths; SPVModule spirv; std::string disassembly; ShaderReflection reflection; @@ -633,7 +633,7 @@ public: struct ProgramData { ProgramData() : linked(false) { RDCEraseEl(stageShaders); } - vector shaders; + std::vector shaders; std::map locationTranslate; diff --git a/renderdoc/driver/gl/gl_initstate.cpp b/renderdoc/driver/gl/gl_initstate.cpp index ba70c2d04..0c5ab6c60 100644 --- a/renderdoc/driver/gl/gl_initstate.cpp +++ b/renderdoc/driver/gl/gl_initstate.cpp @@ -170,7 +170,7 @@ void DoSerialise(SerialiserType &ser, TextureStateInitialData &el) void WrappedOpenGL::TextureData::GetCompressedImageDataGLES(int mip, GLenum target, size_t size, byte *buf) { - const vector &data = compressedData[mip]; + const std::vector &data = compressedData[mip]; memset(buf, 0, size); @@ -629,7 +629,7 @@ void GLResourceManager::CreateTextureImage(GLuint tex, GLenum internalFormat, { GLsizei compSize = (GLsizei)GetCompressedByteSize(w, h, d, internalFormat); - vector dummy; + std::vector dummy; dummy.resize(compSize); if(dim == 1) diff --git a/renderdoc/driver/gl/gl_overlay.cpp b/renderdoc/driver/gl/gl_overlay.cpp index f6839863f..1004ae43f 100644 --- a/renderdoc/driver/gl/gl_overlay.cpp +++ b/renderdoc/driver/gl/gl_overlay.cpp @@ -184,7 +184,7 @@ void GLReplay::CreateOverlayProgram(GLuint Program, GLuint Pipeline, GLuint frag } ResourceId GLReplay::RenderOverlay(ResourceId texid, CompType typeHint, DebugOverlay overlay, - uint32_t eventId, const vector &passEvents) + uint32_t eventId, const std::vector &passEvents) { WrappedOpenGL &drv = *m_pDriver; @@ -856,7 +856,7 @@ ResourceId GLReplay::RenderOverlay(ResourceId texid, CompType typeHint, DebugOve float col[] = {0.0f, 0.0f, 0.0f, 0.0f}; drv.glClearBufferfv(eGL_COLOR, 0, col); - vector events = passEvents; + std::vector events = passEvents; if(overlay == DebugOverlay::ClearBeforeDraw) events.clear(); @@ -914,7 +914,7 @@ ResourceId GLReplay::RenderOverlay(ResourceId texid, CompType typeHint, DebugOve *v = Vec4f(rs.Viewports[0].width, rs.Viewports[0].height); drv.glUnmapBuffer(eGL_COPY_WRITE_BUFFER); - vector events = passEvents; + std::vector events = passEvents; if(overlay == DebugOverlay::TriangleSizeDraw) events.clear(); @@ -1283,7 +1283,7 @@ ResourceId GLReplay::RenderOverlay(ResourceId texid, CompType typeHint, DebugOve float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; drv.glClearBufferfv(eGL_COLOR, 0, black); - vector events = passEvents; + std::vector events = passEvents; if(overlay == DebugOverlay::QuadOverdrawDraw) events.clear(); diff --git a/renderdoc/driver/gl/gl_postvs.cpp b/renderdoc/driver/gl/gl_postvs.cpp index 8d7f0a2b7..130467003 100644 --- a/renderdoc/driver/gl/gl_postvs.cpp +++ b/renderdoc/driver/gl/gl_postvs.cpp @@ -265,7 +265,7 @@ void GLReplay::InitPostVSBuffers(uint32_t eventId) drv.glAttachShader(feedbackProg, dummyFrag); std::list matrixVaryings; // matrices need some fixup - vector varyings; + std::vector varyings; CopyProgramAttribBindings(stageSrcPrograms[0], feedbackProg, vsRefl); @@ -525,7 +525,7 @@ void GLReplay::InitPostVSBuffers(uint32_t eventId) GetBufferData(idxId, drawcall->indexOffset * drawcall->indexByteWidth, drawcall->numIndices * drawcall->indexByteWidth, idxdata); - vector indices; + std::vector indices; uint8_t *idx8 = (uint8_t *)&idxdata[0]; uint16_t *idx16 = (uint16_t *)&idxdata[0]; @@ -1504,7 +1504,7 @@ void GLReplay::InitPostVSBuffers(uint32_t eventId) drv.glDeleteShader(dummyFrag); } -void GLReplay::InitPostVSBuffers(const vector &passEvents) +void GLReplay::InitPostVSBuffers(const std::vector &passEvents) { uint32_t prev = 0; diff --git a/renderdoc/driver/gl/gl_rendermesh.cpp b/renderdoc/driver/gl/gl_rendermesh.cpp index 254bd0533..abeb0d5e9 100644 --- a/renderdoc/driver/gl/gl_rendermesh.cpp +++ b/renderdoc/driver/gl/gl_rendermesh.cpp @@ -33,7 +33,7 @@ #define OPENGL 1 #include "data/glsl/glsl_ubos_cpp.h" -void GLReplay::RenderMesh(uint32_t eventId, const vector &secondaryDraws, +void GLReplay::RenderMesh(uint32_t eventId, const std::vector &secondaryDraws, const MeshDisplay &cfg) { WrappedOpenGL &drv = *m_pDriver; @@ -518,16 +518,16 @@ void GLReplay::RenderMesh(uint32_t eventId, const vector &secondaryD FloatVector activeVertex; // primitive this vert is a part of (red prim, optional) - vector activePrim; + std::vector activePrim; // for patch lists, to show other verts in patch (green dots, optional) // for non-patch lists, we use the activePrim and adjacentPrimVertices // to show what other verts are related - vector inactiveVertices; + std::vector inactiveVertices; // adjacency (line or tri, strips or lists) (green prims, optional) // will be N*M long, N adjacent prims of M verts each. M = primSize below - vector adjacentPrimVertices; + std::vector adjacentPrimVertices; GLenum primTopo = eGL_TRIANGLES; uint32_t primSize = 3; // number of verts per primitive diff --git a/renderdoc/driver/gl/gl_rendertext.cpp b/renderdoc/driver/gl/gl_rendertext.cpp index e93af8f02..c27e6fe59 100644 --- a/renderdoc/driver/gl/gl_rendertext.cpp +++ b/renderdoc/driver/gl/gl_rendertext.cpp @@ -487,7 +487,7 @@ void WrappedOpenGL::RenderOverlayStr(float x, float y, const char *text) GL.glBindProgramPipeline(0); // draw string (based on sample code from stb_truetype.h) - vector vertices; + std::vector vertices; { y += 1.0f; y *= charPixelHeight; diff --git a/renderdoc/driver/gl/gl_replay.cpp b/renderdoc/driver/gl/gl_replay.cpp index 790243810..b29c754d0 100644 --- a/renderdoc/driver/gl/gl_replay.cpp +++ b/renderdoc/driver/gl/gl_replay.cpp @@ -103,9 +103,9 @@ const SDFile &GLReplay::GetStructuredFile() return m_pDriver->GetStructuredFile(); } -vector GLReplay::GetPassEvents(uint32_t eventId) +std::vector GLReplay::GetPassEvents(uint32_t eventId) { - vector passEvents; + std::vector passEvents; const DrawcallDescription *draw = m_pDriver->GetDrawcall(eventId); @@ -135,9 +135,9 @@ vector GLReplay::GetPassEvents(uint32_t eventId) return passEvents; } -vector GLReplay::GetSupportedWindowSystems() +std::vector GLReplay::GetSupportedWindowSystems() { - vector ret; + std::vector ret; #if ENABLED(RDOC_LINUX) // only Xlib supported for GLX. We can't report XCB here since we need @@ -698,7 +698,7 @@ BufferDescription GLReplay::GetBuffer(ResourceId id) return ret; } -vector GLReplay::GetDebugMessages() +std::vector GLReplay::GetDebugMessages() { return m_pDriver->GetDebugMessages(); } @@ -732,9 +732,9 @@ ShaderReflection *GLReplay::GetShader(ResourceId shader, ShaderEntryPoint entry) return &shaderDetails.reflection; } -vector GLReplay::GetDisassemblyTargets() +std::vector GLReplay::GetDisassemblyTargets() { - vector ret; + std::vector ret; // default is always first ret.insert(ret.begin(), SPIRVDisassemblyTarget); @@ -2081,7 +2081,7 @@ void GLReplay::OpenGLFillCBufferVariables(GLuint prog, bool bufferBacked, std::s } else { - vector elems; + std::vector elems; for(uint32_t a = 0; a < desc.elements; a++) { ShaderVariable el = var; @@ -3055,7 +3055,7 @@ ResourceId GLReplay::CreateProxyTexture(const TextureDescription &templateTex) { GLsizei compSize = (GLsizei)GetCompressedByteSize(w, h, d, intFormat); - vector dummy; + std::vector dummy; dummy.resize(compSize); if(dim == 1) @@ -3341,17 +3341,18 @@ void GLReplay::SetProxyBufferData(ResourceId bufid, byte *data, size_t dataSize) m_pDriver->glNamedBufferSubDataEXT(buf, 0, dataSize, data); } -vector GLReplay::GetUsage(ResourceId id) +std::vector GLReplay::GetUsage(ResourceId id) { return m_pDriver->GetUsage(id); } -vector GLReplay::PixelHistory(vector events, ResourceId target, - uint32_t x, uint32_t y, uint32_t slice, - uint32_t mip, uint32_t sampleIdx, CompType typeHint) +std::vector GLReplay::PixelHistory(std::vector events, + ResourceId target, uint32_t x, uint32_t y, + uint32_t slice, uint32_t mip, + uint32_t sampleIdx, CompType typeHint) { GLNOTIMP("GLReplay::PixelHistory"); - return vector(); + return std::vector(); } ShaderDebugTrace GLReplay::DebugVertex(uint32_t eventId, uint32_t vertid, uint32_t instid, diff --git a/renderdoc/driver/gl/gl_replay.h b/renderdoc/driver/gl/gl_replay.h index 177b5983b..b600c1802 100644 --- a/renderdoc/driver/gl/gl_replay.h +++ b/renderdoc/driver/gl/gl_replay.h @@ -105,13 +105,13 @@ public: rdcarray GetShaderEntryPoints(ResourceId shader); ShaderReflection *GetShader(ResourceId shader, ShaderEntryPoint entry); - vector GetDisassemblyTargets(); + std::vector GetDisassemblyTargets(); std::string DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, const std::string &target); - vector GetDebugMessages(); + std::vector GetDebugMessages(); - vector GetUsage(ResourceId id); + std::vector GetUsage(ResourceId id); FrameRecord GetFrameRecord(); @@ -126,9 +126,9 @@ public: void ReplayLog(uint32_t endEventID, ReplayLogType replayType); const SDFile &GetStructuredFile(); - vector GetPassEvents(uint32_t eventId); + std::vector GetPassEvents(uint32_t eventId); - vector GetSupportedWindowSystems(); + std::vector GetSupportedWindowSystems(); AMDRGPControl *GetRGPControl() { return NULL; } uint64_t MakeOutputWindow(WindowingData window, bool depth); @@ -144,7 +144,7 @@ public: void FlipOutputWindow(uint64_t id); void InitPostVSBuffers(uint32_t eventId); - void InitPostVSBuffers(const vector &passEvents); + void InitPostVSBuffers(const std::vector &passEvents); ResourceId GetLiveID(ResourceId id); @@ -152,7 +152,7 @@ public: CompType typeHint, float *minval, float *maxval); bool GetHistogram(ResourceId texid, uint32_t sliceFace, uint32_t mip, uint32_t sample, CompType typeHint, float minval, float maxval, bool channels[4], - vector &histogram); + std::vector &histogram); MeshFormat GetPostVSBuffers(uint32_t eventId, uint32_t instID, uint32_t viewID, MeshDataStage stage); @@ -164,11 +164,12 @@ public: void ReplaceResource(ResourceId from, ResourceId to); void RemoveReplacement(ResourceId id); - vector EnumerateCounters(); + std::vector EnumerateCounters(); CounterDescription DescribeCounter(GPUCounter counterID); - vector FetchCounters(const vector &counters); + std::vector FetchCounters(const std::vector &counters); - void RenderMesh(uint32_t eventId, const vector &secondaryDraws, const MeshDisplay &cfg); + void RenderMesh(uint32_t eventId, const std::vector &secondaryDraws, + const MeshDisplay &cfg); rdcarray GetTargetShaderEncodings() { return {ShaderEncoding::GLSL}; } void BuildTargetShader(ShaderEncoding sourceEncoding, bytebuf source, std::string entry, @@ -195,9 +196,9 @@ public: void FillCBufferVariables(ResourceId shader, std::string entryPoint, uint32_t cbufSlot, rdcarray &outvars, const bytebuf &data); - vector PixelHistory(vector events, ResourceId target, uint32_t x, - uint32_t y, uint32_t slice, uint32_t mip, - uint32_t sampleIdx, CompType typeHint); + std::vector PixelHistory(std::vector events, ResourceId target, + uint32_t x, uint32_t y, uint32_t slice, uint32_t mip, + uint32_t sampleIdx, CompType typeHint); ShaderDebugTrace DebugVertex(uint32_t eventId, uint32_t vertid, uint32_t instid, uint32_t idx, uint32_t instOffset, uint32_t vertOffset); ShaderDebugTrace DebugPixel(uint32_t eventId, uint32_t x, uint32_t y, uint32_t sample, @@ -210,7 +211,7 @@ public: uint32_t x, uint32_t y); ResourceId RenderOverlay(ResourceId id, CompType typeHint, DebugOverlay overlay, uint32_t eventId, - const vector &passEvents); + const std::vector &passEvents); ResourceId ApplyCustomShader(ResourceId shader, ResourceId texid, uint32_t mip, uint32_t arrayIdx, uint32_t sampleIdx, CompType typeHint); @@ -404,7 +405,7 @@ private: void CheckGLSLVersion(const char *sl, int &glslVersion); void FillTimers(GLCounterContext &ctx, const DrawcallDescription &drawnode, - const vector &counters); + const std::vector &counters); GLuint CreateShader(GLenum shaderType, const std::string &src); GLuint CreateShaderProgram(const std::string &vs, const std::string &fs, @@ -444,16 +445,16 @@ private: // AMD counter instance AMDCounters *m_pAMDCounters = NULL; - void FillTimersAMD(uint32_t *eventStartID, uint32_t *sampleIndex, vector *eventIDs, + void FillTimersAMD(uint32_t *eventStartID, uint32_t *sampleIndex, std::vector *eventIDs, const DrawcallDescription &drawnode); - vector FetchCountersAMD(const vector &counters); + std::vector FetchCountersAMD(const std::vector &counters); // Intel counter instance IntelGlCounters *m_pIntelCounters = NULL; - void FillTimersIntel(uint32_t *eventStartID, uint32_t *sampleIndex, vector *eventIDs, - const DrawcallDescription &drawnode); + void FillTimersIntel(uint32_t *eventStartID, uint32_t *sampleIndex, + std::vector *eventIDs, const DrawcallDescription &drawnode); - vector FetchCountersIntel(const vector &counters); + std::vector FetchCountersIntel(const std::vector &counters); }; diff --git a/renderdoc/driver/gl/gl_shader_refl.cpp b/renderdoc/driver/gl/gl_shader_refl.cpp index 3bcd93825..3186a276a 100644 --- a/renderdoc/driver/gl/gl_shader_refl.cpp +++ b/renderdoc/driver/gl/gl_shader_refl.cpp @@ -179,8 +179,8 @@ static bool iswhitespace(char c) return isspacetab(c) || isnewline(c); } -GLuint MakeSeparableShaderProgram(WrappedOpenGL &drv, GLenum type, vector sources, - vector *includepaths) +GLuint MakeSeparableShaderProgram(WrappedOpenGL &drv, GLenum type, std::vector sources, + std::vector *includepaths) { // in and out blocks are added separately, in case one is there already const char *blockIdentifiers[2] = {"in gl_PerVertex", "out gl_PerVertex"}; @@ -1050,8 +1050,8 @@ int ParseVersionStatement(const char *version) return ret; } -static void AddSigParameter(vector &sigs, uint32_t ®Index, const SigParameter &sig, - const char *nm, int rows, int arrayIdx) +static void AddSigParameter(std::vector &sigs, uint32_t ®Index, + const SigParameter &sig, const char *nm, int rows, int arrayIdx) { if(rows == 1) { @@ -1650,7 +1650,7 @@ void MakeShaderReflection(GLenum shadType, GLuint sepProg, ShaderReflection &ref } } - vector ssbos; + std::vector ssbos; uint32_t ssboMembers = 0; GLint numSSBOs = 0; @@ -1742,7 +1742,7 @@ void MakeShaderReflection(GLenum shadType, GLuint sepProg, ShaderReflection &ref rdcarray globalUniforms; GLint numUBOs = 0; - vector uboNames; + std::vector uboNames; rdcarray *ubos = NULL; { @@ -1821,7 +1821,7 @@ void MakeShaderReflection(GLenum shadType, GLuint sepProg, ShaderReflection &ref if(numInputs > 0) { - vector sigs; + std::vector sigs; sigs.reserve(numInputs); uint32_t regIndex = 0; diff --git a/renderdoc/driver/gl/gl_shader_refl.h b/renderdoc/driver/gl/gl_shader_refl.h index 6a1fc04a7..27f099844 100644 --- a/renderdoc/driver/gl/gl_shader_refl.h +++ b/renderdoc/driver/gl/gl_shader_refl.h @@ -57,6 +57,6 @@ int ParseVersionStatement(const char *version); void MakeShaderReflection(GLenum shadType, GLuint sepProg, ShaderReflection &refl, const FixedFunctionVertexOutputs &outputUsage); GLuint MakeSeparableShaderProgram(WrappedOpenGL &drv, GLenum type, std::vector sources, - vector *includepaths); + std::vector *includepaths); void CheckVertexOutputUses(const std::vector &sources, FixedFunctionVertexOutputs &outputUsage); diff --git a/renderdoc/driver/gl/glx_hooks.cpp b/renderdoc/driver/gl/glx_hooks.cpp index ce74d622d..54b1c9104 100644 --- a/renderdoc/driver/gl/glx_hooks.cpp +++ b/renderdoc/driver/gl/glx_hooks.cpp @@ -145,7 +145,7 @@ HOOK_EXPORT GLXContext glXCreateContextAttribsARB_renderdoc_hooked(Display *dpy, int defaultAttribList[] = {0}; const int *attribs = attribList ? attribList : defaultAttribList; - vector attribVec; + std::vector attribVec; // modify attribs to our liking { diff --git a/renderdoc/driver/gl/wgl_hooks.cpp b/renderdoc/driver/gl/wgl_hooks.cpp index 897199cb4..aa67b4c31 100644 --- a/renderdoc/driver/gl/wgl_hooks.cpp +++ b/renderdoc/driver/gl/wgl_hooks.cpp @@ -280,7 +280,7 @@ static HGLRC WINAPI wglCreateContextAttribsARB_hooked(HDC dc, HGLRC hShareContex int defaultAttribList[] = {0}; const int *attribs = attribList ? attribList : defaultAttribList; - vector attribVec; + std::vector attribVec; // modify attribs to our liking { diff --git a/renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp index e2adfba6a..c5b05df48 100644 --- a/renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp @@ -262,7 +262,7 @@ void WrappedOpenGL::ShaderData::ProcessCompilation(WrappedOpenGL &drv, ResourceI if(reflected) { - vector spirvwords; + std::vector spirvwords; SPIRVCompilationSettings settings(SPIRVSourceLanguage::OpenGLGLSL, SPIRVShaderStage(ShaderIdx(type))); diff --git a/renderdoc/driver/ihv/amd/amd_isa.cpp b/renderdoc/driver/ihv/amd/amd_isa.cpp index dd3bcf76b..654f0bba3 100644 --- a/renderdoc/driver/ihv/amd/amd_isa.cpp +++ b/renderdoc/driver/ihv/amd/amd_isa.cpp @@ -216,14 +216,14 @@ std::string DisassembleSPIRV(ShaderStage stage, const bytebuf &shaderBytes, cons if(amdil) { - vector data; + std::vector data; FileIO::slurp(StringFormat::Fmt("%sout.il", tempPath.c_str()).c_str(), data); ret = std::string(data.data(), data.data() + data.size()); } else { - vector data; + std::vector data; FileIO::slurp(StringFormat::Fmt("%sout.txt", tempPath.c_str()).c_str(), data); ret = std::string(data.data(), data.data() + data.size()); @@ -368,7 +368,7 @@ std::string DisassembleGLSL(ShaderStage stage, const bytebuf &shaderBytes, const std::string ret; { - vector data; + std::vector data; FileIO::slurp(outPath.c_str(), data); ret = std::string(data.data(), data.data() + data.size()); diff --git a/renderdoc/driver/ihv/intel/intel_gl_counters.cpp b/renderdoc/driver/ihv/intel/intel_gl_counters.cpp index bc5770a7f..9c4dc0fbd 100644 --- a/renderdoc/driver/ihv/intel/intel_gl_counters.cpp +++ b/renderdoc/driver/ihv/intel/intel_gl_counters.cpp @@ -48,7 +48,7 @@ IntelGlCounters::~IntelGlCounters() std::vector IntelGlCounters::GetPublicCounterIds() const { - vector counters; + std::vector counters; for(const IntelGlCounter &c : m_Counters) counters.push_back(c.desc.counter); diff --git a/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp b/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp index 7fda8bf65..bc432ea37 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp +++ b/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp @@ -592,7 +592,7 @@ ShaderVariable sub(const ShaderVariable &a, const ShaderVariable &b, const VarTy void State::Init() { - vector indexTempSizes; + std::vector indexTempSizes; for(size_t i = 0; i < dxbc->GetNumDeclarations(); i++) { @@ -1269,7 +1269,7 @@ State State::GetNext(GlobalState &global, State quad[4]) const s.nextInstruction++; s.flags = ShaderEvents::NoEvent; - vector srcOpers; + std::vector srcOpers; size_t numOperands = s.dxbc->NumOperands(op.operation); diff --git a/renderdoc/driver/shaders/dxbc/dxbc_debug.h b/renderdoc/driver/shaders/dxbc/dxbc_debug.h index 7a18cc2ca..a62aa7416 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_debug.h +++ b/renderdoc/driver/shaders/dxbc/dxbc_debug.h @@ -107,7 +107,7 @@ public: bytebuf data; }; - vector groupshared; + std::vector groupshared; struct SampleEvalCacheKey { diff --git a/renderdoc/driver/shaders/dxbc/dxbc_disassemble.cpp b/renderdoc/driver/shaders/dxbc/dxbc_disassemble.cpp index 431e8d75d..958f56a4a 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_disassemble.cpp +++ b/renderdoc/driver/shaders/dxbc/dxbc_disassemble.cpp @@ -893,7 +893,7 @@ std::string ASMOperand::toString(DXBCFile *dxbc, ToString flags) const { uint32_t idx = (uint32_t)indices[0].index; - vector *list = NULL; + std::vector *list = NULL; if(type == TYPE_RESOURCE) list = &dxbc->m_SRVs; diff --git a/renderdoc/driver/shaders/dxbc/dxbc_disassemble.h b/renderdoc/driver/shaders/dxbc/dxbc_disassemble.h index 5a10eaf96..cd2daca61 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_disassemble.h +++ b/renderdoc/driver/shaders/dxbc/dxbc_disassemble.h @@ -31,8 +31,6 @@ #include "api/replay/renderdoc_replay.h" #include "driver/dx/official/d3dcommon.h" -using std::vector; - namespace DXBC { ///////////////////////////////////////////////////////////////////////// @@ -739,8 +737,8 @@ struct ASMOperand // .xyzw = { 0, 1, 2, 3 } // .wzyx = { 3, 2, 1, 0 } - vector indices; // indices for this register. - // 0 means this is a special register, specified by type alone. + std::vector indices; // indices for this register. + // 0 means this is a special register, specified by type alone. // 1 is probably most common. Indicates ASMIndex specifies the register // 2 is for constant buffers, array inputs etc. [0] indicates the cbuffer, [1] indicates the // cbuffer member @@ -855,8 +853,8 @@ struct ASMDecl ASMOperand operand; // many decls use an operand to declare things - vector immediateData; // raw data (like default value of operand) for immediate - // constant buffer decl + std::vector immediateData; // raw data (like default value of operand) for immediate + // constant buffer decl // opcode specific data @@ -988,7 +986,7 @@ struct ASMOperation ResourceRetType resType[4]; // return type (e.g. for a sample operation) uint32_t stride; - vector operands; + std::vector operands; }; }; // DXBC \ No newline at end of file diff --git a/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp b/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp index 600d877f9..e2bb32299 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp +++ b/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp @@ -688,9 +688,9 @@ DXBCFile::DXBCFile(const void *ByteCode, size_t ByteCodeLength) // Note we preserve the arrays in SM5.1 if(h->targetVersion < 0x501) { - for(vector *arr : {&m_SRVs, &m_UAVs, &m_Samplers}) + for(std::vector *arr : {&m_SRVs, &m_UAVs, &m_Samplers}) { - vector &resArray = *arr; + std::vector &resArray = *arr; for(auto it = resArray.begin(); it != resArray.end();) { if(it->bindCount > 1) @@ -893,7 +893,7 @@ DXBCFile::DXBCFile(const void *ByteCode, size_t ByteCodeLength) { SIGNHeader *sign = (SIGNHeader *)fourcc; - vector *sig = NULL; + std::vector *sig = NULL; bool input = false; bool output = false; @@ -1249,7 +1249,7 @@ DXBCFile::DXBCFile(const void *ByteCode, size_t ByteCodeLength) // make a dummy file to write into that won't be used. fileNames.push_back(filename); - fileLines.push_back(vector()); + fileLines.push_back(std::vector()); dstFile = &fileLines.back(); } diff --git a/renderdoc/driver/shaders/dxbc/dxbc_inspect.h b/renderdoc/driver/shaders/dxbc/dxbc_inspect.h index 12af75d8a..7b8f58d88 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_inspect.h +++ b/renderdoc/driver/shaders/dxbc/dxbc_inspect.h @@ -33,8 +33,6 @@ #include "common/common.h" #include "dxbc_disassemble.h" -using std::vector; - // matches D3D11_SHADER_VERSION_TYPE from d3d11shader.h enum D3D11_ShaderType { @@ -262,7 +260,7 @@ struct CBufferVariableType // if a struct, these are variables for each member (this can obviously nest). Not all // elements of the nested member descriptor are valid, as this might not be in a cbuffer, // but might be a loose structure - vector members; + std::vector members; }; struct CBufferVariable @@ -325,7 +323,7 @@ public: virtual uint32_t GetShaderCompileFlags() const = 0; - vector > Files; // + std::vector > Files; // virtual void GetLineInfo(size_t instruction, uintptr_t offset, LineColumnInfo &lineInfo) const = 0; @@ -354,29 +352,29 @@ public: ShaderStatistics m_ShaderStats; DXBCDebugChunk *m_DebugInfo; - vector m_Immediate; + std::vector m_Immediate; bool m_GuessedResources; - vector m_SRVs; - vector m_UAVs; + std::vector m_SRVs; + std::vector m_UAVs; - vector m_Samplers; + std::vector m_Samplers; - vector m_CBuffers; + std::vector m_CBuffers; CBuffer m_Interfaces; std::map m_ResourceBinds; - vector m_InputSig; - vector m_OutputSig; - vector m_PatchConstantSig; + std::vector m_InputSig; + std::vector m_OutputSig; + std::vector m_PatchConstantSig; uint32_t DispatchThreadsDimension[3]; - vector m_HexDump; + std::vector m_HexDump; - vector m_ShaderBlob; + std::vector m_ShaderBlob; const std::string &GetDisassembly() { @@ -419,9 +417,9 @@ private: bool m_Disassembled; - vector + std::vector m_Declarations; // declarations of inputs, outputs, constant buffers, temp registers etc. - vector m_Instructions; + std::vector m_Instructions; std::string m_Disassembly; }; diff --git a/renderdoc/driver/shaders/dxbc/dxbc_reflect.cpp b/renderdoc/driver/shaders/dxbc/dxbc_reflect.cpp index e6c235a75..c58428c72 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_reflect.cpp +++ b/renderdoc/driver/shaders/dxbc/dxbc_reflect.cpp @@ -99,7 +99,8 @@ static ShaderConstant MakeConstantBufferVariable(const DXBC::CBufferVariable &va return ret; } -static void MakeResourceList(bool srv, DXBC::DXBCFile *dxbc, const vector &in, +static void MakeResourceList(bool srv, DXBC::DXBCFile *dxbc, + const std::vector &in, rdcarray &mapping, rdcarray &refl) { for(size_t i = 0; i < in.size(); i++) diff --git a/renderdoc/driver/shaders/dxbc/dxbc_sdbg.cpp b/renderdoc/driver/shaders/dxbc/dxbc_sdbg.cpp index efac8ee06..dfd37f6e2 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_sdbg.cpp +++ b/renderdoc/driver/shaders/dxbc/dxbc_sdbg.cpp @@ -66,15 +66,15 @@ SDBGChunk::SDBGChunk(void *data) SDBGType *Types = (SDBGType *)(dbgPostHeader + m_Header.types.offset); int32_t *Int32DB = (int32_t *)(dbgPostHeader + m_Header.int32DBOffset); - m_FileHeaders = vector(FileHeaders, FileHeaders + m_Header.files.count); + m_FileHeaders = std::vector(FileHeaders, FileHeaders + m_Header.files.count); m_Instructions = - vector(Instructions, Instructions + m_Header.instructions.count); - m_Variables = vector(Variables, Variables + m_Header.variables.count); - m_Inputs = vector(Inputs, Inputs + m_Header.inputRegisters.count); - m_SymbolTable = vector(SymbolTable, SymbolTable + m_Header.symbolTable.count); - m_Scopes = vector(Scopes, Scopes + m_Header.scopes.count); - m_Types = vector(Types, Types + m_Header.types.count); - m_Int32Database = vector( + std::vector(Instructions, Instructions + m_Header.instructions.count); + m_Variables = std::vector(Variables, Variables + m_Header.variables.count); + m_Inputs = std::vector(Inputs, Inputs + m_Header.inputRegisters.count); + m_SymbolTable = std::vector(SymbolTable, SymbolTable + m_Header.symbolTable.count); + m_Scopes = std::vector(Scopes, Scopes + m_Header.scopes.count); + m_Types = std::vector(Types, Types + m_Header.types.count); + m_Int32Database = std::vector( Int32DB, Int32DB + (m_Header.asciiDBOffset - m_Header.int32DBOffset) / sizeof(int32_t)); char *asciiDatabase = dbgPostHeader + m_Header.asciiDBOffset; diff --git a/renderdoc/driver/shaders/dxbc/dxbc_sdbg.h b/renderdoc/driver/shaders/dxbc/dxbc_sdbg.h index b7ff49138..a30daf68c 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_sdbg.h +++ b/renderdoc/driver/shaders/dxbc/dxbc_sdbg.h @@ -27,7 +27,6 @@ #include #include #include -using std::vector; #pragma once @@ -272,13 +271,13 @@ private: std::string GetSymbolName(int symbolID); std::string GetSymbolName(int32_t symbolOffset, int32_t symbolLength); - vector m_Instructions; - vector m_Variables; - vector m_Inputs; - vector m_SymbolTable; - vector m_Scopes; - vector m_Types; - vector m_Int32Database; + std::vector m_Instructions; + std::vector m_Variables; + std::vector m_Inputs; + std::vector m_SymbolTable; + std::vector m_Scopes; + std::vector m_Types; + std::vector m_Int32Database; uint32_t m_ShaderFlags; @@ -289,8 +288,8 @@ private: // these don't need to be exposed, a more processed and friendly // version is exposed SDBGHeader m_Header; - vector m_FileHeaders; + std::vector m_FileHeaders; - vector m_RawData; + std::vector m_RawData; }; }; diff --git a/renderdoc/driver/shaders/dxbc/dxbc_spdb.cpp b/renderdoc/driver/shaders/dxbc/dxbc_spdb.cpp index 6bfe64177..25e29f70d 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_spdb.cpp +++ b/renderdoc/driver/shaders/dxbc/dxbc_spdb.cpp @@ -84,7 +84,7 @@ SPDBChunk::SPDBChunk(DXBCFile *dxbc, void *chunk) PageMapping directoryMapping(pages, header->PageSize, (uint32_t *)rootdirIndices, rootdirCount); const uint32_t *dirContents = (const uint32_t *)directoryMapping.Data(); - vector streams; + std::vector streams; streams.resize(*dirContents); dirContents++; @@ -711,7 +711,7 @@ SPDBChunk::SPDBChunk(DXBCFile *dxbc, void *chunk) } } - vector modules; + std::vector modules; { PageMapping dbiMapping(pages, header->PageSize, &streams[3].pageIndices[0], diff --git a/renderdoc/driver/shaders/dxbc/dxbc_spdb.h b/renderdoc/driver/shaders/dxbc/dxbc_spdb.h index db2fe38ca..b10c1ce69 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_spdb.h +++ b/renderdoc/driver/shaders/dxbc/dxbc_spdb.h @@ -32,8 +32,6 @@ #include #include "dxbc_disassemble.h" -using std::vector; - namespace DXBC { class PageMapping @@ -66,7 +64,7 @@ public: private: const byte *direct; - vector contiguous; + std::vector contiguous; }; struct FileHeaderPage @@ -232,7 +230,7 @@ struct Function struct PDBStream { uint32_t byteLength; - vector pageIndices; + std::vector pageIndices; }; struct LocalRange diff --git a/renderdoc/driver/shaders/spirv/spirv_common.h b/renderdoc/driver/shaders/spirv/spirv_common.h index 0919deb1e..5fafaa1d3 100644 --- a/renderdoc/driver/shaders/spirv/spirv_common.h +++ b/renderdoc/driver/shaders/spirv/spirv_common.h @@ -32,8 +32,6 @@ #include "3rdparty/glslang/glslang/Include/ResourceLimits.h" #include "api/replay/renderdoc_replay.h" -using std::vector; - enum class SPIRVShaderStage { Vertex, @@ -114,7 +112,7 @@ struct SPVModule SPVModule(); ~SPVModule(); - vector spirv; + std::vector spirv; struct { @@ -126,23 +124,23 @@ struct SPVModule uint32_t sourceVer; std::string cmdline; - vector> sourceFiles; + std::vector> sourceFiles; - vector extensions; + std::vector extensions; - vector capabilities; + std::vector capabilities; - vector + std::vector operations; // all operations (including those that don't generate an ID) - vector ids; // pointers indexed by ID + std::vector ids; // pointers indexed by ID - vector sourceexts; // source extensions - vector entries; // entry points - vector globals; // global variables - vector specConstants; // specialization constants - vector funcs; // functions - vector structs; // struct types + std::vector sourceexts; // source extensions + std::vector entries; // entry points + std::vector globals; // global variables + std::vector specConstants; // specialization constants + std::vector funcs; // functions + std::vector structs; // struct types SPVInstruction *GetByID(uint32_t id); std::string Disassemble(const std::string &entryPoint); @@ -156,7 +154,7 @@ struct SPVModule }; std::string CompileSPIRV(const SPIRVCompilationSettings &settings, - const vector &sources, vector &spirv); + const std::vector &sources, std::vector &spirv); void ParseSPIRV(uint32_t *spirv, size_t spirvLength, SPVModule &module); static const uint32_t SpecializationConstantBindSet = 1234567; diff --git a/renderdoc/driver/shaders/spirv/spirv_compile.cpp b/renderdoc/driver/shaders/spirv/spirv_compile.cpp index 28e5c877f..ee0a5c300 100644 --- a/renderdoc/driver/shaders/spirv/spirv_compile.cpp +++ b/renderdoc/driver/shaders/spirv/spirv_compile.cpp @@ -140,7 +140,7 @@ TBuiltInResource DefaultResources = { }; std::string CompileSPIRV(const SPIRVCompilationSettings &settings, - const std::vector &sources, vector &spirv) + const std::vector &sources, std::vector &spirv) { if(settings.stage == SPIRVShaderStage::Invalid) return "Invalid shader stage specified"; diff --git a/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp b/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp index 5d05c68b5..0b2cd74bd 100644 --- a/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp +++ b/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp @@ -418,7 +418,7 @@ struct SPVEntryPoint uint32_t func; spv::ExecutionModel model; std::string name; - vector modes; + std::vector modes; }; struct SPVTypeData @@ -474,7 +474,7 @@ struct SPVTypeData bool IsBasicInt() const { return type == eUInt || type == eSInt; } bool IsScalar() const { return type < eBasicCount && type != eVoid; } - std::string DeclareVariable(const vector &vardecorations, + std::string DeclareVariable(const std::vector &vardecorations, const std::string &varName); const std::string &GetName() @@ -608,11 +608,11 @@ struct SPVTypeData return VarType::Unknown; } - vector *decorations; + std::vector *decorations; // struct/function - vector > children; - vector > childDecorations; // matches children + std::vector > children; + std::vector > childDecorations; // matches children // array SPVConstant *arraySizeConst = NULL; @@ -663,7 +663,7 @@ struct SPVOperation spv::MemorySemanticsMask semantics, semanticsUnequal; // OpExtInst - vector literals; + std::vector literals; // OpFunctionCall uint32_t funcCall; @@ -683,7 +683,7 @@ struct SPVOperation // arguments always reference IDs that already exist (branch/flow // control type statements aren't SPVOperations) - vector arguments; + std::vector arguments; struct { @@ -697,7 +697,7 @@ struct SPVOperation SPVInstruction *minLod; } im; - void GetArg(const vector &ids, size_t idx, std::string &arg, + void GetArg(const std::vector &ids, size_t idx, std::string &arg, bool bracketArgumentsIfNeeded = true); }; @@ -729,7 +729,7 @@ struct SPVConstant SamplerData sampler; }; - vector children; + std::vector children; uint32_t EvaluateIntValue() { @@ -929,16 +929,16 @@ struct SPVFlowControl SPVInstruction *condition; // branch weights or switch cases - vector literals; + std::vector literals; // flow control can reference future IDs, so we index - vector targets; + std::vector targets; }; struct SPVBlock { SPVBlock() : mergeFlow(NULL), exitFlow(NULL) {} - vector instructions; + std::vector instructions; SPVInstruction *mergeFlow; SPVInstruction *exitFlow; @@ -949,12 +949,12 @@ struct SPVFunction SPVFunction() : retType(NULL), funcType(NULL), control(spv::FunctionControlMaskNone) {} SPVTypeData *retType; SPVTypeData *funcType; - vector arguments; + std::vector arguments; spv::FunctionControlMask control; - vector blocks; - vector variables; + std::vector blocks; + std::vector variables; }; struct SPVInstruction @@ -1022,7 +1022,7 @@ struct SPVInstruction return str; } - std::string Disassemble(const vector &ids, bool inlineOp) + std::string Disassemble(const std::vector &ids, bool inlineOp) { switch(opcode) { @@ -2088,7 +2088,7 @@ struct SPVInstruction return ret; } - vector decorations; + std::vector decorations; // zero or one of these pointers might be set SPVExtInstSet *ext; // this ID is an extended instruction set @@ -2102,7 +2102,7 @@ struct SPVInstruction SPVVariable *var; // this ID is a variable }; -std::string SPVTypeData::DeclareVariable(const vector &vardecorations, +std::string SPVTypeData::DeclareVariable(const std::vector &vardecorations, const std::string &varName) { std::string ret = ""; @@ -2178,7 +2178,7 @@ std::string SPVTypeData::DeclareVariable(const vector &vardecorat return ret; } -void SPVOperation::GetArg(const vector &ids, size_t idx, std::string &arg, +void SPVOperation::GetArg(const std::vector &ids, size_t idx, std::string &arg, bool bracketArgumentsIfNeeded) { if(inlineArgs & (1 << idx)) @@ -2550,8 +2550,8 @@ std::string SPVModule::Disassemble(const std::string &entryPoint) OptionalFlagString(func->control).c_str()); // local copy of variables vector - vector vars = func->variables; - vector funcops; + std::vector vars = func->variables; + std::vector funcops; for(size_t b = 0; b < func->blocks.size(); b++) { @@ -2912,7 +2912,7 @@ std::string SPVModule::Disassemble(const std::string &entryPoint) // Branch 123 // Label 123 // that we want to keep, to identify breaks and fallthroughs - vector > switchstack; + std::vector > switchstack; // find redundant branch/label pairs for(size_t l = 0; l < funcops.size() - 1;) @@ -3111,12 +3111,12 @@ std::string SPVModule::Disassemble(const std::string &entryPoint) bool elseif; }; - vector selectionstack; - vector elsestack; + std::vector selectionstack; + std::vector elsestack; - vector loopheadstack; - vector loopstartstack; - vector loopmergestack; + std::vector loopheadstack; + std::vector loopstartstack; + std::vector loopmergestack; std::string funcDisassembly = ""; @@ -3143,8 +3143,8 @@ std::string SPVModule::Disassemble(const std::string &entryPoint) else { SPVInstruction *cond = switchstack.back().second->condition; - vector &targets = switchstack.back().second->targets; - vector &values = switchstack.back().second->literals; + std::vector &targets = switchstack.back().second->targets; + std::vector &values = switchstack.back().second->literals; for(size_t t = 0; t < targets.size(); t++) { if(targets[t] == funcops[o]->id) @@ -3312,7 +3312,7 @@ std::string SPVModule::Disassemble(const std::string &entryPoint) } else { - vector &targets = switchstack.back().second->targets; + std::vector &targets = switchstack.back().second->targets; for(size_t t = 0; t < targets.size(); t++) { if(targets[t] == funcops[o]->flow->targets[0]) @@ -3920,8 +3920,8 @@ typedef bindpair shaderrespair; void AddSignatureParameter(bool isInput, ShaderStage stage, uint32_t id, uint32_t structID, uint32_t ®Index, std::vector accessChain, std::string varName, - SPVTypeData *type, const vector &decorations, - vector &sigarray, SPIRVPatchData &patchData) + SPVTypeData *type, const std::vector &decorations, + std::vector &sigarray, SPIRVPatchData &patchData) { SigParameter sig; @@ -4156,10 +4156,10 @@ void SPVModule::MakeReflection(GraphicsAPI sourceAPI, ShaderStage stage, const std::string &entryPoint, ShaderReflection &reflection, ShaderBindpointMapping &mapping, SPIRVPatchData &patchData) const { - vector inputs; - vector outputs; - vector cblocks; - vector samplers, roresources, rwresources; + std::vector inputs; + std::vector outputs; + std::vector cblocks; + std::vector samplers, roresources, rwresources; // VKTODOLOW filter to only functions/resources used by entryPoint reflection.entryPoint = entryPoint; @@ -4202,7 +4202,7 @@ void SPVModule::MakeReflection(GraphicsAPI sourceAPI, ShaderStage stage, if(inst->var->storage == spv::StorageClassInput || inst->var->storage == spv::StorageClassOutput) { bool isInput = inst->var->storage == spv::StorageClassInput; - vector *sigarray = (isInput ? &inputs : &outputs); + std::vector *sigarray = (isInput ? &inputs : &outputs); std::string nm; // try to use the instance/variable name @@ -4282,7 +4282,7 @@ void SPVModule::MakeReflection(GraphicsAPI sourceAPI, ShaderStage stage, if(inst->var->type->type == SPVTypeData::ePointer && inst->var->type->baseType->type == SPVTypeData::eStruct) { - vector > &childDecorations = + std::vector > &childDecorations = inst->var->type->baseType->childDecorations; for(size_t c = 0; c < childDecorations.size(); c++) @@ -4777,8 +4777,8 @@ void SPVModule::MakeReflection(GraphicsAPI sourceAPI, ShaderStage stage, // sort system value semantics to the start of the list struct sig_param_sort { - sig_param_sort(const vector &arr) : sigArray(arr) {} - const vector &sigArray; + sig_param_sort(const std::vector &arr) : sigArray(arr) {} + const std::vector &sigArray; bool operator()(const size_t idxA, const size_t idxB) { @@ -5270,7 +5270,7 @@ void ParseSPIRV(uint32_t *spirv, size_t spirvLength, SPVModule &module) // names might come later from OpMemberName instructions op.type->children.push_back({memberInst->type, ""}); - op.type->childDecorations.push_back(vector()); + op.type->childDecorations.push_back(std::vector()); } module.structs.push_back(&op); @@ -5352,7 +5352,7 @@ void ParseSPIRV(uint32_t *spirv, size_t spirvLength, SPVModule &module) // function parameters have no name op.type->children.push_back({argInst->type, ""}); - op.type->childDecorations.push_back(vector()); + op.type->childDecorations.push_back(std::vector()); } SPVInstruction *baseTypeInst = module.GetByID(spirv[it + 2]); diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp index d03570d7f..9237ceac9 100644 --- a/renderdoc/driver/vulkan/vk_core.cpp +++ b/renderdoc/driver/vulkan/vk_core.cpp @@ -260,7 +260,7 @@ void WrappedVulkan::SubmitCmds(VkSemaphore *unwrappedWaitSemaphores, if(m_InternalCmds.pendingcmds.empty()) return; - vector cmds = m_InternalCmds.pendingcmds; + std::vector cmds = m_InternalCmds.pendingcmds; for(size_t i = 0; i < cmds.size(); i++) cmds[i] = Unwrap(cmds[i]); @@ -3557,12 +3557,12 @@ void WrappedVulkan::AddDrawcall(const DrawcallDescription &d, bool hasEvents) if(fb != ResourceId() && rp != ResourceId()) { - vector &atts = + std::vector &atts = m_CreationInfo.m_Framebuffer[fb].attachments; RDCASSERT(sp < m_CreationInfo.m_RenderPass[rp].subpasses.size()); - vector &colAtt = m_CreationInfo.m_RenderPass[rp].subpasses[sp].colorAttachments; + std::vector &colAtt = m_CreationInfo.m_RenderPass[rp].subpasses[sp].colorAttachments; int32_t dsAtt = m_CreationInfo.m_RenderPass[rp].subpasses[sp].depthstencilAttachment; RDCASSERT(colAtt.size() <= ARRAY_COUNT(draw.outputs)); @@ -3598,9 +3598,9 @@ void WrappedVulkan::AddDrawcall(const DrawcallDescription &d, bool hasEvents) if(hasEvents) { - vector &srcEvents = m_LastCmdBufferID != ResourceId() - ? m_BakedCmdBufferInfo[m_LastCmdBufferID].curEvents - : m_RootEvents; + std::vector &srcEvents = m_LastCmdBufferID != ResourceId() + ? m_BakedCmdBufferInfo[m_LastCmdBufferID].curEvents + : m_RootEvents; draw.events = srcEvents; srcEvents.clear(); @@ -3624,7 +3624,8 @@ void WrappedVulkan::AddDrawcall(const DrawcallDescription &d, bool hasEvents) RDCERR("Somehow lost drawcall stack!"); } -void WrappedVulkan::AddUsage(VulkanDrawcallTreeNode &drawNode, vector &debugMessages) +void WrappedVulkan::AddUsage(VulkanDrawcallTreeNode &drawNode, + std::vector &debugMessages) { DrawcallDescription &d = drawNode.draw; @@ -3675,7 +3676,7 @@ void WrappedVulkan::AddUsage(VulkanDrawcallTreeNode &drawNode, vectorGetOriginalID(sh.module); // 5 is the compute shader's index (VS, TCS, TES, GS, FS, CS) - const vector &descSets = + const std::vector &descSets = (shad == 5 ? state.computeDescSets : state.graphicsDescSets); RDCASSERT(sh.mapping); diff --git a/renderdoc/driver/vulkan/vk_core.h b/renderdoc/driver/vulkan/vk_core.h index cbf5ccd81..6c59334d4 100644 --- a/renderdoc/driver/vulkan/vk_core.h +++ b/renderdoc/driver/vulkan/vk_core.h @@ -34,8 +34,6 @@ #include "vk_replay.h" #include "vk_state.h" -using std::vector; - class VulkanShaderCache; class VulkanTextRenderer; @@ -97,13 +95,13 @@ struct VulkanDrawcallTreeNode VulkanDrawcallTreeNode() {} explicit VulkanDrawcallTreeNode(const DrawcallDescription &d) : draw(d) {} DrawcallDescription draw; - vector children; + std::vector children; VkIndirectPatchData indirectPatch; - vector> resourceUsage; + std::vector> resourceUsage; - vector executedCmds; + std::vector executedCmds; VulkanDrawcallTreeNode &operator=(const DrawcallDescription &d) { @@ -144,9 +142,9 @@ struct VulkanDrawcallTreeNode children[i].UpdateIDs(baseEventID, baseDrawID); } - vector Bake() + std::vector Bake() { - vector ret; + std::vector ret; if(children.empty()) return ret; @@ -227,7 +225,7 @@ private: ScopedDebugMessageSink(WrappedVulkan *driver); ~ScopedDebugMessageSink(); - vector msgs; + std::vector msgs; WrappedVulkan *m_pDriver; }; @@ -270,7 +268,7 @@ private: size_t size; }; Threading::CriticalSection m_ThreadTempMemLock; - vector m_ThreadTempMem; + std::vector m_ThreadTempMem; VulkanReplay m_Replay; @@ -291,7 +289,7 @@ private: // by queue submit order anyway, so it's OK to lose the record // order). Threading::CriticalSection m_CmdBufferRecordsLock; - vector m_CmdBufferRecords; + std::vector m_CmdBufferRecords; VulkanResourceManager *m_ResourceManager = NULL; VulkanDebugManager *m_DebugManager = NULL; @@ -320,13 +318,13 @@ private: uint32_t HandlePreCallback(VkCommandBuffer commandBuffer, DrawFlags type = DrawFlags::Drawcall, uint32_t multiDrawOffset = 0); - vector m_SupportedWindowSystems; + std::vector m_SupportedWindowSystems; uint32_t m_FrameCounter; - vector m_CapturedFrames; + std::vector m_CapturedFrames; FrameRecord m_FrameRecord; - vector m_Drawcalls; + std::vector m_Drawcalls; struct PhysicalDeviceData { @@ -385,14 +383,14 @@ private: // the physical devices. At capture time this is trivial, just the enumerated devices. // At replay time this is re-ordered from the real list to try and match - vector m_PhysicalDevices; + std::vector m_PhysicalDevices; // replay only, information we need for remapping. The original vector keeps information about the // physical devices used at capture time, and the replay vector contains the real unmodified list // of physical devices at replay time. - vector m_OriginalPhysicalDevices; - vector m_ReplayPhysicalDevices; - vector m_ReplayPhysicalDevicesUsed; + std::vector m_OriginalPhysicalDevices; + std::vector m_ReplayPhysicalDevices; + std::vector m_ReplayPhysicalDevicesUsed; // the queue families (an array of count for each) for the created device std::vector m_QueueFamilies; @@ -407,7 +405,7 @@ private: VkCommandPool pool = VK_NULL_HANDLE; VkCommandBuffer buffer = VK_NULL_HANDLE; }; - vector m_ExternalQueues; + std::vector m_ExternalQueues; VkCommandBuffer GetExtQueueCmd(uint32_t queueFamilyIdx); void SubmitAndFlushExtQueue(uint32_t queueFamilyIdx); @@ -423,7 +421,7 @@ private: // (targetQueueFamily << 32) | (targetQueueIndex) std::vector m_QueueRemapping[16]; - vector m_MemIdxMaps; + std::vector m_MemIdxMaps; void RemapMemoryIndices(VkPhysicalDeviceMemoryProperties *memProps, uint32_t **memIdxMap); void WrapAndProcessCreatedSwapchain(VkDevice device, const VkSwapchainCreateInfoKHR *pCreateInfo, @@ -450,18 +448,18 @@ private: VkCommandPool cmdpool; // the command pool used for allocating our own command buffers - vector freecmds; + std::vector freecmds; // -> GetNextCmd() -> - vector pendingcmds; + std::vector pendingcmds; // -> SubmitCmds() -> - vector submittedcmds; + std::vector submittedcmds; // -> FlushQ() ------back to freecmds------^ - vector freesems; + std::vector freesems; // -> GetNextSemaphore() -> - vector pendingsems; + std::vector pendingsems; // -> SubmitSemaphores() -> - vector submittedsems; + std::vector submittedsems; // -> FlushQ() ----back to freesems-------^ } m_InternalCmds; @@ -485,8 +483,8 @@ private: MemoryAllocation AllocateMemoryForResource(bool buffer, VkMemoryRequirements mrq, MemoryScope scope, MemoryType type); - vector m_CleanupEvents; - vector m_PersistentEvents; + std::vector m_CleanupEvents; + std::vector m_PersistentEvents; const VkFormatProperties &GetFormatProperties(VkFormat f) { @@ -507,8 +505,8 @@ private: { } ~BakedCmdBufferInfo() { SAFE_DELETE(draw); } - vector curEvents; - vector debugMessages; + std::vector curEvents; + std::vector debugMessages; std::list drawStack; std::vector indirectCopies; @@ -588,7 +586,7 @@ private: return eventId < o.eventId; } }; - vector m_DrawcallUses; + std::vector m_DrawcallUses; enum PartialReplayIndex { @@ -677,7 +675,7 @@ private: DescriptorSetInfo(bool p = false) : push(p) {} ~DescriptorSetInfo() { clear(); } ResourceId layout; - vector currentBindings; + std::vector currentBindings; bool push; void clear() @@ -695,7 +693,7 @@ private: ResourceId m_LastSwap; // holds the current list of coherent mapped memory. Locked against concurrent use - vector m_CoherentMaps; + std::vector m_CoherentMaps; Threading::CriticalSection m_CoherentMapsLock; std::map m_ForcedReferences; @@ -757,7 +755,7 @@ private: // immutable creation data VulkanCreationInfo m_CreationInfo; - std::map> m_ResourceUses; + std::map> m_ResourceUses; // returns thread-local temporary memory byte *GetTempMemory(size_t s); @@ -836,7 +834,7 @@ private: void ApplyInitialContents(); - vector m_RootEvents, m_Events; + std::vector m_RootEvents, m_Events; bool m_AddedDrawcall; uint64_t m_CurChunkOffset; @@ -852,7 +850,7 @@ private: bool m_LayersEnabled[VkCheckLayer_Max] = {}; // in vk_.cpp - void AddRequiredExtensions(bool instance, vector &extensionList, + void AddRequiredExtensions(bool instance, std::vector &extensionList, const std::set &supportedExtensions); bool PatchIndirectDraw(VkIndirectPatchType type, DrawcallDescription &draw, byte *&argptr, @@ -876,7 +874,7 @@ private: void AddDrawcall(const DrawcallDescription &d, bool hasEvents); void AddEvent(); - void AddUsage(VulkanDrawcallTreeNode &drawNode, vector &debugMessages); + void AddUsage(VulkanDrawcallTreeNode &drawNode, std::vector &debugMessages); void AddFramebufferUsage(VulkanDrawcallTreeNode &drawNode, ResourceId renderPass, ResourceId framebuffer, uint32_t subpass); void AddFramebufferUsageAllChildren(VulkanDrawcallTreeNode &drawNode, ResourceId renderPass, @@ -953,7 +951,7 @@ public: uint32_t GetUploadMemoryIndex(uint32_t resourceRequiredBitmask); uint32_t GetGPULocalMemoryIndex(uint32_t resourceRequiredBitmask); - vector GetUsage(ResourceId id) { return m_ResourceUses[id]; } + std::vector GetUsage(ResourceId id) { return m_ResourceUses[id]; } // return the pre-selected device and queue VkDevice GetDev() { diff --git a/renderdoc/driver/vulkan/vk_counters.cpp b/renderdoc/driver/vulkan/vk_counters.cpp index 2c55a30a4..2441f1efa 100644 --- a/renderdoc/driver/vulkan/vk_counters.cpp +++ b/renderdoc/driver/vulkan/vk_counters.cpp @@ -31,9 +31,9 @@ #include "driver/ihv/amd/amd_counters.h" #include "driver/ihv/amd/official/GPUPerfAPI/Include/GPUPerfAPI-VK.h" -vector VulkanReplay::EnumerateCounters() +std::vector VulkanReplay::EnumerateCounters() { - vector ret; + std::vector ret; VkPhysicalDeviceFeatures availableFeatures = m_pDriver->GetDeviceFeatures(); @@ -62,7 +62,7 @@ vector VulkanReplay::EnumerateCounters() if(m_pAMDCounters) { - vector amdCounters = m_pAMDCounters->GetPublicCounterIds(); + std::vector amdCounters = m_pAMDCounters->GetPublicCounterIds(); ret.insert(ret.end(), amdCounters.begin(), amdCounters.end()); } @@ -202,7 +202,7 @@ CounterDescription VulkanReplay::DescribeCounter(GPUCounter counterID) struct VulkanAMDDrawCallback : public VulkanDrawcallCallback { VulkanAMDDrawCallback(WrappedVulkan *dev, VulkanReplay *rp, uint32_t &sampleIndex, - vector &eventIDs) + std::vector &eventIDs) : m_pDriver(dev), m_pReplay(rp), m_pSampleId(&sampleIndex), m_pEventIds(&eventIDs) { m_pDriver->SetDrawcallCB(this); @@ -271,17 +271,17 @@ struct VulkanAMDDrawCallback : public VulkanDrawcallCallback uint32_t *m_pSampleId; WrappedVulkan *m_pDriver; VulkanReplay *m_pReplay; - vector *m_pEventIds; + std::vector *m_pEventIds; 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 // we'll just be told which other EIDs alias this event. - vector > m_AliasEvents; + std::vector > m_AliasEvents; }; void VulkanReplay::FillTimersAMD(uint32_t *eventStartID, uint32_t *sampleIndex, - vector *eventIDs) + std::vector *eventIDs) { uint32_t maxEID = m_pDriver->GetMaxEID(); @@ -291,14 +291,14 @@ void VulkanReplay::FillTimersAMD(uint32_t *eventStartID, uint32_t *sampleIndex, m_pDriver->ReplayLog(*eventStartID, maxEID, eReplay_Full); } -vector VulkanReplay::FetchCountersAMD(const vector &counters) +std::vector VulkanReplay::FetchCountersAMD(const std::vector &counters) { GPA_vkContextOpenInfo context = {Unwrap(m_pDriver->GetInstance()), Unwrap(m_pDriver->GetPhysDev()), Unwrap(m_pDriver->GetDev())}; if(!m_pAMDCounters->BeginMeasurementMode(AMDCounters::ApiType::Vk, (void *)&context)) { - return vector(); + return std::vector(); } uint32_t sessionID = m_pAMDCounters->CreateSession(); @@ -319,7 +319,7 @@ vector VulkanReplay::FetchCountersAMD(const vector &c uint32_t sampleIndex = 0; - vector eventIDs; + std::vector eventIDs; for(uint32_t i = 0; i < passCount; i++) { @@ -437,28 +437,28 @@ struct VulkanGPUTimerCallback : public VulkanDrawcallCallback VkQueryPool m_TimeStampQueryPool; VkQueryPool m_OcclusionQueryPool; VkQueryPool m_PipeStatsQueryPool; - vector m_Results; + std::vector m_Results; // 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 // we'll just be told which other EIDs alias this event. - vector > m_AliasEvents; + std::vector > m_AliasEvents; }; -vector VulkanReplay::FetchCounters(const vector &counters) +std::vector VulkanReplay::FetchCounters(const std::vector &counters) { uint32_t maxEID = m_pDriver->GetMaxEID(); - vector vkCounters; + std::vector vkCounters; std::copy_if(counters.begin(), counters.end(), std::back_inserter(vkCounters), [](const GPUCounter &c) { return IsGenericCounter(c); }); - vector ret; + std::vector ret; if(m_pAMDCounters) { // Filter out the AMD counters - vector amdCounters; + std::vector amdCounters; std::copy_if(counters.begin(), counters.end(), std::back_inserter(amdCounters), [](const GPUCounter &c) { return IsAMDCounter(c); }); @@ -568,7 +568,7 @@ vector VulkanReplay::FetchCounters(const vector &coun // replay the events to perform all the queries m_pDriver->ReplayLog(0, maxEID, eReplay_Full); - vector m_TimeStampData; + std::vector m_TimeStampData; m_TimeStampData.resize(cb.m_Results.size() * 2); vkr = ObjDisp(dev)->GetQueryPoolResults( @@ -579,7 +579,7 @@ vector VulkanReplay::FetchCounters(const vector &coun ObjDisp(dev)->DestroyQueryPool(Unwrap(dev), timeStampPool, NULL); - vector m_OcclusionData; + std::vector m_OcclusionData; m_OcclusionData.resize(cb.m_Results.size()); if(occlusionPool != VK_NULL_HANDLE) { @@ -592,7 +592,7 @@ vector VulkanReplay::FetchCounters(const vector &coun ObjDisp(dev)->DestroyQueryPool(Unwrap(dev), occlusionPool, NULL); } - vector m_PipeStatsData; + std::vector m_PipeStatsData; m_PipeStatsData.resize(cb.m_Results.size() * 11); if(pipeStatsPool != VK_NULL_HANDLE) { diff --git a/renderdoc/driver/vulkan/vk_info.h b/renderdoc/driver/vulkan/vk_info.h index 13e2afc92..dff693511 100644 --- a/renderdoc/driver/vulkan/vk_info.h +++ b/renderdoc/driver/vulkan/vk_info.h @@ -94,7 +94,7 @@ struct DescSetLayout VkShaderStageFlags stageFlags; ResourceId *immutableSampler; }; - vector bindings; + std::vector bindings; uint32_t dynamicCount; VkDescriptorSetLayoutCreateFlags flags; @@ -162,7 +162,7 @@ struct VulkanCreationInfo ShaderBindpointMapping *mapping; SPIRVPatchData *patchData; - vector specialization; + std::vector specialization; }; Shader shaders[6]; @@ -176,7 +176,7 @@ struct VulkanCreationInfo // VkVertexInputBindingDivisorDescriptionEXT uint32_t instanceDivisor; }; - vector vertexBindings; + std::vector vertexBindings; struct Attribute { @@ -185,7 +185,7 @@ struct VulkanCreationInfo VkFormat format; uint32_t byteoffset; }; - vector vertexAttrs; + std::vector vertexAttrs; // VkPipelineInputAssemblyStateCreateInfo VkPrimitiveTopology topology; @@ -199,8 +199,8 @@ struct VulkanCreationInfo // VkPipelineViewportStateCreateInfo uint32_t viewportCount; - vector viewports; - vector scissors; + std::vector viewports; + std::vector scissors; // VkPipelineRasterizationStateCreateInfo bool depthClampEnable; @@ -269,7 +269,7 @@ struct VulkanCreationInfo uint8_t channelWriteMask; }; - vector attachments; + std::vector attachments; // VkPipelineDynamicStateCreateInfo bool dynamicStates[VkDynamicCount]; @@ -285,8 +285,8 @@ struct VulkanCreationInfo void Init(VulkanResourceManager *resourceMan, VulkanCreationInfo &info, const VkPipelineLayoutCreateInfo *pCreateInfo); - vector pushRanges; - vector descSetLayouts; + std::vector pushRanges; + std::vector descSetLayouts; }; std::map m_PipelineLayout; @@ -310,30 +310,30 @@ struct VulkanCreationInfo VkImageLayout finalLayout; }; - vector attachments; + std::vector attachments; struct Subpass { // these are split apart since they layout is // rarely used but the indices are often used - vector inputAttachments; - vector colorAttachments; - vector resolveAttachments; + std::vector inputAttachments; + std::vector colorAttachments; + std::vector resolveAttachments; int32_t depthstencilAttachment; int32_t fragmentDensityAttachment; - vector inputLayouts; - vector colorLayouts; + std::vector inputLayouts; + std::vector colorLayouts; VkImageLayout depthstencilLayout; VkImageLayout fragmentDensityLayout; std::vector multiviews; }; - vector subpasses; + std::vector subpasses; // one for each subpass, as we preserve attachments // in the layout that the subpass uses - vector loadRPs; + std::vector loadRPs; }; std::map m_RenderPass; @@ -347,12 +347,12 @@ struct VulkanCreationInfo ResourceId view; VkFormat format; }; - vector attachments; + std::vector attachments; uint32_t width, height, layers; // See above in loadRPs - we need to duplicate and make framebuffer equivalents for each - vector loadFBs; + std::vector loadFBs; }; std::map m_Framebuffer; diff --git a/renderdoc/driver/vulkan/vk_initstate.cpp b/renderdoc/driver/vulkan/vk_initstate.cpp index fd1192f7e..b74f49c22 100644 --- a/renderdoc/driver/vulkan/vk_initstate.cpp +++ b/renderdoc/driver/vulkan/vk_initstate.cpp @@ -1320,7 +1320,7 @@ void WrappedVulkan::Apply_InitialState(WrappedVkRes *live, const VkInitialConten // need to blat over the current descriptor set contents, so these are available // when we want to fetch pipeline state - vector &bindings = m_DescriptorSetState[id].currentBindings; + std::vector &bindings = m_DescriptorSetState[id].currentBindings; for(uint32_t i = 0; i < initial.numDescriptors; i++) { diff --git a/renderdoc/driver/vulkan/vk_manager.cpp b/renderdoc/driver/vulkan/vk_manager.cpp index d06f4a661..747bd4b06 100644 --- a/renderdoc/driver/vulkan/vk_manager.cpp +++ b/renderdoc/driver/vulkan/vk_manager.cpp @@ -33,9 +33,9 @@ #endif template -void VulkanResourceManager::RecordSingleBarrier(vector > &dststates, - ResourceId id, const SrcBarrierType &t, - uint32_t nummips, uint32_t numslices) +void VulkanResourceManager::RecordSingleBarrier( + std::vector > &dststates, ResourceId id, + const SrcBarrierType &t, uint32_t nummips, uint32_t numslices) { bool done = false; @@ -184,7 +184,7 @@ void VulkanResourceManager::RecordSingleBarrier(vector > &states, +void VulkanResourceManager::RecordBarriers(std::vector > &states, const std::map &layouts, uint32_t numBarriers, const VkImageMemoryBarrier *barriers) { @@ -229,8 +229,9 @@ void VulkanResourceManager::RecordBarriers(vector > &dststates, - vector > &srcstates) +void VulkanResourceManager::MergeBarriers( + std::vector > &dststates, + std::vector > &srcstates) { TRDBG("Merging %u states", (uint32_t)srcstates.size()); @@ -466,7 +467,7 @@ void VulkanResourceManager::SetInternalResource(ResourceId id) } void VulkanResourceManager::ApplyBarriers(uint32_t queueFamilyIndex, - vector > &states, + std::vector > &states, std::map &layouts) { TRDBG("Applying %u barriers", (uint32_t)states.size()); diff --git a/renderdoc/driver/vulkan/vk_manager.h b/renderdoc/driver/vulkan/vk_manager.h index 05358555b..398568248 100644 --- a/renderdoc/driver/vulkan/vk_manager.h +++ b/renderdoc/driver/vulkan/vk_manager.h @@ -252,18 +252,18 @@ public: // handling memory & image layouts template - void RecordSingleBarrier(vector > &states, ResourceId id, + void RecordSingleBarrier(std::vector > &states, ResourceId id, const SrcBarrierType &t, uint32_t nummips, uint32_t numslices); - void RecordBarriers(vector > &states, + void RecordBarriers(std::vector > &states, const std::map &layouts, uint32_t numBarriers, const VkImageMemoryBarrier *barriers); - void MergeBarriers(vector > &dststates, - vector > &srcstates); + void MergeBarriers(std::vector > &dststates, + std::vector > &srcstates); void ApplyBarriers(uint32_t queueFamilyIndex, - vector > &states, + std::vector > &states, std::map &layouts); template diff --git a/renderdoc/driver/vulkan/vk_outputwindow.cpp b/renderdoc/driver/vulkan/vk_outputwindow.cpp index db8935199..86cc91a16 100644 --- a/renderdoc/driver/vulkan/vk_outputwindow.cpp +++ b/renderdoc/driver/vulkan/vk_outputwindow.cpp @@ -1187,7 +1187,7 @@ void VulkanReplay::DestroyOutputWindow(uint64_t id) m_OutputWindows.erase(it); } -vector VulkanReplay::GetSupportedWindowSystems() +std::vector VulkanReplay::GetSupportedWindowSystems() { return m_pDriver->m_SupportedWindowSystems; } diff --git a/renderdoc/driver/vulkan/vk_overlay.cpp b/renderdoc/driver/vulkan/vk_overlay.cpp index 12ffbe9ee..dccb4bfa4 100644 --- a/renderdoc/driver/vulkan/vk_overlay.cpp +++ b/renderdoc/driver/vulkan/vk_overlay.cpp @@ -40,7 +40,7 @@ struct VulkanQuadOverdrawCallback : public VulkanDrawcallCallback { VulkanQuadOverdrawCallback(WrappedVulkan *vk, VkDescriptorSetLayout descSetLayout, - VkDescriptorSet descSet, const vector &events) + VkDescriptorSet descSet, const std::vector &events) : m_pDriver(vk), m_DescSetLayout(descSetLayout), m_DescSet(descSet), @@ -88,7 +88,7 @@ struct VulkanQuadOverdrawCallback : public VulkanDrawcallCallback // this layout has storage image and descSetLayouts[descSet] = m_DescSetLayout; - const vector &push = c.m_PipelineLayout[p.layout].pushRanges; + const std::vector &push = c.m_PipelineLayout[p.layout].pushRanges; VkPipelineLayoutCreateInfo pipeLayoutInfo = { VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO, @@ -263,7 +263,7 @@ struct VulkanQuadOverdrawCallback : public VulkanDrawcallCallback WrappedVulkan *m_pDriver; VkDescriptorSetLayout m_DescSetLayout; VkDescriptorSet m_DescSet; - const vector &m_Events; + const std::vector &m_Events; // cache modified pipelines std::map > m_PipelineCache; @@ -1538,7 +1538,7 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, CompType typeHint, Debu DoPipelineBarrier(cmd, 1, &barrier); - vector events = passEvents; + std::vector events = passEvents; if(overlay == DebugOverlay::ClearBeforeDraw) events.clear(); @@ -1590,7 +1590,7 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, CompType typeHint, Debu m_pDriver->m_RenderState.BeginRenderPassAndApplyState(cmd, VulkanRenderState::BindGraphics); VkClearAttachment blackclear = {VK_IMAGE_ASPECT_COLOR_BIT, 0, {}}; - vector atts; + std::vector atts; VulkanCreationInfo::Framebuffer &fb = m_pDriver->m_CreationInfo.m_Framebuffer[m_pDriver->m_RenderState.framebuffer]; @@ -1662,7 +1662,7 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, CompType typeHint, Debu DoPipelineBarrier(cmd, 1, &barrier); - vector events = passEvents; + std::vector events = passEvents; if(overlay == DebugOverlay::QuadOverdrawDraw) events.clear(); @@ -1906,7 +1906,7 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, CompType typeHint, Debu m_pDriver->SubmitCmds(); #endif - vector events = passEvents; + std::vector events = passEvents; if(overlay == DebugOverlay::TriangleSizeDraw) events.clear(); diff --git a/renderdoc/driver/vulkan/vk_posix.cpp b/renderdoc/driver/vulkan/vk_posix.cpp index c0e411f8e..ba7863481 100644 --- a/renderdoc/driver/vulkan/vk_posix.cpp +++ b/renderdoc/driver/vulkan/vk_posix.cpp @@ -44,7 +44,7 @@ bool VulkanReplay::IsOutputWindowVisible(uint64_t id) return true; } -void WrappedVulkan::AddRequiredExtensions(bool instance, vector &extensionList, +void WrappedVulkan::AddRequiredExtensions(bool instance, std::vector &extensionList, const std::set &supportedExtensions) { bool device = !instance; diff --git a/renderdoc/driver/vulkan/vk_postvs.cpp b/renderdoc/driver/vulkan/vk_postvs.cpp index 885d82c08..9726d3ab1 100644 --- a/renderdoc/driver/vulkan/vk_postvs.cpp +++ b/renderdoc/driver/vulkan/vk_postvs.cpp @@ -1979,7 +1979,7 @@ void VulkanReplay::FetchVSOut(uint32_t eventId) } uint32_t bufStride = 0; - vector modSpirv = moduleInfo.spirv.spirv; + std::vector modSpirv = moduleInfo.spirv.spirv; struct CompactedAttrBuffer { @@ -3287,7 +3287,7 @@ void VulkanReplay::InitPostVSBuffers(uint32_t eventId) struct VulkanInitPostVSCallback : public VulkanDrawcallCallback { - VulkanInitPostVSCallback(WrappedVulkan *vk, const vector &events) + VulkanInitPostVSCallback(WrappedVulkan *vk, const std::vector &events) : m_pDriver(vk), m_Events(events) { m_pDriver->SetDrawcallCB(this); @@ -3320,7 +3320,7 @@ struct VulkanInitPostVSCallback : public VulkanDrawcallCallback const std::vector &m_Events; }; -void VulkanReplay::InitPostVSBuffers(const vector &events) +void VulkanReplay::InitPostVSBuffers(const std::vector &events) { // first we must replay up to the first event without replaying it. This ensures any // non-command buffer calls like memory unmaps etc all happen correctly before this diff --git a/renderdoc/driver/vulkan/vk_rendermesh.cpp b/renderdoc/driver/vulkan/vk_rendermesh.cpp index f0f50b7bc..231b7211f 100644 --- a/renderdoc/driver/vulkan/vk_rendermesh.cpp +++ b/renderdoc/driver/vulkan/vk_rendermesh.cpp @@ -356,7 +356,7 @@ MeshDisplayPipelines VulkanDebugManager::CacheMeshDisplayPipelines(VkPipelineLay return cache; } -void VulkanReplay::RenderMesh(uint32_t eventId, const vector &secondaryDraws, +void VulkanReplay::RenderMesh(uint32_t eventId, const std::vector &secondaryDraws, const MeshDisplay &cfg) { if(cfg.position.vertexResourceId == ResourceId() || cfg.position.numIndices == 0) @@ -881,16 +881,16 @@ void VulkanReplay::RenderMesh(uint32_t eventId, const vector &second FloatVector activeVertex; // primitive this vert is a part of (red prim, optional) - vector activePrim; + std::vector activePrim; // for patch lists, to show other verts in patch (green dots, optional) // for non-patch lists, we use the activePrim and adjacentPrimVertices // to show what other verts are related - vector inactiveVertices; + std::vector inactiveVertices; // adjacency (line or tri, strips or lists) (green prims, optional) // will be N*M long, N adjacent prims of M verts each. M = primSize below - vector adjacentPrimVertices; + std::vector adjacentPrimVertices; helper.topology = Topology::TriangleList; uint32_t primSize = 3; // number of verts per primitive diff --git a/renderdoc/driver/vulkan/vk_rendertexture.cpp b/renderdoc/driver/vulkan/vk_rendertexture.cpp index c75104991..50e86db30 100644 --- a/renderdoc/driver/vulkan/vk_rendertexture.cpp +++ b/renderdoc/driver/vulkan/vk_rendertexture.cpp @@ -444,7 +444,7 @@ bool VulkanReplay::RenderTextureInternal(TextureDisplay cfg, VkRenderPassBeginIn VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, NULL, &heatubodesc, NULL}, }; - vector writeSets; + std::vector writeSets; for(size_t i = 0; i < ARRAY_COUNT(writeSet); i++) { if(writeSet[i].descriptorCount > 0) diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp index 60a7a8aa0..e4ff774a5 100644 --- a/renderdoc/driver/vulkan/vk_replay.cpp +++ b/renderdoc/driver/vulkan/vk_replay.cpp @@ -106,9 +106,9 @@ const SDFile &VulkanReplay::GetStructuredFile() return m_pDriver->GetStructuredFile(); } -vector VulkanReplay::GetPassEvents(uint32_t eventId) +std::vector VulkanReplay::GetPassEvents(uint32_t eventId) { - vector passEvents; + std::vector passEvents; const DrawcallDescription *draw = m_pDriver->GetDrawcall(eventId); @@ -179,7 +179,7 @@ FrameRecord VulkanReplay::GetFrameRecord() return m_pDriver->GetFrameRecord(); } -vector VulkanReplay::GetDebugMessages() +std::vector VulkanReplay::GetDebugMessages() { return m_pDriver->GetDebugMessages(); } @@ -345,9 +345,9 @@ ShaderReflection *VulkanReplay::GetShader(ResourceId shader, ShaderEntryPoint en return &shad->second.m_Reflections[entry.name].refl; } -vector VulkanReplay::GetDisassemblyTargets() +std::vector VulkanReplay::GetDisassemblyTargets() { - vector ret; + std::vector ret; VkDevice dev = m_pDriver->GetDev(); const VkLayerDispatchTable *vt = ObjDisp(dev); @@ -1946,7 +1946,7 @@ bool VulkanReplay::GetMinMax(ResourceId texid, uint32_t sliceFace, uint32_t mip, 0, 1, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, NULL, &bufdescs[2], NULL}, }; - vector writeSets; + std::vector writeSets; for(size_t i = 0; i < ARRAY_COUNT(writeSet); i++) { if(writeSet[i].descriptorCount > 0) @@ -2131,7 +2131,7 @@ bool VulkanReplay::GetMinMax(ResourceId texid, uint32_t sliceFace, uint32_t mip, bool VulkanReplay::GetHistogram(ResourceId texid, uint32_t sliceFace, uint32_t mip, uint32_t sample, CompType typeHint, float minval, float maxval, bool channels[4], - vector &histogram) + std::vector &histogram) { if(minval >= maxval) return false; @@ -2261,7 +2261,7 @@ bool VulkanReplay::GetHistogram(ResourceId texid, uint32_t sliceFace, uint32_t m altimdesc, NULL, NULL}, }; - vector writeSets; + std::vector writeSets; for(size_t i = 0; i < ARRAY_COUNT(writeSet); i++) { if(writeSet[i].descriptorCount > 0) @@ -2439,7 +2439,7 @@ bool VulkanReplay::GetHistogram(ResourceId texid, uint32_t sliceFace, uint32_t m return true; } -vector VulkanReplay::GetUsage(ResourceId id) +std::vector VulkanReplay::GetUsage(ResourceId id) { return m_pDriver->GetUsage(id); } @@ -3454,9 +3454,9 @@ void VulkanReplay::BuildCustomShader(std::string source, std::string entry, return; } - vector sources; + std::vector sources; sources.push_back(source); - vector spirv; + std::vector spirv; SPIRVCompilationSettings settings(SPIRVSourceLanguage::VulkanGLSL, stage); @@ -3552,7 +3552,7 @@ void VulkanReplay::BuildTargetShader(ShaderEncoding sourceEncoding, bytebuf sour std::string entry, const ShaderCompileFlags &compileFlags, ShaderStage type, ResourceId *id, std::string *errors) { - vector spirv; + std::vector spirv; if(sourceEncoding == ShaderEncoding::GLSL) { @@ -3572,7 +3572,7 @@ void VulkanReplay::BuildTargetShader(ShaderEncoding sourceEncoding, bytebuf sour return; } - vector sources; + std::vector sources; sources.push_back(std::string((char *)source.begin(), (char *)source.end())); SPIRVCompilationSettings settings(SPIRVSourceLanguage::VulkanGLSL, stage); @@ -3742,13 +3742,13 @@ void VulkanReplay::RemoveReplacement(ResourceId id) ClearFeedbackCache(); } -vector VulkanReplay::PixelHistory(vector events, ResourceId target, - uint32_t x, uint32_t y, uint32_t slice, - uint32_t mip, uint32_t sampleIdx, - CompType typeHint) +std::vector VulkanReplay::PixelHistory(std::vector events, + ResourceId target, uint32_t x, uint32_t y, + uint32_t slice, uint32_t mip, + uint32_t sampleIdx, CompType typeHint) { VULKANNOTIMP("PixelHistory"); - return vector(); + return std::vector(); } ShaderDebugTrace VulkanReplay::DebugVertex(uint32_t eventId, uint32_t vertid, uint32_t instid, diff --git a/renderdoc/driver/vulkan/vk_replay.h b/renderdoc/driver/vulkan/vk_replay.h index 1f8f02915..a19d8e856 100644 --- a/renderdoc/driver/vulkan/vk_replay.h +++ b/renderdoc/driver/vulkan/vk_replay.h @@ -245,14 +245,14 @@ public: rdcarray GetShaderEntryPoints(ResourceId shader); ShaderReflection *GetShader(ResourceId shader, ShaderEntryPoint entry); - vector GetDisassemblyTargets(); + std::vector GetDisassemblyTargets(); std::string DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, const std::string &target); - vector GetUsage(ResourceId id); + std::vector GetUsage(ResourceId id); FrameRecord GetFrameRecord(); - vector GetDebugMessages(); + std::vector GetDebugMessages(); void SavePipelineState(uint32_t eventId); const D3D11Pipe::State *GetD3D11PipelineState() { return NULL; } @@ -265,9 +265,9 @@ public: void ReplayLog(uint32_t endEventID, ReplayLogType replayType); const SDFile &GetStructuredFile(); - vector GetPassEvents(uint32_t eventId); + std::vector GetPassEvents(uint32_t eventId); - vector GetSupportedWindowSystems(); + std::vector GetSupportedWindowSystems(); AMDRGPControl *GetRGPControl() { return m_RGP; } uint64_t MakeOutputWindow(WindowingData window, bool depth); @@ -284,15 +284,15 @@ public: ResourceId GetLiveID(ResourceId id); - vector EnumerateCounters(); + std::vector EnumerateCounters(); CounterDescription DescribeCounter(GPUCounter counterID); - vector FetchCounters(const vector &counters); + std::vector FetchCounters(const std::vector &counters); bool GetMinMax(ResourceId texid, uint32_t sliceFace, uint32_t mip, uint32_t sample, CompType typeHint, float *minval, float *maxval); bool GetHistogram(ResourceId texid, uint32_t sliceFace, uint32_t mip, uint32_t sample, CompType typeHint, float minval, float maxval, bool channels[4], - vector &histogram); + std::vector &histogram); void InitPostVSBuffers(uint32_t eventId); void InitPostVSBuffers(const std::vector &passEvents); @@ -309,7 +309,8 @@ public: void ReplaceResource(ResourceId from, ResourceId to); void RemoveReplacement(ResourceId id); - void RenderMesh(uint32_t eventId, const vector &secondaryDraws, const MeshDisplay &cfg); + void RenderMesh(uint32_t eventId, const std::vector &secondaryDraws, + const MeshDisplay &cfg); rdcarray GetTargetShaderEncodings() { @@ -332,9 +333,9 @@ public: void FillCBufferVariables(ResourceId shader, std::string entryPoint, uint32_t cbufSlot, rdcarray &outvars, const bytebuf &data); - vector PixelHistory(vector events, ResourceId target, uint32_t x, - uint32_t y, uint32_t slice, uint32_t mip, - uint32_t sampleIdx, CompType typeHint); + std::vector PixelHistory(std::vector events, ResourceId target, + uint32_t x, uint32_t y, uint32_t slice, uint32_t mip, + uint32_t sampleIdx, CompType typeHint); ShaderDebugTrace DebugVertex(uint32_t eventId, uint32_t vertid, uint32_t instid, uint32_t idx, uint32_t instOffset, uint32_t vertOffset); ShaderDebugTrace DebugPixel(uint32_t eventId, uint32_t x, uint32_t y, uint32_t sample, @@ -347,7 +348,7 @@ public: uint32_t x, uint32_t y); ResourceId RenderOverlay(ResourceId cfg, CompType typeHint, DebugOverlay overlay, - uint32_t eventId, const vector &passEvents); + uint32_t eventId, const std::vector &passEvents); ResourceId ApplyCustomShader(ResourceId shader, ResourceId texid, uint32_t mip, uint32_t arrayIdx, uint32_t sampleIdx, CompType typeHint); @@ -671,9 +672,9 @@ private: void CreateTexImageView(VkImage liveIm, const VulkanCreationInfo::Image &iminfo, CompType typeHint, TextureDisplayViews &views); - void FillTimersAMD(uint32_t *eventStartID, uint32_t *sampleIndex, vector *eventIDs); + void FillTimersAMD(uint32_t *eventStartID, uint32_t *sampleIndex, std::vector *eventIDs); - vector FetchCountersAMD(const vector &counters); + std::vector FetchCountersAMD(const std::vector &counters); AMDCounters *m_pAMDCounters = NULL; AMDRGPControl *m_RGP = NULL; diff --git a/renderdoc/driver/vulkan/vk_resources.h b/renderdoc/driver/vulkan/vk_resources.h index 68aeb3374..c6332b8fa 100644 --- a/renderdoc/driver/vulkan/vk_resources.h +++ b/renderdoc/driver/vulkan/vk_resources.h @@ -874,7 +874,7 @@ struct SwapchainInfo VkImageView view; VkFramebuffer fb; }; - vector images; + std::vector images; uint32_t lastPresent; }; @@ -889,7 +889,7 @@ struct ResourceInfo } // for buffers or non-sparse-resident images (bound with opaque mappings) - vector opaquemappings; + std::vector opaquemappings; VkMemoryRequirements memreqs; @@ -917,7 +917,7 @@ struct CmdBufferRecordingInfo VkResourceRecord *framebuffer = NULL; VkResourceRecord *allocRecord = NULL; - vector > imgbarriers; + std::vector > imgbarriers; // sparse resources referenced by this command buffer (at submit time // need to go through the sparse mapping and reference all memory) @@ -931,7 +931,7 @@ struct CmdBufferRecordingInfo // submit with latest binding refs. std::set boundDescSets; - vector subcmds; + std::vector subcmds; std::map memFrameRefs; @@ -955,7 +955,7 @@ struct DescriptorSetData // descriptor set bindings for this descriptor set. Filled out on // create from the layout. - vector descBindings; + std::vector descBindings; // lock protecting bindFrameRefs and bindMemRefs Threading::CriticalSection refLock; @@ -1241,7 +1241,7 @@ public: // pointer to either the pool this item is allocated from, or the children allocated // from this pool. Protected by the chunk lock VkResourceRecord *pool; - vector pooledChildren; + std::vector pooledChildren; // we only need a couple of bytes to store the view's range, // so just pack/unpack into bitfields @@ -1325,7 +1325,7 @@ struct ImageLayouts } uint32_t queueFamilyIndex = 0; - vector subresourceStates; + std::vector subresourceStates; int layerCount, levelCount, sampleCount; VkExtent3D extent; VkFormat format; diff --git a/renderdoc/driver/vulkan/vk_shader_cache.cpp b/renderdoc/driver/vulkan/vk_shader_cache.cpp index 25824271c..da2ce073e 100644 --- a/renderdoc/driver/vulkan/vk_shader_cache.cpp +++ b/renderdoc/driver/vulkan/vk_shader_cache.cpp @@ -270,7 +270,7 @@ void VulkanShaderCache::MakeGraphicsPipelineInfo(VkGraphicsPipelineCreateInfo &p static VkPipelineShaderStageCreateInfo stages[6]; static VkSpecializationInfo specInfo[6]; - static vector specMapEntries; + static std::vector specMapEntries; static std::vector specdata; size_t specEntries = 0; @@ -536,7 +536,7 @@ void VulkanShaderCache::MakeComputePipelineInfo(VkComputePipelineCreateInfo &pip VkPipelineShaderStageCreateInfo stage; // Returned by value static VkSpecializationInfo specInfo; - static vector specMapEntries; + static std::vector specMapEntries; static std::vector specdata; const uint32_t i = 5; // Compute stage diff --git a/renderdoc/driver/vulkan/vk_sparse_initstate.cpp b/renderdoc/driver/vulkan/vk_sparse_initstate.cpp index 1adbf510e..c8b90c801 100644 --- a/renderdoc/driver/vulkan/vk_sparse_initstate.cpp +++ b/renderdoc/driver/vulkan/vk_sparse_initstate.cpp @@ -310,7 +310,7 @@ bool WrappedVulkan::Prepare_SparseInitialState(WrappedVkImage *im) readbackmem.offs); RDCASSERTEQUAL(vkr, VK_SUCCESS); - vector bufdeletes; + std::vector bufdeletes; bufdeletes.push_back(dstBuf); VkCommandBufferBeginInfo beginInfo = {VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, NULL, diff --git a/renderdoc/driver/vulkan/vk_state.cpp b/renderdoc/driver/vulkan/vk_state.cpp index fa9786cd1..c5f01efdd 100644 --- a/renderdoc/driver/vulkan/vk_state.cpp +++ b/renderdoc/driver/vulkan/vk_state.cpp @@ -216,7 +216,7 @@ void VulkanRenderState::BindPipeline(VkCommandBuffer cmd, PipelineBinding bindin ResourceId pipeLayoutId = m_CreationInfo->m_Pipeline[graphics.pipeline].layout; VkPipelineLayout layout = GetResourceManager()->GetCurrentHandle(pipeLayoutId); - const vector &pushRanges = + const std::vector &pushRanges = m_CreationInfo->m_PipelineLayout[pipeLayoutId].pushRanges; bool dynamicStates[VkDynamicCount] = {0}; @@ -282,7 +282,7 @@ void VulkanRenderState::BindPipeline(VkCommandBuffer cmd, PipelineBinding bindin pushRanges[i].offset, pushRanges[i].size, pushconsts + pushRanges[i].offset); - const vector &descSetLayouts = + const std::vector &descSetLayouts = m_CreationInfo->m_PipelineLayout[pipeLayoutId].descSetLayouts; // only iterate over the desc sets that this layout actually uses, not all that were bound @@ -364,7 +364,7 @@ void VulkanRenderState::BindPipeline(VkCommandBuffer cmd, PipelineBinding bindin ResourceId pipeLayoutId = m_CreationInfo->m_Pipeline[compute.pipeline].layout; VkPipelineLayout layout = GetResourceManager()->GetCurrentHandle(pipeLayoutId); - const vector &pushRanges = + const std::vector &pushRanges = m_CreationInfo->m_PipelineLayout[pipeLayoutId].pushRanges; // only set push constant ranges that the layout uses @@ -373,7 +373,7 @@ void VulkanRenderState::BindPipeline(VkCommandBuffer cmd, PipelineBinding bindin pushRanges[i].offset, pushRanges[i].size, pushconsts + pushRanges[i].offset); - const vector &descSetLayouts = + const std::vector &descSetLayouts = m_CreationInfo->m_PipelineLayout[pipeLayoutId].descSetLayouts; for(size_t i = 0; i < descSetLayouts.size(); i++) diff --git a/renderdoc/driver/vulkan/vk_state.h b/renderdoc/driver/vulkan/vk_state.h index 45d50c5f7..cc486109d 100644 --- a/renderdoc/driver/vulkan/vk_state.h +++ b/renderdoc/driver/vulkan/vk_state.h @@ -39,9 +39,9 @@ struct VulkanStatePipeline struct DescriptorAndOffsets { ResourceId descSet; - vector offsets; + std::vector offsets; }; - vector descSets; + std::vector descSets; }; struct VulkanRenderState @@ -70,8 +70,8 @@ struct VulkanRenderState bool IsConditionalRenderingEnabled(); // dynamic state - vector views; - vector scissors; + std::vector views; + std::vector scissors; float lineWidth; struct { @@ -118,7 +118,7 @@ struct VulkanRenderState ResourceId buf; VkDeviceSize offs; }; - vector vbuffers; + std::vector vbuffers; struct XFBBuffer { @@ -126,7 +126,7 @@ struct VulkanRenderState VkDeviceSize offs; VkDeviceSize size; }; - vector xfbbuffers; + std::vector xfbbuffers; struct XFBCounter { @@ -134,7 +134,7 @@ struct VulkanRenderState VkDeviceSize offs; }; uint32_t firstxfbcounter = 0; - vector xfbcounters; + std::vector xfbcounters; struct ConditionalRendering { diff --git a/renderdoc/driver/vulkan/vk_win32.cpp b/renderdoc/driver/vulkan/vk_win32.cpp index 189a11724..126b0cca0 100644 --- a/renderdoc/driver/vulkan/vk_win32.cpp +++ b/renderdoc/driver/vulkan/vk_win32.cpp @@ -84,7 +84,7 @@ bool VulkanReplay::IsOutputWindowVisible(uint64_t id) return (IsWindowVisible(m_OutputWindows[id].wnd) == TRUE); } -void WrappedVulkan::AddRequiredExtensions(bool instance, vector &extensionList, +void WrappedVulkan::AddRequiredExtensions(bool instance, std::vector &extensionList, const std::set &supportedExtensions) { bool device = !instance; diff --git a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp index bc3a48eba..cfc80b481 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp @@ -234,7 +234,7 @@ std::string WrappedVulkan::MakeRenderPassOpString(bool store) const VulkanCreationInfo::Framebuffer &fbinfo = m_CreationInfo.m_Framebuffer[m_BakedCmdBufferInfo[m_LastCmdBufferID].state.framebuffer]; - const vector &atts = info.attachments; + const std::vector &atts = info.attachments; if(atts.empty()) { diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp index 89eb28f2c..42ea71971 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp @@ -91,7 +91,7 @@ void InitInstanceTable(VkInstance inst, PFN_vkGetInstanceProcAddr gpa); // and // instance are destroyed. We only clean up after our own objects. -static void StripUnwantedLayers(vector &Layers) +static void StripUnwantedLayers(std::vector &Layers) { for(auto it = Layers.begin(); it != Layers.end();) { diff --git a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp index fb15e6474..c47b78709 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp @@ -517,7 +517,7 @@ bool WrappedVulkan::PatchIndirectDraw(VkIndirectPatchType type, DrawcallDescript void WrappedVulkan::InsertDrawsAndRefreshIDs(BakedCmdBufferInfo &cmdBufInfo) { - vector &cmdBufNodes = cmdBufInfo.draw->children; + std::vector &cmdBufNodes = cmdBufInfo.draw->children; // assign new drawcall IDs for(size_t i = 0; i < cmdBufNodes.size(); i++) diff --git a/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp index fbfc43da5..5cad936c1 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp @@ -668,8 +668,8 @@ VkResult WrappedVulkan::vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR RDCWARN("Presenting multiple swapchains at once - only first will be processed"); } - vector unwrappedSwaps; - vector unwrappedSems; + std::vector unwrappedSwaps; + std::vector unwrappedSems; VkPresentInfoKHR unwrappedInfo = *pPresentInfo; diff --git a/renderdoc/os/os_specific.h b/renderdoc/os/os_specific.h index 6f03cf6fe..319f94df8 100644 --- a/renderdoc/os/os_specific.h +++ b/renderdoc/os/os_specific.h @@ -41,8 +41,6 @@ #include "api/replay/renderdoc_replay.h" #include "common/common.h" -using std::vector; - struct CaptureOptions; namespace Process @@ -335,7 +333,7 @@ inline bool dump(const char *filename, const void *buffer, size_t size) return numWritten == size; } -inline bool slurp(const char *filename, vector &buffer) +inline bool slurp(const char *filename, std::vector &buffer) { FILE *f = FileIO::fopen(filename, "rb"); if(f == NULL) diff --git a/renderdoc/os/posix/linux/linux_callstack.cpp b/renderdoc/os/posix/linux/linux_callstack.cpp index e4052d89d..2110f5397 100644 --- a/renderdoc/os/posix/linux/linux_callstack.cpp +++ b/renderdoc/os/posix/linux/linux_callstack.cpp @@ -151,7 +151,7 @@ struct LookupModule class LinuxResolver : public Callstack::StackResolver { public: - LinuxResolver(vector modules) { m_Modules = modules; } + LinuxResolver(std::vector modules) { m_Modules = modules; } Callstack::AddressDetails GetAddr(uint64_t addr) { EnsureCached(addr); @@ -247,7 +247,7 @@ StackResolver *MakeResolver(byte *moduleDB, size_t DBSize, RENDERDOC_ProgressCal char *search = start; char *dbend = (char *)(moduleDB + DBSize); - vector modules; + std::vector modules; while(search && search < dbend) { diff --git a/renderdoc/os/posix/posix_process.cpp b/renderdoc/os/posix/posix_process.cpp index 426d1ad57..01eedcf5c 100644 --- a/renderdoc/os/posix/posix_process.cpp +++ b/renderdoc/os/posix/posix_process.cpp @@ -247,9 +247,9 @@ static const std::string GetAbsoluteAppPathFromName(const std::string &appName) return FileIO::FindFileInPath(appName); } -static vector &GetEnvModifications() +static std::vector &GetEnvModifications() { - static vector envCallbacks; + static std::vector envCallbacks; return envCallbacks; } @@ -348,7 +348,7 @@ void Process::ApplyEnvironmentModification() char **currentEnvironment = GetCurrentEnvironment(); std::map currentEnv = EnvStringToEnvMap((const char **)currentEnvironment); - vector &modifications = GetEnvModifications(); + std::vector &modifications = GetEnvModifications(); for(size_t i = 0; i < modifications.size(); i++) { @@ -708,7 +708,7 @@ ExecuteResult Process::LaunchAndInjectIntoProcess(const char *app, const char *w // turn environment string to a UTF-8 map char **currentEnvironment = GetCurrentEnvironment(); std::map env = EnvStringToEnvMap((const char **)currentEnvironment); - vector modifications = GetEnvModifications(); + std::vector modifications = GetEnvModifications(); for(const EnvironmentModification &e : envList) modifications.push_back(e); diff --git a/renderdoc/os/posix/posix_threading.cpp b/renderdoc/os/posix/posix_threading.cpp index cc092ee4e..6dfed8090 100644 --- a/renderdoc/os/posix/posix_threading.cpp +++ b/renderdoc/os/posix/posix_threading.cpp @@ -181,11 +181,11 @@ int64_t nextTLSSlot = 0; struct TLSData { - vector data; + std::vector data; }; static CriticalSection *m_TLSListLock = NULL; -static vector *m_TLSList = NULL; +static std::vector *m_TLSList = NULL; void Init() { @@ -194,7 +194,7 @@ void Init() RDCFATAL("Can't allocate OS TLS slot"); m_TLSListLock = new CriticalSection(); - m_TLSList = new vector(); + m_TLSList = new std::vector(); CacheDebuggerPresent(); } diff --git a/renderdoc/os/win32/win32_callstack.cpp b/renderdoc/os/win32/win32_callstack.cpp index 28702f6cd..7f08a659d 100644 --- a/renderdoc/os/win32/win32_callstack.cpp +++ b/renderdoc/os/win32/win32_callstack.cpp @@ -78,7 +78,7 @@ struct Module IDiaSession *pSession; }; -vector modules; +std::vector modules; std::wstring GetSymSearchPath() { @@ -411,7 +411,7 @@ private: void Collect(); - vector m_AddrStack; + std::vector m_AddrStack; }; class Win32CallstackResolver : public Callstack::StackResolver @@ -436,7 +436,7 @@ private: std::vector pdbRememberedPaths; std::vector pdbIgnores; - vector modules; + std::vector modules; char pipeMessageBuf[2048]; }; diff --git a/renderdoc/os/win32/win32_hook.cpp b/renderdoc/os/win32/win32_hook.cpp index 31a183722..c130212a1 100644 --- a/renderdoc/os/win32/win32_hook.cpp +++ b/renderdoc/os/win32/win32_hook.cpp @@ -39,8 +39,6 @@ #define VERBOSE_DEBUG_HOOK OPTION_OFF -using std::vector; - // map from address of IAT entry, to original contents std::map s_InstalledHooks; Threading::CriticalSection installedLock; @@ -92,10 +90,10 @@ struct DllHookset bool hooksfetched = false; // if we have multiple copies of the dll loaded (unlikely), the other module handles will be // stored here - vector altmodules; - vector FunctionHooks; + std::vector altmodules; + std::vector FunctionHooks; DWORD OrdinalBase = 0; - vector OrdinalNames; + std::vector OrdinalNames; std::vector Callbacks; Threading::CriticalSection ordinallock; diff --git a/renderdoc/os/win32/win32_process.cpp b/renderdoc/os/win32/win32_process.cpp index d696bea41..a30038388 100644 --- a/renderdoc/os/win32/win32_process.cpp +++ b/renderdoc/os/win32/win32_process.cpp @@ -160,7 +160,7 @@ void Process::ApplyEnvironmentModification() LPWCH envStrings = GetEnvironmentStringsW(); EnvMap envValues = EnvStringToEnvMap(envStrings); FreeEnvironmentStringsW(envStrings); - vector &modifications = GetEnvModifications(); + std::vector &modifications = GetEnvModifications(); ApplyEnvModifications(envValues, modifications, true); diff --git a/renderdoc/os/win32/win32_threading.cpp b/renderdoc/os/win32/win32_threading.cpp index ce4bd0c32..5fccaa7f4 100644 --- a/renderdoc/os/win32/win32_threading.cpp +++ b/renderdoc/os/win32/win32_threading.cpp @@ -175,11 +175,11 @@ int64_t nextTLSSlot = 0; struct TLSData { - vector data; + std::vector data; }; static CriticalSection *m_TLSListLock = NULL; -static vector *m_TLSList = NULL; +static std::vector *m_TLSList = NULL; void Init() { @@ -188,7 +188,7 @@ void Init() RDCFATAL("Can't allocate OS TLS slot"); m_TLSListLock = new CriticalSection(); - m_TLSList = new vector(); + m_TLSList = new std::vector(); } void Shutdown() diff --git a/renderdoc/replay/app_api.cpp b/renderdoc/replay/app_api.cpp index eb26be40f..82f48a471 100644 --- a/renderdoc/replay/app_api.cpp +++ b/renderdoc/replay/app_api.cpp @@ -79,7 +79,7 @@ static uint32_t GetNumCaptures() static uint32_t GetCapture(uint32_t idx, char *filename, uint32_t *pathlength, uint64_t *timestamp) { - vector caps = RenderDoc::Inst().GetCaptures(); + std::vector caps = RenderDoc::Inst().GetCaptures(); if(idx >= (uint32_t)caps.size()) { @@ -109,7 +109,7 @@ static void SetCaptureFileComments(const char *filePath, const char *comments) std::string path; if(filePath == NULL || filePath[0] == 0) { - vector caps = RenderDoc::Inst().GetCaptures(); + std::vector caps = RenderDoc::Inst().GetCaptures(); if(caps.empty()) { RDCERR( diff --git a/renderdoc/replay/replay_controller.cpp b/renderdoc/replay/replay_controller.cpp index c817c0582..b87afaabd 100644 --- a/renderdoc/replay/replay_controller.cpp +++ b/renderdoc/replay/replay_controller.cpp @@ -272,7 +272,7 @@ rdcarray ReplayController::GetDisassemblyTargets() rdcarray ret; - vector targets = m_pDevice->GetDisassemblyTargets(); + std::vector targets = m_pDevice->GetDisassemblyTargets(); ret.reserve(targets.size()); for(const std::string &t : targets) @@ -833,7 +833,7 @@ bool ReplayController::SaveTexture(const TextureSave &saveData, const char *path // otherwise take all mips, as by default } - vector subdata; + std::vector subdata; bool downcast = false; @@ -1587,7 +1587,7 @@ rdcarray ReplayController::PixelHistory(ResourceId target, ui std::vector usage = m_pDevice->GetUsage(id); - vector events; + std::vector events; for(size_t i = 0; i < usage.size(); i++) { diff --git a/renderdoc/replay/replay_controller.h b/renderdoc/replay/replay_controller.h index f2cc7ec9f..6c79708b6 100644 --- a/renderdoc/replay/replay_controller.h +++ b/renderdoc/replay/replay_controller.h @@ -112,7 +112,7 @@ private: uint32_t m_EventID; ReplayOutputType m_Type; - vector passEvents; + std::vector passEvents; int32_t m_Width; int32_t m_Height; @@ -223,7 +223,7 @@ private: IReplayDriver *GetDevice() { return m_pDevice; } FrameRecord m_FrameRecord; - vector m_Drawcalls; + std::vector m_Drawcalls; uint64_t m_ThreadID; diff --git a/renderdoc/replay/replay_driver.cpp b/renderdoc/replay/replay_driver.cpp index abb78de7b..6cdc4a95c 100644 --- a/renderdoc/replay/replay_driver.cpp +++ b/renderdoc/replay/replay_driver.cpp @@ -59,7 +59,7 @@ static bool PreviousNextExcludedMarker(DrawcallDescription *draw) DrawFlags::APICalls)); } -static DrawcallDescription *SetupDrawcallPointers(vector &drawcallTable, +static DrawcallDescription *SetupDrawcallPointers(std::vector &drawcallTable, rdcarray &draws, DrawcallDescription *parent, DrawcallDescription *&previous) @@ -382,7 +382,7 @@ static void StandardFillCBufferVariables(const rdcarray &invars, var.type = VarType::Float; var.rowMajor = rowMajor; - vector varmembers; + std::vector varmembers; if(isArray) { @@ -443,7 +443,7 @@ static void StandardFillCBufferVariables(const rdcarray &invars, var.rows = 0; var.columns = 0; - vector varmembers; + std::vector varmembers; varmembers.resize(elems); std::string base = outvars[outIdx].name; @@ -723,9 +723,9 @@ void HighlightCache::CacheHighlightingData(uint32_t eventId, const MeshDisplay & } bool HighlightCache::FetchHighlightPositions(const MeshDisplay &cfg, FloatVector &activeVertex, - vector &activePrim, - vector &adjacentPrimVertices, - vector &inactiveVertices) + std::vector &activePrim, + std::vector &adjacentPrimVertices, + std::vector &inactiveVertices) { bool valid = true; diff --git a/renderdoc/replay/replay_driver.h b/renderdoc/replay/replay_driver.h index 3c22a6636..00b7c76a3 100644 --- a/renderdoc/replay/replay_driver.h +++ b/renderdoc/replay/replay_driver.h @@ -100,16 +100,16 @@ public: virtual std::vector GetTextures() = 0; virtual TextureDescription GetTexture(ResourceId id) = 0; - virtual vector GetDebugMessages() = 0; + virtual std::vector GetDebugMessages() = 0; virtual rdcarray GetShaderEntryPoints(ResourceId shader) = 0; virtual ShaderReflection *GetShader(ResourceId shader, ShaderEntryPoint entry) = 0; - virtual vector GetDisassemblyTargets() = 0; + virtual std::vector GetDisassemblyTargets() = 0; virtual std::string DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, const std::string &target) = 0; - virtual vector GetUsage(ResourceId id) = 0; + virtual std::vector GetUsage(ResourceId id) = 0; virtual void SavePipelineState(uint32_t eventId) = 0; virtual const D3D11Pipe::State *GetD3D11PipelineState() = 0; @@ -123,10 +123,10 @@ public: virtual void ReplayLog(uint32_t endEventID, ReplayLogType replayType) = 0; virtual const SDFile &GetStructuredFile() = 0; - virtual vector GetPassEvents(uint32_t eventId) = 0; + virtual std::vector GetPassEvents(uint32_t eventId) = 0; virtual void InitPostVSBuffers(uint32_t eventId) = 0; - virtual void InitPostVSBuffers(const vector &passEvents) = 0; + virtual void InitPostVSBuffers(const std::vector &passEvents) = 0; virtual ResourceId GetLiveID(ResourceId id) = 0; @@ -145,16 +145,17 @@ public: virtual void RemoveReplacement(ResourceId id) = 0; virtual void FreeTargetResource(ResourceId id) = 0; - virtual vector EnumerateCounters() = 0; + virtual std::vector EnumerateCounters() = 0; virtual CounterDescription DescribeCounter(GPUCounter counterID) = 0; - virtual vector FetchCounters(const vector &counterID) = 0; + virtual std::vector FetchCounters(const std::vector &counterID) = 0; virtual void FillCBufferVariables(ResourceId shader, std::string entryPoint, uint32_t cbufSlot, rdcarray &outvars, const bytebuf &data) = 0; - virtual vector PixelHistory(vector events, ResourceId target, - uint32_t x, uint32_t y, uint32_t slice, uint32_t mip, - uint32_t sampleIdx, CompType typeHint) = 0; + virtual std::vector PixelHistory(std::vector events, + ResourceId target, uint32_t x, uint32_t y, + uint32_t slice, uint32_t mip, + uint32_t sampleIdx, CompType typeHint) = 0; virtual ShaderDebugTrace DebugVertex(uint32_t eventId, uint32_t vertid, uint32_t instid, uint32_t idx, uint32_t instOffset, uint32_t vertOffset) = 0; virtual ShaderDebugTrace DebugPixel(uint32_t eventId, uint32_t x, uint32_t y, uint32_t sample, @@ -163,7 +164,7 @@ public: const uint32_t threadid[3]) = 0; virtual ResourceId RenderOverlay(ResourceId texid, CompType typeHint, DebugOverlay overlay, - uint32_t eventId, const vector &passEvents) = 0; + uint32_t eventId, const std::vector &passEvents) = 0; virtual bool IsRenderOutput(ResourceId id) = 0; @@ -179,7 +180,7 @@ class IReplayDriver : public IRemoteDriver public: virtual bool IsRemoteProxy() = 0; - virtual vector GetSupportedWindowSystems() = 0; + virtual std::vector GetSupportedWindowSystems() = 0; virtual AMDRGPControl *GetRGPControl() = 0; @@ -199,7 +200,7 @@ public: CompType typeHint, float *minval, float *maxval) = 0; virtual bool GetHistogram(ResourceId texid, uint32_t sliceFace, uint32_t mip, uint32_t sample, CompType typeHint, float minval, float maxval, bool channels[4], - vector &histogram) = 0; + std::vector &histogram) = 0; virtual ResourceId CreateProxyTexture(const TextureDescription &templateTex) = 0; virtual void SetProxyTextureData(ResourceId texid, uint32_t arrayIdx, uint32_t mip, byte *data, @@ -209,7 +210,7 @@ public: virtual ResourceId CreateProxyBuffer(const BufferDescription &templateBuf) = 0; virtual void SetProxyBufferData(ResourceId bufid, byte *data, size_t dataSize) = 0; - virtual void RenderMesh(uint32_t eventId, const vector &secondaryDraws, + virtual void RenderMesh(uint32_t eventId, const std::vector &secondaryDraws, const MeshDisplay &cfg) = 0; virtual bool RenderTexture(TextureDisplay cfg) = 0; @@ -263,9 +264,9 @@ struct HighlightCache void CacheHighlightingData(uint32_t eventId, const MeshDisplay &cfg); bool FetchHighlightPositions(const MeshDisplay &cfg, FloatVector &activeVertex, - vector &activePrim, - vector &adjacentPrimVertices, - vector &inactiveVertices); + std::vector &activePrim, + std::vector &adjacentPrimVertices, + std::vector &inactiveVertices); static FloatVector InterpretVertex(const byte *data, uint32_t vert, uint32_t vertexByteStride, const ResourceFormat &fmt, const byte *end, bool &valid); diff --git a/renderdoc/replay/replay_output.cpp b/renderdoc/replay/replay_output.cpp index 3186e1935..00309576e 100644 --- a/renderdoc/replay/replay_output.cpp +++ b/renderdoc/replay/replay_output.cpp @@ -391,7 +391,7 @@ rdcarray ReplayOutput::GetHistogram(float minval, float maxval, bool c { CHECK_REPLAY_THREAD(); - vector hist; + std::vector hist; ResourceId tex = m_pDevice->GetLiveID(m_RenderData.texDisplay.resourceId); @@ -858,7 +858,7 @@ void ReplayOutput::DisplayMesh() mesh.second.vertexResourceId = m_pDevice->GetLiveID(mesh.second.vertexResourceId); mesh.second.indexResourceId = m_pDevice->GetLiveID(mesh.second.indexResourceId); - vector secondaryDraws; + std::vector secondaryDraws; // we choose a pallette here so that the colours stay consistent (i.e the // current draw is always the same colour), but also to indicate somewhat diff --git a/renderdoccmd/renderdoccmd_android.cpp b/renderdoccmd/renderdoccmd_android.cpp index 6ce9873e2..a42cc7568 100644 --- a/renderdoccmd/renderdoccmd_android.cpp +++ b/renderdoccmd/renderdoccmd_android.cpp @@ -41,9 +41,6 @@ extern "C" { #include #define ANDROID_LOG(...) __android_log_print(ANDROID_LOG_INFO, "renderdoccmd", __VA_ARGS__); -using std::vector; -using std::istringstream; - struct android_app *android_state; pthread_t cmdthread_handle = 0; @@ -377,7 +374,7 @@ void DisplayRendererPreview(IReplayController *renderer, TextureDisplay &display // Returns the renderdoccmd arguments passed via am start // Examples: am start ... -e renderdoccmd "remoteserver" // -e renderdoccmd "replay /sdcard/capture.rdc" -vector getRenderdoccmdArgs() +std::vector getRenderdoccmdArgs() { JNIEnv *env; android_state->activity->vm->AttachCurrentThread(&env, 0); @@ -395,12 +392,12 @@ vector getRenderdoccmdArgs() jstring jsParam1 = (jstring)env->CallObjectMethod(intent, gseid, env->NewStringUTF("renderdoccmd")); - vector ret; + std::vector ret; if(jsParam1) // Check if arg value found { ret.push_back("renderdoccmd"); const char *param1 = env->GetStringUTFChars(jsParam1, 0); - istringstream iss(param1); + std::istringstream iss(param1); while(iss) { std::string sub; @@ -415,7 +412,7 @@ vector getRenderdoccmdArgs() void *cmdthread(void *) { - vector args = getRenderdoccmdArgs(); + std::vector args = getRenderdoccmdArgs(); if(args.size()) { ANDROID_LOG("Entering cmd thread"); diff --git a/renderdoccmd/renderdoccmd_linux.cpp b/renderdoccmd/renderdoccmd_linux.cpp index 7bde729a4..22fb72c19 100644 --- a/renderdoccmd/renderdoccmd_linux.cpp +++ b/renderdoccmd/renderdoccmd_linux.cpp @@ -42,8 +42,6 @@ #include -using std::vector; - void Daemonise() { // don't change dir, but close stdin/stdou diff --git a/renderdoccmd/renderdoccmd_win32.cpp b/renderdoccmd/renderdoccmd_win32.cpp index 6251aa9d5..fa430e4cb 100644 --- a/renderdoccmd/renderdoccmd_win32.cpp +++ b/renderdoccmd/renderdoccmd_win32.cpp @@ -35,8 +35,6 @@ #include #include -using std::vector; - static std::string conv(const std::wstring &str) { std::string ret;