diff --git a/renderdoc/android/android.cpp b/renderdoc/android/android.cpp index 1cf943a90..57aaa2086 100644 --- a/renderdoc/android/android.cpp +++ b/renderdoc/android/android.cpp @@ -187,10 +187,10 @@ ExecuteResult StartAndroidPackageForCapture(const char *host, const char *packag ret.status = ReplayStatus::UnknownError; ret.ident = RenderDoc_FirstTargetControlPort + RenderDoc_AndroidPortOffset * (index + 1); - string packageName = get_basename(string(package)); // Remove leading '/' if any + std::string packageName = get_basename(std::string(package)); // Remove leading '/' if any // adb shell cmd package resolve-activity -c android.intent.category.LAUNCHER com.jake.cube1 - string activityName = GetDefaultActivityForPackage(deviceID, packageName); + std::string activityName = GetDefaultActivityForPackage(deviceID, packageName); uint16_t jdwpPort = GetJdwpPort(); @@ -325,7 +325,7 @@ ExecuteResult StartAndroidPackageForCapture(const char *host, const char *packag return ret; } -bool CheckAndroidServerVersion(const string &deviceID, ABI abi) +bool CheckAndroidServerVersion(const std::string &deviceID, ABI abi) { // assume all servers are updated at the same rate. Only check first ABI's version std::string packageName = GetRenderDocPackageForABI(abi); @@ -361,8 +361,8 @@ bool CheckAndroidServerVersion(const string &deviceID, ABI abi) } // Compare the server's versionCode and versionName with the host's for compatibility - std::string hostVersionCode = - string(STRINGIZE(RENDERDOC_VERSION_MAJOR)) + string(STRINGIZE(RENDERDOC_VERSION_MINOR)); + std::string hostVersionCode = std::string(STRINGIZE(RENDERDOC_VERSION_MAJOR)) + + std::string(STRINGIZE(RENDERDOC_VERSION_MINOR)); std::string hostVersionName = GitVersionHash; // False positives will hurt us, so check for explicit matches @@ -502,7 +502,7 @@ ReplayStatus InstallRenderDocServer(const std::string &deviceID) return status; } -bool RemoveRenderDocAndroidServer(const string &deviceID) +bool RemoveRenderDocAndroidServer(const std::string &deviceID) { std::vector abis = GetSupportedABIs(deviceID); diff --git a/renderdoc/android/android.h b/renderdoc/android/android.h index 7143ce886..df3364332 100644 --- a/renderdoc/android/android.h +++ b/renderdoc/android/android.h @@ -36,7 +36,7 @@ ExecuteResult StartAndroidPackageForCapture(const char *host, const char *packag void ResetCaptureSettings(const std::string &deviceID); void ExtractDeviceIDAndIndex(const std::string &hostname, int &index, std::string &deviceID); Process::ProcessResult adbExecCommand(const std::string &deviceID, const std::string &args, - const string &workDir = ".", bool silent = false); + const std::string &workDir = ".", bool silent = false); void initAdb(); void shutdownAdb(); bool InjectWithJDWP(const std::string &deviceID, uint16_t jdwpport); diff --git a/renderdoc/android/android_patch.cpp b/renderdoc/android/android_patch.cpp index 0bc0a90ce..a0cea2a7e 100644 --- a/renderdoc/android/android_patch.cpp +++ b/renderdoc/android/android_patch.cpp @@ -43,14 +43,14 @@ static const char keystoreName[] = "renderdoc.keystore"; namespace Android { -bool RemoveAPKSignature(const string &apk) +bool RemoveAPKSignature(const std::string &apk) { RDCLOG("Checking for existing signature"); std::string aapt = getToolPath(ToolDir::BuildTools, "aapt", false); // Get the list of files in META-INF - string fileList = execCommand(aapt, "list \"" + apk + "\"").strStdout; + std::string fileList = execCommand(aapt, "list \"" + apk + "\"").strStdout; if(fileList.empty()) return false; @@ -58,8 +58,8 @@ bool RemoveAPKSignature(const string &apk) uint32_t fileCount = 0; uint32_t matchCount = 0; std::istringstream contents(fileList); - string line; - string prefix("META-INF"); + std::string line; + std::string prefix("META-INF"); while(std::getline(contents, line)) { line = trim(line); @@ -168,13 +168,13 @@ bool AddManifestToAPK(const std::string &apk, const std::string &tmpDir, return true; } -bool RealignAPK(const string &apk, string &alignedAPK, const string &tmpDir) +bool RealignAPK(const std::string &apk, std::string &alignedAPK, const std::string &tmpDir) { std::string zipalign = getToolPath(ToolDir::BuildTools, "zipalign", false); // Re-align the APK for performance RDCLOG("Realigning APK"); - string errOut = + std::string errOut = execCommand(zipalign, "-f 4 \"" + apk + "\" \"" + alignedAPK + "\"", tmpDir).strStderror; if(!errOut.empty()) @@ -199,7 +199,7 @@ bool RealignAPK(const string &apk, string &alignedAPK, const string &tmpDir) return false; } -string GetAndroidDebugKey() +std::string GetAndroidDebugKey() { std::string keystore = getToolPath(ToolDir::None, keystoreName, false); @@ -208,13 +208,13 @@ string GetAndroidDebugKey() return keystore; // otherwise, see if we generated a temporary one - string key = FileIO::GetTempFolderFilename() + keystoreName; + std::string key = FileIO::GetTempFolderFilename() + keystoreName; if(FileIO::exists(key.c_str())) return key; // locate keytool and use it to generate a keystore - string create; + std::string create; create += " -genkey"; create += " -keystore \"" + key + "\""; create += " -storepass android"; @@ -234,16 +234,16 @@ string GetAndroidDebugKey() return key; } -bool DebugSignAPK(const string &apk, const string &workDir) +bool DebugSignAPK(const std::string &apk, const std::string &workDir) { RDCLOG("Signing with debug key"); std::string aapt = getToolPath(ToolDir::BuildTools, "aapt", false); std::string apksigner = getToolPath(ToolDir::BuildToolsLib, "apksigner.jar", false); - string debugKey = GetAndroidDebugKey(); + std::string debugKey = GetAndroidDebugKey(); - string args; + std::string args; args += " sign "; args += " --ks \"" + debugKey + "\" "; args += " --ks-pass pass:android "; @@ -273,12 +273,12 @@ bool DebugSignAPK(const string &apk, const string &workDir) } // Check for signature - string list = execCommand(aapt, "list \"" + apk + "\"").strStdout; + std::string list = execCommand(aapt, "list \"" + apk + "\"").strStdout; // Walk through the output. If it starts with META-INF, we're good std::istringstream contents(list); - string line; - string prefix("META-INF"); + std::string line; + std::string prefix("META-INF"); while(std::getline(contents, line)) { if(line.compare(0, prefix.size(), prefix) == 0) @@ -292,14 +292,15 @@ bool DebugSignAPK(const string &apk, const string &workDir) return false; } -bool UninstallOriginalAPK(const string &deviceID, const string &packageName, const string &workDir) +bool UninstallOriginalAPK(const std::string &deviceID, const std::string &packageName, + const std::string &workDir) { RDCLOG("Uninstalling previous version of application"); adbExecCommand(deviceID, "uninstall " + packageName, workDir); // Wait until uninstall completes - string uninstallResult; + std::string uninstallResult; uint32_t elapsed = 0; uint32_t timeout = 10000; // 10 seconds while(elapsed < timeout) @@ -319,8 +320,8 @@ bool UninstallOriginalAPK(const string &deviceID, const string &packageName, con return false; } -bool ReinstallPatchedAPK(const string &deviceID, const string &apk, const string &abi, - const string &packageName, const string &workDir) +bool ReinstallPatchedAPK(const std::string &deviceID, const std::string &apk, const std::string &abi, + const std::string &packageName, const std::string &workDir) { RDCLOG("Reinstalling APK"); @@ -330,7 +331,7 @@ bool ReinstallPatchedAPK(const string &deviceID, const string &apk, const string adbExecCommand(deviceID, "install --abi " + abi + " \"" + apk + "\"", workDir); // Wait until re-install completes - string reinstallResult; + std::string reinstallResult; uint32_t elapsed = 0; uint32_t timeout = 10000; // 10 seconds while(elapsed < timeout) @@ -402,16 +403,16 @@ bool CheckPatchingRequirements() std::string DetermineInstalledABI(const std::string &deviceID, const std::string &packageName) { RDCLOG("Checking installed ABI for %s", packageName.c_str()); - string abi; + std::string abi; - string dump = adbExecCommand(deviceID, "shell pm dump " + packageName).strStdout; + std::string dump = adbExecCommand(deviceID, "shell pm dump " + packageName).strStdout; if(dump.empty()) RDCERR("Unable to pm dump %s", packageName.c_str()); // Walk through the output and look for primaryCpuAbi std::istringstream contents(dump); - string line; - string prefix("primaryCpuAbi="); + std::string line; + std::string prefix("primaryCpuAbi="); while(std::getline(contents, line)) { line = trim(line); @@ -430,7 +431,7 @@ std::string DetermineInstalledABI(const std::string &deviceID, const std::string return abi; } -bool PullAPK(const string &deviceID, const string &pkgPath, const string &apk) +bool PullAPK(const std::string &deviceID, const std::string &pkgPath, const std::string &apk) { RDCLOG("Pulling APK to patch"); @@ -455,13 +456,13 @@ bool PullAPK(const string &deviceID, const string &pkgPath, const string &apk) return false; } -void CopyAPK(const string &deviceID, const string &pkgPath, const string ©Path) +void CopyAPK(const std::string &deviceID, const std::string &pkgPath, const std::string ©Path) { RDCLOG("Copying APK to %s", copyPath.c_str()); adbExecCommand(deviceID, "shell cp " + pkgPath + " " + copyPath); } -void RemoveAPK(const string &deviceID, const string &path) +void RemoveAPK(const std::string &deviceID, const std::string &path) { RDCLOG("Removing APK from %s", path.c_str()); adbExecCommand(deviceID, "shell rm -f " + path); diff --git a/renderdoc/android/android_utils.h b/renderdoc/android/android_utils.h index 3ef7981a4..78a64959e 100644 --- a/renderdoc/android/android_utils.h +++ b/renderdoc/android/android_utils.h @@ -31,10 +31,10 @@ namespace Android { -Process::ProcessResult execScript(const string &script, const string &args, - const string &workDir = ".", bool silent = false); -Process::ProcessResult execCommand(const string &exe, const string &args, - const string &workDir = ".", bool silent = false); +Process::ProcessResult execScript(const std::string &script, const std::string &args, + const std::string &workDir = ".", bool silent = false); +Process::ProcessResult execCommand(const std::string &exe, const std::string &args, + const std::string &workDir = ".", bool silent = false); enum class ToolDir { diff --git a/renderdoc/common/common.cpp b/renderdoc/common/common.cpp index 2065e7432..f27d959c6 100644 --- a/renderdoc/common/common.cpp +++ b/renderdoc/common/common.cpp @@ -31,8 +31,6 @@ #include "os/os_specific.h" #include "strings/string_utils.h" -using std::string; - // for(int i=0; i < 256; i++) // { // uint8_t comp = i&0xff; @@ -294,7 +292,7 @@ uint64_t Log2Floor(uint64_t value) } #endif -static string logfile; +static std::string logfile; static bool logfileOpened = false; const char *rdclog_getfilename() @@ -304,7 +302,7 @@ const char *rdclog_getfilename() void rdclog_filename(const char *filename) { - string previous = logfile; + std::string previous = logfile; logfile = ""; if(filename && filename[0]) @@ -405,8 +403,8 @@ void rdclog_direct(time_t utcTime, uint32_t pid, LogType type, const char *proje char location[64] = {0}; #if ENABLED(INCLUDE_LOCATION_IN_LOG) - string loc; - loc = get_basename(string(file)); + std::string loc; + loc = get_basename(std::string(file)); StringFormat::snprintf(location, 63, "% 20s(%4d) - ", loc.c_str(), line); #endif diff --git a/renderdoc/common/shader_cache.h b/renderdoc/common/shader_cache.h index 73d9dad7a..dc493d8f6 100644 --- a/renderdoc/common/shader_cache.h +++ b/renderdoc/common/shader_cache.h @@ -30,7 +30,7 @@ template bool LoadShaderCache(const char *filename, const uint32_t magicNumber, const uint32_t versionNumber, std::map &resultCache, const ShaderCallbacks &callbacks) { - string shadercache = FileIO::GetAppFolderFilename(filename); + std::string shadercache = FileIO::GetAppFolderFilename(filename); FILE *f = FileIO::fopen(shadercache.c_str(), "rb"); @@ -152,7 +152,7 @@ template void SaveShaderCache(const char *filename, uint32_t magicNumber, uint32_t versionNumber, const std::map &cache, const ShaderCallbacks &callbacks) { - string shadercache = FileIO::GetAppFolderFilename(filename); + std::string shadercache = FileIO::GetAppFolderFilename(filename); FILE *f = FileIO::fopen(shadercache.c_str(), "wb"); diff --git a/renderdoc/common/timing.h b/renderdoc/common/timing.h index fe8cc88fa..ee34423d9 100644 --- a/renderdoc/common/timing.h +++ b/renderdoc/common/timing.h @@ -31,8 +31,6 @@ #include "os/os_specific.h" #include "common.h" -using std::string; - class PerformanceTimer { public: @@ -133,7 +131,7 @@ public: private: const char *m_File; unsigned int m_Line; - string m_Message; + std::string m_Message; PerformanceTimer m_Timer; }; diff --git a/renderdoc/core/core.cpp b/renderdoc/core/core.cpp index 3a98ca559..50cd229d8 100644 --- a/renderdoc/core/core.cpp +++ b/renderdoc/core/core.cpp @@ -316,7 +316,7 @@ void RenderDoc::Initialise() // set default capture log - useful for when hooks aren't setup // through the UI (and a log file isn't set manually) { - string capture_filename; + std::string capture_filename; const char *base = "RenderDoc_app"; if(IsReplayApp()) @@ -361,14 +361,14 @@ void RenderDoc::Initialise() m_ExHandler = NULL; { - string curFile; + std::string curFile; FileIO::GetExecutableFilename(curFile); - string f = strlower(curFile); + std::string f = strlower(curFile); // only create crash handler when we're not in renderdoccmd.exe (to prevent infinite loop as // the crash handler itself launches renderdoccmd.exe) - if(f.find("renderdoccmd.exe") == string::npos) + if(f.find("renderdoccmd.exe") == std::string::npos) { RecreateCrashHandler(); } @@ -584,7 +584,7 @@ bool RenderDoc::IsTargetControlConnected() return !RenderDoc::Inst().m_SingleClientName.empty(); } -string RenderDoc::GetTargetControlUsername() +std::string RenderDoc::GetTargetControlUsername() { SCOPED_LOCK(RenderDoc::Inst().m_SingleClientLock); return RenderDoc::Inst().m_SingleClientName; @@ -643,7 +643,7 @@ void RenderDoc::CycleActiveWindow() } } -string RenderDoc::GetOverlayText(RDCDriver driver, uint32_t frameNumber, int flags) +std::string RenderDoc::GetOverlayText(RDCDriver driver, uint32_t frameNumber, int flags) { const bool activeWindow = (flags & eOverlay_ActiveWindow); const bool capturesEnabled = (flags & eOverlay_CaptureDisabled) == 0; @@ -1222,17 +1222,17 @@ std::map RenderDoc::GetActiveDrivers() return ret; } -std::map RenderDoc::GetReplayDrivers() +std::map RenderDoc::GetReplayDrivers() { - std::map ret; + std::map ret; for(auto it = m_ReplayDriverProviders.begin(); it != m_ReplayDriverProviders.end(); ++it) ret[it->first] = ToStr(it->first); return ret; } -std::map RenderDoc::GetRemoteDrivers() +std::map RenderDoc::GetRemoteDrivers() { - std::map ret; + std::map ret; for(auto it = m_RemoteDriverProviders.begin(); it != m_RemoteDriverProviders.end(); ++it) ret[it->first] = ToStr(it->first); diff --git a/renderdoc/core/core.h b/renderdoc/core/core.h index 4442170a1..6ad8e932f 100644 --- a/renderdoc/core/core.h +++ b/renderdoc/core/core.h @@ -38,7 +38,6 @@ #include "maths/vec.h" #include "os/os_specific.h" -using std::string; using std::vector; using std::pair; using std::set; @@ -221,11 +220,11 @@ ITERABLE_OPERATORS(VendorExtensions); struct CaptureData { - CaptureData(string p, uint64_t t, RDCDriver d, uint32_t f) + CaptureData(std::string p, uint64_t t, RDCDriver d, uint32_t f) : path(p), timestamp(t), driver(d), frameNumber(f), retrieved(false) { } - string path; + std::string path; uint64_t timestamp; RDCDriver driver; uint32_t frameNumber; @@ -414,8 +413,8 @@ public: void RegisterShutdownFunction(ShutdownFunction func) { m_ShutdownFunctions.insert(func); } void SetReplayApp(bool replay) { m_Replay = replay; } bool IsReplayApp() const { return m_Replay; } - const string &GetConfigSetting(string name) { return m_ConfigSettings[name]; } - void SetConfigSetting(string name, string value) { m_ConfigSettings[name] = value; } + const std::string &GetConfigSetting(std::string name) { return m_ConfigSettings[name]; } + void SetConfigSetting(std::string name, std::string value) { m_ConfigSettings[name] = value; } void BecomeRemoteServer(const char *listenhost, uint16_t port, RENDERDOC_KillCallback killReplay, RENDERDOC_PreviewWindowCallback previewWindow); @@ -507,8 +506,8 @@ public: bool HasReplaySupport(RDCDriver driverType); - std::map GetReplayDrivers(); - std::map GetRemoteDrivers(); + std::map GetReplayDrivers(); + std::map GetRemoteDrivers(); bool HasReplayDriver(RDCDriver driver) const; bool HasRemoteDriver(RDCDriver driver) const; @@ -518,7 +517,7 @@ public: uint32_t GetTargetControlIdent() const { return m_RemoteIdent; } bool IsTargetControlConnected(); - string GetTargetControlUsername(); + std::string GetTargetControlUsername(); void Tick(); @@ -576,7 +575,7 @@ public: eOverlay_CaptureDisabled = 0x2, }; - string GetOverlayText(RDCDriver driver, uint32_t frameNumber, int flags); + std::string GetOverlayText(RDCDriver driver, uint32_t frameNumber, int flags); void CycleActiveWindow(); uint32_t GetCapturableWindowCount() { return (uint32_t)m_WindowFrameCapturers.size(); } @@ -597,11 +596,11 @@ private: FrameTimer m_FrameTimer; - string m_LoggingFilename; + std::string m_LoggingFilename; - string m_Target; - string m_CaptureFileTemplate; - string m_CurrentLogFile; + std::string m_Target; + std::string m_CaptureFileTemplate; + std::string m_CurrentLogFile; CaptureOptions m_Options; uint32_t m_Overlay; @@ -622,7 +621,7 @@ private: Threading::CriticalSection m_ChildLock; vector > m_Children; - std::map m_ConfigSettings; + std::map m_ConfigSettings; std::map m_ReplayDriverProviders; std::map m_RemoteDriverProviders; @@ -689,7 +688,7 @@ private: volatile bool m_TargetControlThreadShutdown; volatile bool m_ControlClientThreadShutdown; Threading::CriticalSection m_SingleClientLock; - string m_SingleClientName; + std::string m_SingleClientName; PerformanceTimer m_Timer; diff --git a/renderdoc/core/image_viewer.cpp b/renderdoc/core/image_viewer.cpp index eb44bd59d..864069242 100644 --- a/renderdoc/core/image_viewer.cpp +++ b/renderdoc/core/image_viewer.cpp @@ -141,8 +141,9 @@ public: { return m_Proxy->GetTargetShaderEncodings(); } - void BuildCustomShader(string source, string entry, const ShaderCompileFlags &compileFlags, - ShaderStage type, ResourceId *id, string *errors) + void BuildCustomShader(std::string source, std::string entry, + const ShaderCompileFlags &compileFlags, ShaderStage type, ResourceId *id, + std::string *errors) { m_Proxy->BuildCustomShader(source, entry, compileFlags, type, id, errors); } @@ -209,7 +210,7 @@ public: { return vector(); } - void FillCBufferVariables(ResourceId shader, string entryPoint, uint32_t cbufSlot, + void FillCBufferVariables(ResourceId shader, std::string entryPoint, uint32_t cbufSlot, rdcarray &outvars, const bytebuf &data) { } @@ -229,8 +230,9 @@ public: } rdcarray GetShaderEntryPoints(ResourceId shader) { return {}; } ShaderReflection *GetShader(ResourceId shader, ShaderEntryPoint entry) { return NULL; } - vector GetDisassemblyTargets() { return {"N/A"}; } - string DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, const string &target) + vector GetDisassemblyTargets() { return {"N/A"}; } + std::string DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, + const std::string &target) { return ""; } @@ -262,9 +264,9 @@ public: RDCEraseEl(ret); return ret; } - void BuildTargetShader(ShaderEncoding sourceEncoding, bytebuf source, string entry, + void BuildTargetShader(ShaderEncoding sourceEncoding, bytebuf source, std::string entry, const ShaderCompileFlags &compileFlags, ShaderStage type, ResourceId *id, - string *errors) + std::string *errors) { if(id) *id = ResourceId(); @@ -306,7 +308,7 @@ private: FrameRecord m_FrameRecord; D3D11Pipe::State m_PipelineState; IReplayDriver *m_Proxy; - string m_Filename; + std::string m_Filename; ResourceId m_TextureID, m_CustomTexID; std::vector m_Resources; SDFile m_File; diff --git a/renderdoc/core/remote_server.cpp b/renderdoc/core/remote_server.cpp index 11cd01a8b..737b430eb 100644 --- a/renderdoc/core/remote_server.cpp +++ b/renderdoc/core/remote_server.cpp @@ -819,7 +819,7 @@ void RenderDoc::BecomeRemoteServer(const char *listenhost, uint16_t port, while(f && !FileIO::feof(f)) { - string line = trim(FileIO::getline(f)); + std::string line = trim(FileIO::getline(f)); if(line == "") continue; @@ -1197,14 +1197,15 @@ public: std::string deviceID; Android::ExtractDeviceIDAndIndex(m_hostname, index, deviceID); - string adbStdout = Android::adbExecCommand(deviceID, "shell pm list packages -3").strStdout; + std::string adbStdout = + Android::adbExecCommand(deviceID, "shell pm list packages -3").strStdout; using namespace std; istringstream stdoutStream(adbStdout); - string line; + std::string line; vector packages; while(getline(stdoutStream, line)) { - vector tokens; + vector tokens; split(line, tokens, ':'); if(tokens.size() == 2 && tokens[0] == "package") { @@ -1866,7 +1867,7 @@ RENDERDOC_CreateRemoteServerConnection(const char *host, uint32_t port, IRemoteS if(rend == NULL) return ReplayStatus::InternalError; - string s = "localhost"; + std::string s = "localhost"; if(host != NULL && host[0] != '\0') s = host; diff --git a/renderdoc/core/replay_proxy.h b/renderdoc/core/replay_proxy.h index de870521a..940b6ac15 100644 --- a/renderdoc/core/replay_proxy.h +++ b/renderdoc/core/replay_proxy.h @@ -400,8 +400,9 @@ public: return ~0U; } - void BuildCustomShader(string source, string entry, const ShaderCompileFlags &compileFlags, - ShaderStage type, ResourceId *id, string *errors) + void BuildCustomShader(std::string source, std::string entry, + const ShaderCompileFlags &compileFlags, ShaderStage type, ResourceId *id, + std::string *errors) { if(m_Proxy) { diff --git a/renderdoc/driver/d3d11/d3d11_debug.cpp b/renderdoc/driver/d3d11/d3d11_debug.cpp index ba320c1e6..363b28a63 100644 --- a/renderdoc/driver/d3d11/d3d11_debug.cpp +++ b/renderdoc/driver/d3d11/d3d11_debug.cpp @@ -474,7 +474,7 @@ void D3D11Replay::TextureRendering::Init(WrappedID3D11Device *device) HRESULT hr = S_OK; { - string hlsl = GetEmbeddedResource(texdisplay_hlsl); + std::string hlsl = GetEmbeddedResource(texdisplay_hlsl); TexDisplayVS = shaderCache->MakeVShader(hlsl.c_str(), "RENDERDOC_TexDisplayVS", "vs_4_0"); TexDisplayPS = shaderCache->MakePShader(hlsl.c_str(), "RENDERDOC_TexDisplayPS", "ps_5_0"); @@ -546,7 +546,7 @@ void D3D11Replay::OverlayRendering::Init(WrappedID3D11Device *device) D3D11ShaderCache *shaderCache = device->GetShaderCache(); { - string hlsl = GetEmbeddedResource(misc_hlsl); + std::string hlsl = GetEmbeddedResource(misc_hlsl); FullscreenVS = shaderCache->MakeVShader(hlsl.c_str(), "RENDERDOC_FullscreenVS", "vs_4_0"); @@ -1023,7 +1023,7 @@ void D3D11Replay::HistogramMinMax::Init(WrappedID3D11Device *device) // float, uint, sint for(int i = 0; i < 3; i++) { - string hlsl = std::string("#define SHADER_RESTYPE ") + ToStr(t) + "\n"; + std::string hlsl = std::string("#define SHADER_RESTYPE ") + ToStr(t) + "\n"; hlsl += std::string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n"; hlsl += std::string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n"; hlsl += histogramhlsl; diff --git a/renderdoc/driver/d3d11/d3d11_device.cpp b/renderdoc/driver/d3d11/d3d11_device.cpp index c4553503d..fd18d5702 100644 --- a/renderdoc/driver/d3d11/d3d11_device.cpp +++ b/renderdoc/driver/d3d11/d3d11_device.cpp @@ -116,7 +116,8 @@ WrappedID3D11Device::WrappedID3D11Device(ID3D11Device *realDevice, D3D11InitPara D3D11MarkerRegion::device = this; - string shaderSearchPathString = RenderDoc::Inst().GetConfigSetting("shader.debug.searchPaths"); + std::string shaderSearchPathString = + RenderDoc::Inst().GetConfigSetting("shader.debug.searchPaths"); split(shaderSearchPathString, m_ShaderSearchPaths, ';'); ResourceIDGen::SetReplayResourceIDs(); @@ -853,7 +854,7 @@ std::vector WrappedID3D11Device::GetDebugMessages() } msg.messageID = (uint32_t)message->ID; - msg.description = string(message->pDescription); + msg.description = std::string(message->pDescription); ret.push_back(msg); @@ -2140,7 +2141,8 @@ HRESULT WrappedID3D11Device::Present(WrappedIDXGISwapChain4 *swap, UINT SyncInte m_TextRenderer->SetOutputWindow(swapDesc.OutputWindow); int flags = activeWindow ? RenderDoc::eOverlay_ActiveWindow : 0; - string overlayText = RenderDoc::Inst().GetOverlayText(RDCDriver::D3D11, m_FrameCounter, flags); + std::string overlayText = + RenderDoc::Inst().GetOverlayText(RDCDriver::D3D11, m_FrameCounter, flags); if(activeWindow && m_FailedFrame > 0) { diff --git a/renderdoc/driver/d3d11/d3d11_device.h b/renderdoc/driver/d3d11/d3d11_device.h index 580e40b36..cf6f0dde0 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; + vector m_ShaderSearchPaths; D3D11InitParams m_InitParams; uint64_t m_SectionVersion; @@ -450,7 +450,7 @@ public: return m_LayoutDescs[layout]; } - vector *GetShaderDebugInfoSearchPaths() { return &m_ShaderSearchPaths; } + vector *GetShaderDebugInfoSearchPaths() { return &m_ShaderSearchPaths; } template bool Serialise_CaptureScope(SerialiserType &ser); diff --git a/renderdoc/driver/d3d11/d3d11_replay.cpp b/renderdoc/driver/d3d11/d3d11_replay.cpp index 6bd6ceac7..fc2bb7165 100644 --- a/renderdoc/driver/d3d11/d3d11_replay.cpp +++ b/renderdoc/driver/d3d11/d3d11_replay.cpp @@ -261,7 +261,7 @@ TextureDescription D3D11Replay::GetTexture(ResourceId id) { WrappedID3D11Texture1D *d3dtex = (WrappedID3D11Texture1D *)it1D->second.m_Texture; - string str = GetDebugName(d3dtex); + std::string str = GetDebugName(d3dtex); D3D11_TEXTURE1D_DESC desc; d3dtex->GetDesc(&desc); @@ -308,7 +308,7 @@ TextureDescription D3D11Replay::GetTexture(ResourceId id) { WrappedID3D11Texture2D1 *d3dtex = (WrappedID3D11Texture2D1 *)it2D->second.m_Texture; - string str = GetDebugName(d3dtex); + std::string str = GetDebugName(d3dtex); D3D11_TEXTURE2D_DESC desc; d3dtex->GetDesc(&desc); @@ -367,7 +367,7 @@ TextureDescription D3D11Replay::GetTexture(ResourceId id) { WrappedID3D11Texture3D1 *d3dtex = (WrappedID3D11Texture3D1 *)it3D->second.m_Texture; - string str = GetDebugName(d3dtex); + std::string str = GetDebugName(d3dtex); D3D11_TEXTURE3D_DESC desc; d3dtex->GetDesc(&desc); @@ -450,9 +450,9 @@ ShaderReflection *D3D11Replay::GetShader(ResourceId shader, ShaderEntryPoint ent return &ret; } -vector D3D11Replay::GetDisassemblyTargets() +vector D3D11Replay::GetDisassemblyTargets() { - vector ret; + vector ret; // DXBC is always first ret.insert(ret.begin(), DXBCDisassemblyTarget); @@ -460,8 +460,8 @@ vector D3D11Replay::GetDisassemblyTargets() return ret; } -string D3D11Replay::DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, - const string &target) +std::string D3D11Replay::DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, + const std::string &target) { auto it = WrappedShader::m_ShaderList.find(m_pDevice->GetResourceManager()->GetLiveID(refl->resourceId)); @@ -575,7 +575,7 @@ BufferDescription D3D11Replay::GetBuffer(ResourceId id) WrappedID3D11Buffer *d3dbuf = it->second.m_Buffer; - string str = GetDebugName(d3dbuf); + std::string str = GetDebugName(d3dbuf); ret.resourceId = m_pDevice->GetResourceManager()->GetOriginalID(it->first); diff --git a/renderdoc/driver/d3d11/d3d11_replay.h b/renderdoc/driver/d3d11/d3d11_replay.h index 05a08fe26..00fac57b9 100644 --- a/renderdoc/driver/d3d11/d3d11_replay.h +++ b/renderdoc/driver/d3d11/d3d11_replay.h @@ -121,8 +121,9 @@ public: rdcarray GetShaderEntryPoints(ResourceId shader); ShaderReflection *GetShader(ResourceId shader, ShaderEntryPoint entry); - vector GetDisassemblyTargets(); - string DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, const string &target); + vector GetDisassemblyTargets(); + std::string DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, + const std::string &target); vector GetUsage(ResourceId id); @@ -184,9 +185,9 @@ public: { return {ShaderEncoding::DXBC, ShaderEncoding::HLSL}; } - void BuildTargetShader(ShaderEncoding sourceEncoding, bytebuf source, string entry, + void BuildTargetShader(ShaderEncoding sourceEncoding, bytebuf source, std::string entry, const ShaderCompileFlags &compileFlags, ShaderStage type, ResourceId *id, - string *errors); + std::string *errors); void ReplaceResource(ResourceId from, ResourceId to); void RemoveReplacement(ResourceId id); @@ -211,7 +212,7 @@ public: void RenderHighlightBox(float w, float h, float scale); - void FillCBufferVariables(ResourceId shader, string entryPoint, uint32_t cbufSlot, + void FillCBufferVariables(ResourceId shader, std::string entryPoint, uint32_t cbufSlot, rdcarray &outvars, const bytebuf &data); vector PixelHistory(vector events, ResourceId target, uint32_t x, @@ -231,8 +232,9 @@ public: ResourceId RenderOverlay(ResourceId texid, CompType typeHint, DebugOverlay overlay, uint32_t eventId, const vector &passEvents); - void BuildCustomShader(string source, string entry, const ShaderCompileFlags &compileFlags, - ShaderStage type, ResourceId *id, string *errors); + void BuildCustomShader(std::string source, std::string entry, + const ShaderCompileFlags &compileFlags, ShaderStage type, ResourceId *id, + std::string *errors); ResourceId ApplyCustomShader(ResourceId shader, ResourceId texid, uint32_t mip, uint32_t arrayIdx, uint32_t sampleIdx, CompType typeHint); diff --git a/renderdoc/driver/d3d11/d3d11_resources.cpp b/renderdoc/driver/d3d11/d3d11_resources.cpp index 0d43b33a9..b4e6a9dc5 100644 --- a/renderdoc/driver/d3d11/d3d11_resources.cpp +++ b/renderdoc/driver/d3d11/d3d11_resources.cpp @@ -76,7 +76,7 @@ void WrappedShader::ShaderEntry::TryReplaceOriginalByteCode() { if(!DXBC::DXBCFile::CheckForDebugInfo((const void *)&m_Bytecode[0], m_Bytecode.size())) { - string originalPath = m_DebugInfoPath; + std::string originalPath = m_DebugInfoPath; if(originalPath.empty()) originalPath = @@ -97,7 +97,7 @@ void WrappedShader::ShaderEntry::TryReplaceOriginalByteCode() size_t numSearchPaths = m_DebugInfoSearchPaths ? m_DebugInfoSearchPaths->size() : 0; - string foundPath; + std::string foundPath; // while we haven't found a file, keep trying through the search paths. For i==0 // check the path on its own, in case it's an absolute path. diff --git a/renderdoc/driver/d3d11/d3d11_resources.h b/renderdoc/driver/d3d11/d3d11_resources.h index 7f920c00a..812c13005 100644 --- a/renderdoc/driver/d3d11/d3d11_resources.h +++ b/renderdoc/driver/d3d11/d3d11_resources.h @@ -294,7 +294,7 @@ public: const char *pStrData = (const char *)pData; if(DataSize != 0 && pStrData[DataSize - 1] != '\0') { - string sName(pStrData, DataSize); + std::string sName(pStrData, DataSize); m_pDevice->SetResourceName(this, sName.c_str()); } else diff --git a/renderdoc/driver/d3d11/d3d11_shaderdebug.cpp b/renderdoc/driver/d3d11/d3d11_shaderdebug.cpp index ac50db0f4..11982a97f 100644 --- a/renderdoc/driver/d3d11/d3d11_shaderdebug.cpp +++ b/renderdoc/driver/d3d11/d3d11_shaderdebug.cpp @@ -74,7 +74,7 @@ struct DebugHit bool PromptDebugTimeout(DXBC::ProgramType prog, uint32_t cycleCounter) { - string msg = StringFormat::Fmt( + std::string msg = StringFormat::Fmt( "RenderDoc's shader debugging has been running for over %u cycles, which indicates either a " "very long-running loop, or possibly an infinite loop. Continuing could lead to extreme " "memory allocations, slow UI or even crashes. Would you like to abort debugging to see what " @@ -1199,7 +1199,7 @@ ShaderDebugTrace D3D11Replay::DebugPixel(uint32_t eventId, uint32_t x, uint32_t vector initialValues; - string extractHlsl = "struct PSInput\n{\n"; + std::string extractHlsl = "struct PSInput\n{\n"; int structureStride = 0; @@ -1212,8 +1212,8 @@ ShaderDebugTrace D3D11Replay::DebugPixel(uint32_t eventId, uint32_t x, uint32_t structureStride += 4; } - vector floatInputs; - vector>> + vector floatInputs; + vector>> arrays; // name, pair std::vector inputVarNames; @@ -1294,7 +1294,7 @@ ShaderDebugTrace D3D11Replay::DebugPixel(uint32_t eventId, uint32_t x, uint32_t if(!filled) { - string dummy_reg = "dummy_register"; + std::string dummy_reg = "dummy_register"; dummy_reg += ToStr((uint32_t)nextreg + dummy); extractHlsl += "float4 var_" + dummy_reg + " : semantic_" + dummy_reg + ";\n"; @@ -1740,7 +1740,7 @@ void ExtractInputsPS(PSInput IN, float4 debug_pixelPos : SV_Position, uint prim for(size_t i = 0; i < floatInputs.size(); i++) { - const string &name = floatInputs[i]; + const std::string &name = floatInputs[i]; extractHlsl += " PSInitialBuffer[idx].INddx." + name + " = ddx(IN." + name + ");\n"; extractHlsl += " PSInitialBuffer[idx].INddy." + name + " = ddy(IN." + name + ");\n"; extractHlsl += " PSInitialBuffer[idx].INddxfine." + name + " = ddx_fine(IN." + name + ");\n"; diff --git a/renderdoc/driver/d3d12/d3d12_command_list.h b/renderdoc/driver/d3d12/d3d12_command_list.h index 3a6566958..ef676433f 100644 --- a/renderdoc/driver/d3d12/d3d12_command_list.h +++ b/renderdoc/driver/d3d12/d3d12_command_list.h @@ -221,7 +221,7 @@ public: HRESULT STDMETHODCALLTYPE SetName(LPCWSTR Name) { - string utf8 = StringFormat::Wide2UTF8(Name); + std::string utf8 = StringFormat::Wide2UTF8(Name); m_pDevice->SetName(this, utf8.c_str()); return m_pList->SetName(Name); diff --git a/renderdoc/driver/d3d12/d3d12_command_queue.h b/renderdoc/driver/d3d12/d3d12_command_queue.h index 1f5836063..4d6beb14f 100644 --- a/renderdoc/driver/d3d12/d3d12_command_queue.h +++ b/renderdoc/driver/d3d12/d3d12_command_queue.h @@ -206,7 +206,7 @@ public: HRESULT STDMETHODCALLTYPE SetName(LPCWSTR Name) { - string utf8 = StringFormat::Wide2UTF8(Name); + std::string utf8 = StringFormat::Wide2UTF8(Name); m_pDevice->SetName(this, utf8.c_str()); return m_pReal->SetName(Name); diff --git a/renderdoc/driver/d3d12/d3d12_common.cpp b/renderdoc/driver/d3d12/d3d12_common.cpp index efe69c8dc..9bb0df227 100644 --- a/renderdoc/driver/d3d12/d3d12_common.cpp +++ b/renderdoc/driver/d3d12/d3d12_common.cpp @@ -652,7 +652,7 @@ const UINT64 *PIX3DecodeStringParam(const UINT64 *pData, std::string &DecodedStr return pData; } -string PIX3SprintfParams(const std::string &Format, const UINT64 *pData) +std::string PIX3SprintfParams(const std::string &Format, const UINT64 *pData) { std::string finalString; std::string formatPart; diff --git a/renderdoc/driver/d3d12/d3d12_common.h b/renderdoc/driver/d3d12/d3d12_common.h index 0cac3121c..a4c57c7e7 100644 --- a/renderdoc/driver/d3d12/d3d12_common.h +++ b/renderdoc/driver/d3d12/d3d12_common.h @@ -77,7 +77,7 @@ inline std::string DecodeMarkerString(UINT Metadata, const void *pData, UINT Siz else if(Metadata == PIX_EVENT_ANSI_VERSION) { const char *c = (const char *)pData; - MarkerText = string(c, c + Size); + MarkerText = std::string(c, c + Size); } else if(Metadata == PIX_EVENT_PIX3BLOB_VERSION) { diff --git a/renderdoc/driver/d3d12/d3d12_debug.cpp b/renderdoc/driver/d3d12/d3d12_debug.cpp index fb03929bc..4162f198a 100644 --- a/renderdoc/driver/d3d12/d3d12_debug.cpp +++ b/renderdoc/driver/d3d12/d3d12_debug.cpp @@ -1386,9 +1386,9 @@ void D3D12Replay::HistogramMinMax::Init(WrappedID3D12Device *device, D3D12DebugM ID3DBlob *result = NULL; ID3DBlob *histogram = NULL; - string hlsl = string("#define SHADER_RESTYPE ") + ToStr(t) + "\n"; - hlsl += string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n"; - hlsl += string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n"; + std::string hlsl = std::string("#define SHADER_RESTYPE ") + ToStr(t) + "\n"; + hlsl += std::string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n"; + hlsl += std::string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n"; hlsl += histogramhlsl; shaderCache->GetShaderBlob(hlsl.c_str(), "RENDERDOC_TileMinMaxCS", diff --git a/renderdoc/driver/d3d12/d3d12_device.cpp b/renderdoc/driver/d3d12/d3d12_device.cpp index 45f5444c8..02a35e790 100644 --- a/renderdoc/driver/d3d12/d3d12_device.cpp +++ b/renderdoc/driver/d3d12/d3d12_device.cpp @@ -1386,7 +1386,7 @@ HRESULT WrappedID3D12Device::Present(WrappedIDXGISwapChain4 *swap, UINT SyncInte list->OMSetRenderTargets(1, &rtv, FALSE, NULL); int flags = activeWindow ? RenderDoc::eOverlay_ActiveWindow : 0; - string overlayText = + std::string overlayText = RenderDoc::Inst().GetOverlayText(RDCDriver::D3D12, m_FrameCounter, flags); if(!overlayText.empty()) @@ -2099,7 +2099,7 @@ std::vector WrappedID3D12Device::GetDebugMessages() } msg.messageID = (uint32_t)message->ID; - msg.description = string(message->pDescription); + msg.description = std::string(message->pDescription); ret.push_back(msg); diff --git a/renderdoc/driver/d3d12/d3d12_device.h b/renderdoc/driver/d3d12/d3d12_device.h index 4453d4d89..a0baa4dab 100644 --- a/renderdoc/driver/d3d12/d3d12_device.h +++ b/renderdoc/driver/d3d12/d3d12_device.h @@ -396,7 +396,7 @@ private: set m_Cubemaps; - std::map m_ResourceNames; + std::map m_ResourceNames; struct SwapPresentInfo { @@ -473,7 +473,7 @@ public: void AddResourceCurChunk(ResourceDescription &descr); void AddResourceCurChunk(ResourceId id); - const string &GetResourceName(ResourceId id) { return m_ResourceNames[id]; } + const std::string &GetResourceName(ResourceId id) { return m_ResourceNames[id]; } vector &GetSubresourceStates(ResourceId id) { return m_ResourceStates[id]; diff --git a/renderdoc/driver/d3d12/d3d12_replay.cpp b/renderdoc/driver/d3d12/d3d12_replay.cpp index fdcd93860..29e20003e 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() +vector D3D12Replay::GetDisassemblyTargets() { - vector ret; + vector ret; // DXBC is always first ret.insert(ret.begin(), DXBCDisassemblyTarget); @@ -456,8 +456,8 @@ vector D3D12Replay::GetDisassemblyTargets() return ret; } -string D3D12Replay::DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, - const string &target) +std::string D3D12Replay::DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, + const std::string &target) { WrappedID3D12Shader *sh = m_pDevice->GetResourceManager()->GetLiveAs(refl->resourceId); @@ -2652,7 +2652,7 @@ void D3D12Replay::GetBufferData(ResourceId buff, uint64_t offset, uint64_t lengt GetDebugManager()->GetBufferData(buffer, offset, length, retData); } -void D3D12Replay::FillCBufferVariables(ResourceId shader, string entryPoint, uint32_t cbufSlot, +void D3D12Replay::FillCBufferVariables(ResourceId shader, std::string entryPoint, uint32_t cbufSlot, rdcarray &outvars, const bytebuf &data) { if(shader == ResourceId()) diff --git a/renderdoc/driver/d3d12/d3d12_replay.h b/renderdoc/driver/d3d12/d3d12_replay.h index 4365aeeaa..d89c5d4ad 100644 --- a/renderdoc/driver/d3d12/d3d12_replay.h +++ b/renderdoc/driver/d3d12/d3d12_replay.h @@ -80,8 +80,9 @@ public: rdcarray GetShaderEntryPoints(ResourceId shader); ShaderReflection *GetShader(ResourceId shader, ShaderEntryPoint entry); - vector GetDisassemblyTargets(); - string DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, const string &target); + vector GetDisassemblyTargets(); + std::string DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, + const std::string &target); vector GetUsage(ResourceId id); @@ -145,9 +146,9 @@ public: { return {ShaderEncoding::DXBC, ShaderEncoding::HLSL}; } - void BuildTargetShader(ShaderEncoding sourceEncoding, bytebuf source, string entry, + void BuildTargetShader(ShaderEncoding sourceEncoding, bytebuf source, std::string entry, const ShaderCompileFlags &compileFlags, ShaderStage type, ResourceId *id, - string *errors); + std::string *errors); void ReplaceResource(ResourceId from, ResourceId to); void RemoveReplacement(ResourceId id); @@ -172,7 +173,7 @@ public: void RenderHighlightBox(float w, float h, float scale); - void FillCBufferVariables(ResourceId shader, string entryPoint, uint32_t cbufSlot, + void FillCBufferVariables(ResourceId shader, std::string entryPoint, uint32_t cbufSlot, rdcarray &outvars, const bytebuf &data); vector PixelHistory(vector events, ResourceId target, uint32_t x, @@ -192,8 +193,9 @@ public: ResourceId RenderOverlay(ResourceId texid, CompType typeHint, DebugOverlay overlay, uint32_t eventId, const vector &passEvents); - void BuildCustomShader(string source, string entry, const ShaderCompileFlags &compileFlags, - ShaderStage type, ResourceId *id, string *errors); + void BuildCustomShader(std::string source, std::string entry, + const ShaderCompileFlags &compileFlags, ShaderStage type, ResourceId *id, + std::string *errors); ResourceId ApplyCustomShader(ResourceId shader, ResourceId texid, uint32_t mip, uint32_t arrayIdx, uint32_t sampleIdx, CompType typeHint); diff --git a/renderdoc/driver/d3d12/d3d12_resources.cpp b/renderdoc/driver/d3d12/d3d12_resources.cpp index 5314cae64..767652175 100644 --- a/renderdoc/driver/d3d12/d3d12_resources.cpp +++ b/renderdoc/driver/d3d12/d3d12_resources.cpp @@ -39,7 +39,7 @@ void WrappedID3D12Shader::TryReplaceOriginalByteCode() { if(!DXBC::DXBCFile::CheckForDebugInfo((const void *)&m_Bytecode[0], m_Bytecode.size())) { - string originalPath = m_DebugInfoPath; + std::string originalPath = m_DebugInfoPath; if(originalPath.empty()) originalPath = @@ -60,7 +60,7 @@ void WrappedID3D12Shader::TryReplaceOriginalByteCode() size_t numSearchPaths = m_DebugInfoSearchPaths ? m_DebugInfoSearchPaths->size() : 0; - string foundPath; + std::string foundPath; // while we haven't found a file, keep trying through the search paths. For i==0 // check the path on its own, in case it's an absolute path. diff --git a/renderdoc/driver/d3d12/d3d12_resources.h b/renderdoc/driver/d3d12/d3d12_resources.h index 975539768..7bb027054 100644 --- a/renderdoc/driver/d3d12/d3d12_resources.h +++ b/renderdoc/driver/d3d12/d3d12_resources.h @@ -288,7 +288,7 @@ public: HRESULT STDMETHODCALLTYPE SetName(LPCWSTR Name) { - string utf8 = Name ? StringFormat::Wide2UTF8(Name) : ""; + std::string utf8 = Name ? StringFormat::Wide2UTF8(Name) : ""; m_pDevice->SetName(this, utf8.c_str()); if(!m_pReal) diff --git a/renderdoc/driver/d3d8/d3d8_debug.cpp b/renderdoc/driver/d3d8/d3d8_debug.cpp index b6368041a..d1b821110 100644 --- a/renderdoc/driver/d3d8/d3d8_debug.cpp +++ b/renderdoc/driver/d3d8/d3d8_debug.cpp @@ -44,7 +44,7 @@ bool D3D8DebugManager::InitFontRendering() int width = FONT_TEX_WIDTH; int height = FONT_TEX_HEIGHT; - string font = GetEmbeddedResource(sourcecodepro_ttf); + std::string font = GetEmbeddedResource(sourcecodepro_ttf); byte *ttfdata = (byte *)font.c_str(); const int firstChar = int(' ') + 1; diff --git a/renderdoc/driver/d3d8/d3d8_device.cpp b/renderdoc/driver/d3d8/d3d8_device.cpp index 266c65097..8143d76c9 100644 --- a/renderdoc/driver/d3d8/d3d8_device.cpp +++ b/renderdoc/driver/d3d8/d3d8_device.cpp @@ -281,7 +281,8 @@ HRESULT __stdcall WrappedD3DDevice8::Present(CONST RECT *pSourceRect, CONST RECT int flags = activeWindow ? RenderDoc::eOverlay_ActiveWindow : 0; flags |= RenderDoc::eOverlay_CaptureDisabled; - string overlayText = RenderDoc::Inst().GetOverlayText(RDCDriver::D3D8, m_FrameCounter, flags); + std::string overlayText = + RenderDoc::Inst().GetOverlayText(RDCDriver::D3D8, m_FrameCounter, flags); overlayText += "Captures not supported with D3D8\n"; diff --git a/renderdoc/driver/d3d9/d3d9_debug.cpp b/renderdoc/driver/d3d9/d3d9_debug.cpp index a9f93b799..308c76f51 100644 --- a/renderdoc/driver/d3d9/d3d9_debug.cpp +++ b/renderdoc/driver/d3d9/d3d9_debug.cpp @@ -44,7 +44,7 @@ bool D3D9DebugManager::InitFontRendering() int width = FONT_TEX_WIDTH; int height = FONT_TEX_HEIGHT; - string font = GetEmbeddedResource(sourcecodepro_ttf); + std::string font = GetEmbeddedResource(sourcecodepro_ttf); byte *ttfdata = (byte *)font.c_str(); const int firstChar = int(' ') + 1; diff --git a/renderdoc/driver/d3d9/d3d9_device.cpp b/renderdoc/driver/d3d9/d3d9_device.cpp index 76c67ffda..f70f80548 100644 --- a/renderdoc/driver/d3d9/d3d9_device.cpp +++ b/renderdoc/driver/d3d9/d3d9_device.cpp @@ -249,7 +249,8 @@ HRESULT __stdcall WrappedD3DDevice9::Present(CONST RECT *pSourceRect, CONST RECT int flags = activeWindow ? RenderDoc::eOverlay_ActiveWindow : 0; flags |= RenderDoc::eOverlay_CaptureDisabled; - string overlayText = RenderDoc::Inst().GetOverlayText(RDCDriver::D3D9, m_FrameCounter, flags); + std::string overlayText = + RenderDoc::Inst().GetOverlayText(RDCDriver::D3D9, m_FrameCounter, flags); overlayText += "Captures not supported with D3D9\n"; diff --git a/renderdoc/driver/gl/gl_common.cpp b/renderdoc/driver/gl/gl_common.cpp index 08ff9b8c8..c85f5ea90 100644 --- a/renderdoc/driver/gl/gl_common.cpp +++ b/renderdoc/driver/gl/gl_common.cpp @@ -75,7 +75,7 @@ bool CheckReplayContext() RDCLOG("Running GL replay on: %s / %s / %s", GL.glGetString(eGL_VENDOR), GL.glGetString(eGL_RENDERER), GL.glGetString(eGL_VERSION)); - string extensionString = ""; + std::string extensionString = ""; GLint numExts = 0; GL.glGetIntegerv(eGL_NUM_EXTENSIONS, &numExts); @@ -1718,70 +1718,6 @@ BlendOperation MakeBlendOp(GLenum op) return BlendOperation::Add; } -const char *BlendString(GLenum blendenum) -{ - switch(blendenum) - { - case eGL_FUNC_ADD: return "ADD"; - case eGL_FUNC_SUBTRACT: return "SUBTRACT"; - case eGL_FUNC_REVERSE_SUBTRACT: return "INV_SUBTRACT"; - case eGL_MIN: return "MIN"; - case eGL_MAX: return "MAX"; - case GL_ZERO: return "ZERO"; - case GL_ONE: return "ONE"; - case eGL_SRC_COLOR: return "SRC_COLOR"; - case eGL_ONE_MINUS_SRC_COLOR: return "INV_SRC_COLOR"; - case eGL_DST_COLOR: return "DST_COLOR"; - case eGL_ONE_MINUS_DST_COLOR: return "INV_DST_COLOR"; - case eGL_SRC_ALPHA: return "SRC_ALPHA"; - case eGL_ONE_MINUS_SRC_ALPHA: return "INV_SRC_ALPHA"; - case eGL_DST_ALPHA: return "DST_ALPHA"; - case eGL_ONE_MINUS_DST_ALPHA: return "INV_DST_ALPHA"; - case eGL_CONSTANT_COLOR: return "CONST_COLOR"; - case eGL_ONE_MINUS_CONSTANT_COLOR: return "INV_CONST_COLOR"; - case eGL_CONSTANT_ALPHA: return "CONST_ALPHA"; - case eGL_ONE_MINUS_CONSTANT_ALPHA: return "INV_CONST_ALPHA"; - case eGL_SRC_ALPHA_SATURATE: return "SRC_ALPHA_SAT"; - case eGL_SRC1_COLOR: return "SRC1_COL"; - case eGL_ONE_MINUS_SRC1_COLOR: return "INV_SRC1_COL"; - case eGL_SRC1_ALPHA: return "SRC1_ALPHA"; - case eGL_ONE_MINUS_SRC1_ALPHA: return "INV_SRC1_ALPHA"; - default: break; - } - - static string unknown = ToStr(blendenum).substr(3); // 3 = strlen("GL_"); - - RDCERR("Unknown blend enum: %s", unknown.c_str()); - - return unknown.c_str(); -} - -const char *SamplerString(GLenum smpenum) -{ - switch(smpenum) - { - case eGL_NONE: return "NONE"; - case eGL_NEAREST: return "NEAREST"; - case eGL_LINEAR: return "LINEAR"; - case eGL_NEAREST_MIPMAP_NEAREST: return "NEAREST_MIP_NEAREST"; - case eGL_LINEAR_MIPMAP_NEAREST: return "LINEAR_MIP_NEAREST"; - case eGL_NEAREST_MIPMAP_LINEAR: return "NEAREST_MIP_LINEAR"; - case eGL_LINEAR_MIPMAP_LINEAR: return "LINEAR_MIP_LINEAR"; - case eGL_CLAMP_TO_EDGE: return "CLAMP_EDGE"; - case eGL_MIRRORED_REPEAT: return "MIRR_REPEAT"; - case eGL_REPEAT: return "REPEAT"; - case eGL_MIRROR_CLAMP_TO_EDGE: return "MIRR_CLAMP_EDGE"; - case eGL_CLAMP_TO_BORDER: return "CLAMP_BORDER"; - default: break; - } - - static string unknown = ToStr(smpenum).substr(3); // 3 = strlen("GL_"); - - RDCERR("Unknown blend enum: %s", unknown.c_str()); - - return unknown.c_str(); -} - ResourceFormat MakeResourceFormat(GLenum target, GLenum fmt) { ResourceFormat ret; diff --git a/renderdoc/driver/gl/gl_common.h b/renderdoc/driver/gl/gl_common.h index a88806a8f..7e2bc6436 100644 --- a/renderdoc/driver/gl/gl_common.h +++ b/renderdoc/driver/gl/gl_common.h @@ -571,8 +571,6 @@ StencilOperation MakeStencilOp(GLenum op); LogicOperation MakeLogicOp(GLenum op); BlendMultiplier MakeBlendMultiplier(GLenum blend); BlendOperation MakeBlendOp(GLenum op); -const char *BlendString(GLenum blendenum); -const char *SamplerString(GLenum smpenum); void ClearGLErrors(); diff --git a/renderdoc/driver/gl/gl_debug.cpp b/renderdoc/driver/gl/gl_debug.cpp index 7705fcf90..531021512 100644 --- a/renderdoc/driver/gl/gl_debug.cpp +++ b/renderdoc/driver/gl/gl_debug.cpp @@ -373,8 +373,8 @@ void GLReplay::InitDebugData() for(int i = 0; i < 3; i++) { - string defines = string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n"; - defines += string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n"; + std::string defines = std::string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n"; + defines += std::string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n"; fs = GenerateGLSLShader(GetEmbeddedResource(glsl_texdisplay_frag), shaderType, glslBaseVer, defines + texSampleDefines); @@ -703,10 +703,10 @@ void GLReplay::InitDebugData() idx |= TEXDISPLAY_SINT_TEX; { - string defines; - defines += string("#define SHADER_RESTYPE ") + ToStr(t) + "\n"; - defines += string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n"; - defines += string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n"; + std::string defines; + defines += std::string("#define SHADER_RESTYPE ") + ToStr(t) + "\n"; + defines += std::string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n"; + defines += std::string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n"; defines += texSampleDefines; cs = GenerateGLSLShader(GetEmbeddedResource(glsl_minmaxtile_comp), shaderType, @@ -719,10 +719,10 @@ void GLReplay::InitDebugData() } { - string defines; - defines += string("#define SHADER_RESTYPE ") + ToStr(t) + "\n"; - defines += string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n"; - defines += string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n"; + std::string defines; + defines += std::string("#define SHADER_RESTYPE ") + ToStr(t) + "\n"; + defines += std::string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n"; + defines += std::string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n"; defines += texSampleDefines; cs = GenerateGLSLShader(GetEmbeddedResource(glsl_histogram_comp), shaderType, glslCSVer, @@ -736,10 +736,10 @@ void GLReplay::InitDebugData() if(t == 1) { - string defines; - defines += string("#define SHADER_RESTYPE ") + ToStr(t) + "\n"; - defines += string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n"; - defines += string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n"; + std::string defines; + defines += std::string("#define SHADER_RESTYPE ") + ToStr(t) + "\n"; + defines += std::string("#define UINT_TEX ") + (i == 1 ? "1" : "0") + "\n"; + defines += std::string("#define SINT_TEX ") + (i == 2 ? "1" : "0") + "\n"; cs = GenerateGLSLShader(GetEmbeddedResource(glsl_minmaxresult_comp), shaderType, glslCSVer, defines); diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp index cb5003842..fb022d8c6 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 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; + vector implExts; int ctxVersion = 0; bool ctxGLES = false; @@ -1217,7 +1217,7 @@ void WrappedOpenGL::ActivateContext(GLWindowingData winData) } else if(GL.glGetString) { - string implExtString = (const char *)GL.glGetString(eGL_EXTENSIONS); + std::string implExtString = (const char *)GL.glGetString(eGL_EXTENSIONS); split(implExtString, implExts, ' '); } @@ -1232,8 +1232,8 @@ void WrappedOpenGL::ActivateContext(GLWindowingData winData) { for(size_t i = 0, j = 0; i < implExts.size() && j < globalExts.size();) { - const string &a = implExts[i]; - const string &b = globalExts[j]; + const std::string &a = implExts[i]; + const std::string &b = globalExts[j]; if(a == b) { @@ -1739,7 +1739,8 @@ void WrappedOpenGL::SwapBuffers(void *windowHandle) int flags = activeWindow ? RenderDoc::eOverlay_ActiveWindow : 0; if(ctxdata.Legacy()) flags |= RenderDoc::eOverlay_CaptureDisabled; - string overlayText = RenderDoc::Inst().GetOverlayText(GetDriverType(), m_FrameCounter, flags); + std::string overlayText = + RenderDoc::Inst().GetOverlayText(GetDriverType(), m_FrameCounter, flags); if(ctxdata.Legacy()) { @@ -2613,7 +2614,7 @@ void WrappedOpenGL::DebugSnoop(GLenum source, GLenum type, GLuint id, GLenum sev msg.eventId = 0; msg.messageID = id; - msg.description = string(message, message + length); + msg.description = std::string(message, message + length); msg.source = MessageSource::API; switch(severity) diff --git a/renderdoc/driver/gl/gl_driver.h b/renderdoc/driver/gl/gl_driver.h index 8a224a674..b11789314 100644 --- a/renderdoc/driver/gl/gl_driver.h +++ b/renderdoc/driver/gl/gl_driver.h @@ -86,7 +86,7 @@ private: void Serialise_DebugMessages(SerialiserType &ser); vector GetDebugMessages(); - string m_DebugMsgContext; + std::string m_DebugMsgContext; bool m_SuppressDebugMessages; @@ -382,8 +382,8 @@ private: float CharAspect; // extensions - vector glExts; - string glExtsString; + vector glExts; + std::string glExtsString; // state GLResourceRecord *m_BufferRecord[16]; @@ -505,8 +505,8 @@ private: void BuildGLExtensions(); void BuildGLESExtensions(); - vector m_GLExtensions; - vector m_GLESExtensions; + vector m_GLExtensions; + vector m_GLESExtensions; std::set m_UnsafeDraws; @@ -605,8 +605,8 @@ public: { ShaderData() : type(eGL_NONE), version(0) {} GLenum type; - vector sources; - vector includepaths; + vector sources; + vector includepaths; SPVModule spirv; std::string disassembly; ShaderReflection reflection; diff --git a/renderdoc/driver/gl/gl_postvs.cpp b/renderdoc/driver/gl/gl_postvs.cpp index 85d6447c8..881328767 100644 --- a/renderdoc/driver/gl/gl_postvs.cpp +++ b/renderdoc/driver/gl/gl_postvs.cpp @@ -264,7 +264,7 @@ void GLReplay::InitPostVSBuffers(uint32_t eventId) if(dummyFrag) drv.glAttachShader(feedbackProg, dummyFrag); - list matrixVaryings; // matrices need some fixup + list matrixVaryings; // matrices need some fixup vector varyings; CopyProgramAttribBindings(stageSrcPrograms[0], feedbackProg, vsRefl); @@ -293,7 +293,7 @@ void GLReplay::InitPostVSBuffers(uint32_t eventId) } else { - matrixVaryings.push_back(string(name, colon)); + matrixVaryings.push_back(std::string(name, colon)); name = matrixVaryings.back().c_str(); } } diff --git a/renderdoc/driver/gl/gl_program_iterate.cpp b/renderdoc/driver/gl/gl_program_iterate.cpp index a6bfa651c..4ec795257 100644 --- a/renderdoc/driver/gl/gl_program_iterate.cpp +++ b/renderdoc/driver/gl/gl_program_iterate.cpp @@ -331,7 +331,7 @@ static void ForAllProgramUniforms(SerialiserType *ser, CaptureState state, GLuin GLenum type = eGL_NONE; int32_t arraySize = 0; int32_t srcLocation = 0; - string basename; + std::string basename; bool isArray = false; GL.glGetProgramResourceiv(progSrc, eGL_UNIFORM, i, numProps, resProps, numProps, NULL, values); diff --git a/renderdoc/driver/gl/gl_rendertext.cpp b/renderdoc/driver/gl/gl_rendertext.cpp index b1cd25f83..e93af8f02 100644 --- a/renderdoc/driver/gl/gl_rendertext.cpp +++ b/renderdoc/driver/gl/gl_rendertext.cpp @@ -49,7 +49,7 @@ void WrappedOpenGL::ContextData::CreateDebugData() // otherwise we fall back to immediate mode rendering by hand if(GL.glGetIntegerv && GL.glGenTextures && GL.glBindTexture && GL.glTexImage2D && GL.glTexParameteri) { - string ttfstring = GetEmbeddedResource(sourcecodepro_ttf); + std::string ttfstring = GetEmbeddedResource(sourcecodepro_ttf); byte *ttfdata = (byte *)ttfstring.c_str(); byte *buf = new byte[FONT_TEX_WIDTH * FONT_TEX_HEIGHT]; @@ -150,8 +150,8 @@ void WrappedOpenGL::ContextData::CreateDebugData() GL.glGetShaderInfoLog && GL.glDeleteShader && GL.glCreateProgram && GL.glAttachShader && GL.glLinkProgram && GL.glGetProgramiv && GL.glGetProgramInfoLog) { - string vs; - string fs; + std::string vs; + std::string fs; ShaderType shaderType; int glslVersion; diff --git a/renderdoc/driver/gl/gl_replay.cpp b/renderdoc/driver/gl/gl_replay.cpp index 9acc971f8..790243810 100644 --- a/renderdoc/driver/gl/gl_replay.cpp +++ b/renderdoc/driver/gl/gl_replay.cpp @@ -732,9 +732,9 @@ ShaderReflection *GLReplay::GetShader(ResourceId shader, ShaderEntryPoint entry) return &shaderDetails.reflection; } -vector GLReplay::GetDisassemblyTargets() +vector GLReplay::GetDisassemblyTargets() { - vector ret; + vector ret; // default is always first ret.insert(ret.begin(), SPIRVDisassemblyTarget); @@ -742,8 +742,8 @@ vector GLReplay::GetDisassemblyTargets() return ret; } -string GLReplay::DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, - const string &target) +std::string GLReplay::DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, + const std::string &target) { auto &shaderDetails = m_pDriver->m_Shaders[m_pDriver->GetResourceManager()->GetLiveID(refl->resourceId)]; @@ -2143,7 +2143,7 @@ void GLReplay::OpenGLFillCBufferVariables(GLuint prog, bool bufferBacked, std::s } } -void GLReplay::FillCBufferVariables(ResourceId shader, string entryPoint, uint32_t cbufSlot, +void GLReplay::FillCBufferVariables(ResourceId shader, std::string entryPoint, uint32_t cbufSlot, rdcarray &outvars, const bytebuf &data) { WrappedOpenGL &drv = *m_pDriver; @@ -2727,8 +2727,9 @@ void GLReplay::GetTextureData(ResourceId tex, uint32_t arrayIdx, uint32_t mip, drv.glDeleteTextures(1, &tempTex); } -void GLReplay::BuildCustomShader(string source, string entry, const ShaderCompileFlags &compileFlags, - ShaderStage type, ResourceId *id, string *errors) +void GLReplay::BuildCustomShader(std::string source, std::string entry, + const ShaderCompileFlags &compileFlags, ShaderStage type, + ResourceId *id, std::string *errors) { if(id == NULL || errors == NULL) { @@ -2881,9 +2882,9 @@ void GLReplay::FreeCustomShader(ResourceId id) m_pDriver->glDeleteShader(m_pDriver->GetResourceManager()->GetCurrentResource(id).name); } -void GLReplay::BuildTargetShader(ShaderEncoding sourceEncoding, bytebuf source, string entry, +void GLReplay::BuildTargetShader(ShaderEncoding sourceEncoding, bytebuf source, std::string entry, const ShaderCompileFlags &compileFlags, ShaderStage type, - ResourceId *id, string *errors) + ResourceId *id, std::string *errors) { if(id == NULL || errors == NULL) { diff --git a/renderdoc/driver/gl/gl_replay.h b/renderdoc/driver/gl/gl_replay.h index 9b76aec19..51c97be5e 100644 --- a/renderdoc/driver/gl/gl_replay.h +++ b/renderdoc/driver/gl/gl_replay.h @@ -107,8 +107,9 @@ public: rdcarray GetShaderEntryPoints(ResourceId shader); ShaderReflection *GetShader(ResourceId shader, ShaderEntryPoint entry); - vector GetDisassemblyTargets(); - string DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, const string &target); + vector GetDisassemblyTargets(); + std::string DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, + const std::string &target); vector GetDebugMessages(); @@ -172,11 +173,12 @@ public: void RenderMesh(uint32_t eventId, const vector &secondaryDraws, const MeshDisplay &cfg); rdcarray GetTargetShaderEncodings() { return {ShaderEncoding::GLSL}; } - void BuildTargetShader(ShaderEncoding sourceEncoding, bytebuf source, string entry, + void BuildTargetShader(ShaderEncoding sourceEncoding, bytebuf source, std::string entry, const ShaderCompileFlags &compileFlags, ShaderStage type, ResourceId *id, - string *errors); - void BuildCustomShader(string source, string entry, const ShaderCompileFlags &compileFlags, - ShaderStage type, ResourceId *id, string *errors); + std::string *errors); + void BuildCustomShader(std::string source, std::string entry, + const ShaderCompileFlags &compileFlags, ShaderStage type, ResourceId *id, + std::string *errors); void FreeCustomShader(ResourceId id); enum TexDisplayFlags @@ -192,7 +194,7 @@ public: void RenderHighlightBox(float w, float h, float scale); - void FillCBufferVariables(ResourceId shader, string entryPoint, uint32_t cbufSlot, + void FillCBufferVariables(ResourceId shader, std::string entryPoint, uint32_t cbufSlot, rdcarray &outvars, const bytebuf &data); vector PixelHistory(vector events, ResourceId target, uint32_t x, diff --git a/renderdoc/driver/gl/gl_shader_refl.cpp b/renderdoc/driver/gl/gl_shader_refl.cpp index af94314ee..9aa7aaeb2 100644 --- a/renderdoc/driver/gl/gl_shader_refl.cpp +++ b/renderdoc/driver/gl/gl_shader_refl.cpp @@ -96,7 +96,7 @@ void CheckVertexOutputUses(const std::vector &sources, { offs = s.find(name, offs); - if(offs == string::npos) + if(offs == std::string::npos) break; while(offs < s.length()) @@ -179,12 +179,12 @@ 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, vector sources, + 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"}; - string blocks[2] = {"", ""}; + std::string blocks[2] = {"", ""}; if(type == eGL_VERTEX_SHADER) { @@ -285,13 +285,13 @@ GLuint MakeSeparableShaderProgram(WrappedOpenGL &drv, GLenum type, vector globalUniforms; GLint numUBOs = 0; - vector uboNames; + vector uboNames; rdcarray *ubos = NULL; { diff --git a/renderdoc/driver/gl/gl_shader_refl.h b/renderdoc/driver/gl/gl_shader_refl.h index 93f7308e5..6a1fc04a7 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); + vector *includepaths); void CheckVertexOutputUses(const std::vector &sources, FixedFunctionVertexOutputs &outputUsage); diff --git a/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp index 8e533176a..cc34be897 100644 --- a/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp @@ -2368,7 +2368,7 @@ GLboolean WrappedOpenGL::glUnmapNamedBufferEXT(GLuint buffer) { if(!record->VerifyShadowStorage()) { - string msg = StringFormat::Fmt( + std::string msg = StringFormat::Fmt( "Overwrite of %llu byte Map()'d buffer detected\n" "Breakpoint now to see callstack,\nor click 'Yes' to debugbreak.", record->Length); diff --git a/renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp index 4b12476b8..e2adfba6a 100644 --- a/renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp @@ -91,7 +91,7 @@ void WrappedOpenGL::ShaderData::ProcessCompilation(WrappedOpenGL &drv, ResourceI entryPoint = "main"; - string concatenated; + std::string concatenated; for(size_t i = 0; i < sources.size(); i++) { @@ -267,7 +267,7 @@ void WrappedOpenGL::ShaderData::ProcessCompilation(WrappedOpenGL &drv, ResourceI SPIRVCompilationSettings settings(SPIRVSourceLanguage::OpenGLGLSL, SPIRVShaderStage(ShaderIdx(type))); - string s = CompileSPIRV(settings, sources, spirvwords); + std::string s = CompileSPIRV(settings, sources, spirvwords); if(!spirvwords.empty()) ParseSPIRV(&spirvwords.front(), spirvwords.size(), spirv); else diff --git a/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp index c25c9640f..09d27018a 100644 --- a/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp @@ -3048,7 +3048,7 @@ void WrappedOpenGL::StoreCompressedTexData(ResourceId texId, GLenum target, GLin if(srcPixels) { - string error; + std::string error; // Only the trivial case is handled yet. if(xoffset == 0 && yoffset == 0) diff --git a/renderdoc/driver/ihv/amd/amd_isa.cpp b/renderdoc/driver/ihv/amd/amd_isa.cpp index d764d5fcc..dd3bcf76b 100644 --- a/renderdoc/driver/ihv/amd/amd_isa.cpp +++ b/renderdoc/driver/ihv/amd/amd_isa.cpp @@ -355,7 +355,7 @@ std::string DisassembleGLSL(ShaderStage stage, const bytebuf &shaderBytes, const Process::ProcessResult result = {}; Process::LaunchProcess(vc.c_str(), get_dirname(vc).c_str(), cmdLine.c_str(), true, &result); - if(result.retCode != 0 || result.strStdout.find("Error") != string::npos || + if(result.retCode != 0 || result.strStdout.find("Error") != std::string::npos || result.strStdout.empty() || !FileIO::exists(outPath.c_str())) { return "; Failed to Disassemble - check AMD driver is currently running\n\n; " + result.strStdout; diff --git a/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp b/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp index d6e36b384..7fda8bf65 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp +++ b/renderdoc/driver/shaders/dxbc/dxbc_debug.cpp @@ -1863,7 +1863,7 @@ State State::GetNext(GlobalState &global, State quad[4]) const case OPCODE_LOG: case OPCODE_SINCOS: { - string csProgram = + std::string csProgram = "RWBuffer outval : register(u0);\n" "cbuffer srcOper : register(b0) { float4 inval; };\n" "[numthreads(1, 1, 1)]\n" @@ -3708,9 +3708,9 @@ State State::GetNext(GlobalState &global, State quad[4]) const case OPCODE_GATHER4_PO_C: case OPCODE_LOD: { - string sampler = ""; - string texture = ""; - string funcRet = ""; + std::string sampler = ""; + std::string texture = ""; + std::string funcRet = ""; DXGI_FORMAT retFmt = DXGI_FORMAT_UNKNOWN; if(op.operation != OPCODE_LOD) @@ -4074,7 +4074,7 @@ State State::GetNext(GlobalState &global, State quad[4]) const break; } - string sampleProgram; + std::string sampleProgram; char buf[256] = {0}; char buf2[256] = {0}; @@ -4222,18 +4222,18 @@ State State::GetNext(GlobalState &global, State quad[4]) const ddyCalc.value.i.x, ddyCalc.value.i.y, ddyCalc.value.i.z, ddyCalc.value.i.w); - string texcoords = buf; - string ddx = buf2; - string ddy = buf3; + std::string texcoords = buf; + std::string ddx = buf2; + std::string ddy = buf3; if(op.operation == OPCODE_LD_MS) { StringFormat::snprintf(buf, 255, formats[0][1], srcOpers[2].value.i.x); } - string sampleIdx = buf; + std::string sampleIdx = buf; - string offsets = ""; + std::string offsets = ""; if(useOffsets) { @@ -4249,7 +4249,7 @@ State State::GetNext(GlobalState &global, State quad[4]) const offsets = buf; } - string swizzle = "."; + std::string swizzle = "."; char elems[] = "xyzw"; @@ -4274,7 +4274,7 @@ State State::GetNext(GlobalState &global, State quad[4]) const } } - string vsProgram = "float4 main(uint id : SV_VertexID) : SV_Position {\n"; + std::string vsProgram = "float4 main(uint id : SV_VertexID) : SV_Position {\n"; vsProgram += "return float4((id == 2) ? 3.0f : -1.0f, (id == 0) ? -3.0f : 1.0f, 0.5, 1.0);\n"; vsProgram += "}"; @@ -4313,7 +4313,7 @@ State State::GetNext(GlobalState &global, State quad[4]) const // these operations need derivatives but have no hlsl function to call to provide them, so // we fake it in the vertex shader - string uvDim = "1"; + std::string uvDim = "1"; uvDim[0] += char(texdim + texdimOffs - 1); vsProgram = "void main(uint id : SV_VertexID, out float4 pos : SV_Position, out float" + @@ -4324,19 +4324,19 @@ State State::GetNext(GlobalState &global, State quad[4]) const uv.value.f.x + ddyCalc.value.f.x * 2.0f, uv.value.f.y + ddyCalc.value.f.y * 2.0f, uv.value.f.z + ddyCalc.value.f.z * 2.0f, uv.value.f.w + ddyCalc.value.f.w * 2.0f); - vsProgram += "if(id == 0) uv = " + string(buf) + ";\n"; + vsProgram += "if(id == 0) uv = " + std::string(buf) + ";\n"; StringFormat::snprintf(buf, 255, formats[texdim + texdimOffs - 1][texcoordType], uv.value.f.x, uv.value.f.y, uv.value.f.z, uv.value.f.w); - vsProgram += "if(id == 1) uv = " + string(buf) + ";\n"; + vsProgram += "if(id == 1) uv = " + std::string(buf) + ";\n"; StringFormat::snprintf( buf, 255, formats[texdim + texdimOffs - 1][texcoordType], uv.value.f.x + ddxCalc.value.f.x * 2.0f, uv.value.f.y + ddxCalc.value.f.y * 2.0f, uv.value.f.z + ddxCalc.value.f.z * 2.0f, uv.value.f.w + ddxCalc.value.f.w * 2.0f); - vsProgram += "if(id == 2) uv = " + string(buf) + ";\n"; + vsProgram += "if(id == 2) uv = " + std::string(buf) + ";\n"; vsProgram += "pos = float4((id == 2) ? 3.0f : -1.0f, (id == 0) ? -3.0f : 1.0f, 0.5, 1.0);\n"; @@ -4351,7 +4351,7 @@ State State::GetNext(GlobalState &global, State quad[4]) const sampleProgram += funcRet + " main(float4 pos : SV_Position, float" + uvDim + " uv : uvs) : SV_Target0\n{\n"; sampleProgram += - "return t.SampleCmpLevelZero(s, uv, " + string(buf) + offsets + ").xxxx;"; + "return t.SampleCmpLevelZero(s, uv, " + std::string(buf) + offsets + ").xxxx;"; sampleProgram += "\n}\n"; } else if(op.operation == OPCODE_LOD) @@ -4395,7 +4395,7 @@ State State::GetNext(GlobalState &global, State quad[4]) const sampleProgram = texture + " : register(t0);\n" + sampler + " : register(s0);\n\n"; sampleProgram += funcRet + " main() : SV_Target0\n{\nreturn "; sampleProgram += - "t.Gather" + string(channel) + "(s, " + texcoords + offsets + ")" + swizzle + ";"; + "t.Gather" + std::string(channel) + "(s, " + texcoords + offsets + ")" + swizzle + ";"; sampleProgram += "\n}\n"; } else if(op.operation == OPCODE_GATHER4_C || op.operation == OPCODE_GATHER4_PO_C) @@ -4408,7 +4408,7 @@ State State::GetNext(GlobalState &global, State quad[4]) const sampleProgram = texture + " : register(t0);\n" + sampler + " : register(s0);\n\n"; sampleProgram += funcRet + " main() : SV_Target0\n{\nreturn "; - sampleProgram += "t.GatherCmp" + string(channel) + "(s, " + texcoords + buf + offsets + + sampleProgram += "t.GatherCmp" + std::string(channel) + "(s, " + texcoords + buf + offsets + ")" + swizzle + ";"; sampleProgram += "\n}\n"; } diff --git a/renderdoc/driver/shaders/dxbc/dxbc_disassemble.cpp b/renderdoc/driver/shaders/dxbc/dxbc_disassemble.cpp index 498c2d406..431e8d75d 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_disassemble.cpp +++ b/renderdoc/driver/shaders/dxbc/dxbc_disassemble.cpp @@ -248,7 +248,7 @@ static MaskedElement MinPrecision; static MaskedElement NonUniform; }; -string toString(const uint32_t values[], uint32_t numComps); +std::string toString(const uint32_t values[], uint32_t numComps); char *toString(OpcodeType op); char *toString(ResourceDimension dim); char *toString(ResourceRetType type); @@ -549,7 +549,7 @@ void DXBCFile::MakeDisassemblyString() (lineInfo.fileIndex != prevLineInfo.fileIndex || lineInfo.lineStart != prevLineInfo.lineStart)) { - string line = ""; + std::string line = ""; if(lineInfo.fileIndex >= (int32_t)fileLines.size()) { line = "Unknown file"; @@ -572,7 +572,7 @@ void DXBCFile::MakeDisassemblyString() size_t startLine = line.find_first_not_of(" \t"); - if(startLine != string::npos) + if(startLine != std::string::npos) line = line.substr(startLine); m_Disassembly += "\n"; @@ -837,9 +837,9 @@ const CBufferVariable *FindCBufferVar(const uint32_t minOffset, const uint32_t m return NULL; } -string ASMOperand::toString(DXBCFile *dxbc, ToString flags) const +std::string ASMOperand::toString(DXBCFile *dxbc, ToString flags) const { - string str, regstr; + std::string str, regstr; const bool decl = flags & ToString::IsDecl; const bool swizzle = flags & ToString::ShowSwizzle; @@ -2205,7 +2205,7 @@ bool DXBCFile::ExtractOperation(uint32_t *&tokenStream, ASMOperation &retOp, boo RDCASSERT(ret); } - string formatString = (char *)&tokenStream[0]; + std::string formatString = (char *)&tokenStream[0]; retOp.str = (messageFormat ? "errorf" : "error"); retOp.str += " \"" + formatString + "\""; @@ -2618,9 +2618,9 @@ size_t DXBCFile::NumOperands(OpcodeType op) return 0xffffffff; } -string toString(const uint32_t values[], uint32_t numComps) +std::string toString(const uint32_t values[], uint32_t numComps) { - string str = ""; + std::string str = ""; // fxc actually guesses these types it seems. // try setting an int value to 1085276160, it will be displayed in disasm as 5.500000. diff --git a/renderdoc/driver/shaders/dxbc/dxbc_disassemble.h b/renderdoc/driver/shaders/dxbc/dxbc_disassemble.h index e7c7b0730..5a10eaf96 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_disassemble.h +++ b/renderdoc/driver/shaders/dxbc/dxbc_disassemble.h @@ -32,7 +32,6 @@ #include "driver/dx/official/d3dcommon.h" using std::vector; -using std::string; namespace DXBC { @@ -724,7 +723,7 @@ struct ASMOperand bool operator==(const ASMOperand &o) const; - string toString(DXBCFile *dxbc, ToString flags) const; + std::string toString(DXBCFile *dxbc, ToString flags) const; /////////////////////////////////////// @@ -784,7 +783,7 @@ struct ASMIndex return false; } - string str; + std::string str; /////////////////////////////////////// @@ -843,7 +842,7 @@ struct ASMDecl numTypes = 0; } - string str; + std::string str; /////////////////////////////////////// @@ -970,7 +969,7 @@ struct ASMOperation resType[0] = resType[1] = resType[2] = resType[3] = RETURN_TYPE_UNUSED; } - string str; + std::string str; /////////////////////////////////////// diff --git a/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp b/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp index a5476233e..81952197d 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp +++ b/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp @@ -291,9 +291,9 @@ ShaderBuiltin GetSystemValue(SVSemantic systemValue) return ShaderBuiltin::Undefined; } -string TypeName(CBufferVariableType::Descriptor desc) +std::string TypeName(CBufferVariableType::Descriptor desc) { - string ret; + std::string ret; char *type = ""; switch(desc.type) @@ -378,18 +378,18 @@ CBufferVariableType DXBCFile::ParseRDEFType(RDEFHeader *h, char *chunkContents, { if(h->targetVersion >= 0x500 && type->nameOffset > 0) { - ret.descriptor.name += " " + string(chunkContents + type->nameOffset); + ret.descriptor.name += " " + std::string(chunkContents + type->nameOffset); } else { char buf[64] = {0}; StringFormat::snprintf(buf, 63, "unnamed_iface_0x%08x", typeOffset); - ret.descriptor.name += " " + string(buf); + ret.descriptor.name += " " + std::string(buf); } } // rename unnamed structs to have valid identifiers as type name - if(ret.descriptor.name.find("") != string::npos) + if(ret.descriptor.name.find("") != std::string::npos) { if(h->targetVersion >= 0x500 && type->nameOffset > 0) { @@ -497,9 +497,9 @@ bool DXBCFile::CheckForDebugInfo(const void *ByteCode, size_t ByteCodeLength) return false; } -string DXBCFile::GetDebugBinaryPath(const void *ByteCode, size_t ByteCodeLength) +std::string DXBCFile::GetDebugBinaryPath(const void *ByteCode, size_t ByteCodeLength) { - string debugPath; + std::string debugPath; FileHeader *header = (FileHeader *)ByteCode; char *data = (char *)ByteCode; // just for convenience @@ -612,7 +612,7 @@ DXBCFile::DXBCFile(const void *ByteCode, size_t ByteCodeLength) uint32_t reg, space, bindCount; }; - std::map cbufferbinds; + std::map cbufferbinds; uint32_t resourceStride = sizeof(RDEFResource); @@ -651,7 +651,7 @@ DXBCFile::DXBCFile(const void *ByteCode, size_t ByteCodeLength) // and append _s onto each subsequent buffer name if(desc.IsCBuffer()) { - string cname = desc.name; + std::string cname = desc.name; while(cbufferbinds.find(cname) != cbufferbinds.end()) cname += "_"; @@ -707,7 +707,7 @@ DXBCFile::DXBCFile(const void *ByteCode, size_t ByteCodeLength) // it's pointing at end(). size_t itIdx = it - resArray.begin(); - string rname = desc.name; + std::string rname = desc.name; uint32_t arraySize = desc.bindCount; desc.bindCount = 1; @@ -811,7 +811,7 @@ DXBCFile::DXBCFile(const void *ByteCode, size_t ByteCodeLength) cb.variables.push_back(v); } - string cname = cb.name; + std::string cname = cb.name; while(cbuffernames.find(cname) != cbuffernames.end()) cname += "_"; @@ -1251,7 +1251,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(vector()); dstFile = &fileLines.back(); } diff --git a/renderdoc/driver/shaders/dxbc/dxbc_inspect.h b/renderdoc/driver/shaders/dxbc/dxbc_inspect.h index 1032c7f76..076db76d7 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_inspect.h +++ b/renderdoc/driver/shaders/dxbc/dxbc_inspect.h @@ -35,7 +35,6 @@ using std::vector; using std::pair; -using std::string; // matches D3D11_SHADER_VERSION_TYPE from d3d11shader.h enum D3D11_ShaderType @@ -118,7 +117,7 @@ enum VariableType struct ShaderInputBind { - string name; + std::string name; enum InputType { @@ -258,7 +257,7 @@ struct CBufferVariableType uint32_t elements; uint32_t members; uint32_t bytesize; - string name; + std::string name; } descriptor; // if a struct, these are variables for each member (this can obviously nest). Not all @@ -269,11 +268,11 @@ struct CBufferVariableType struct CBufferVariable { - string name; + std::string name; struct { - string name; + std::string name; uint32_t offset; // offset in parent (cbuffer or nested struct) uint32_t flags; std::vector defaultValue; @@ -289,7 +288,7 @@ struct CBufferVariable struct CBuffer { - string name; + std::string name; uint32_t space; uint32_t reg; @@ -297,7 +296,7 @@ struct CBuffer struct Descriptor { - string name; + std::string name; enum Type { @@ -321,13 +320,13 @@ class DXBCDebugChunk { public: virtual ~DXBCDebugChunk() {} - virtual string GetCompilerSig() const = 0; - virtual string GetEntryFunction() const = 0; - virtual string GetShaderProfile() const = 0; + virtual std::string GetCompilerSig() const = 0; + virtual std::string GetEntryFunction() const = 0; + virtual std::string GetShaderProfile() const = 0; virtual uint32_t GetShaderCompileFlags() const = 0; - vector > Files; // + vector > Files; // virtual void GetLineInfo(size_t instruction, uintptr_t offset, LineColumnInfo &lineInfo) const = 0; @@ -368,7 +367,7 @@ public: CBuffer m_Interfaces; - std::map m_ResourceBinds; + std::map m_ResourceBinds; vector m_InputSig; vector m_OutputSig; @@ -380,7 +379,7 @@ public: vector m_ShaderBlob; - const string &GetDisassembly() + const std::string &GetDisassembly() { if(m_Disassembly.empty()) MakeDisassemblyString(); @@ -396,7 +395,7 @@ public: static void GetHash(uint32_t hash[4], const void *ByteCode, size_t BytecodeLength); static bool CheckForDebugInfo(const void *ByteCode, size_t ByteCodeLength); - static string GetDebugBinaryPath(const void *ByteCode, size_t ByteCodeLength); + static std::string GetDebugBinaryPath(const void *ByteCode, size_t ByteCodeLength); private: DXBCFile(const DXBCFile &o); @@ -425,7 +424,7 @@ private: m_Declarations; // declarations of inputs, outputs, constant buffers, temp registers etc. vector m_Instructions; - string m_Disassembly; + std::string m_Disassembly; }; }; // namespace DXBC diff --git a/renderdoc/driver/shaders/dxbc/dxbc_reflect.cpp b/renderdoc/driver/shaders/dxbc/dxbc_reflect.cpp index f41f25ba7..e6c235a75 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_reflect.cpp +++ b/renderdoc/driver/shaders/dxbc/dxbc_reflect.cpp @@ -148,7 +148,7 @@ static void MakeResourceList(bool srv, DXBC::DXBCFile *dxbc, const vectordebugInfo.files[i].contents = dxbc->m_DebugInfo->Files[i].second; } - string entry = dxbc->m_DebugInfo->GetEntryFunction(); + std::string entry = dxbc->m_DebugInfo->GetEntryFunction(); if(entry.empty()) entry = "main"; diff --git a/renderdoc/driver/shaders/dxbc/dxbc_sdbg.cpp b/renderdoc/driver/shaders/dxbc/dxbc_sdbg.cpp index 5e7627f6f..c467ccaf8 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_sdbg.cpp +++ b/renderdoc/driver/shaders/dxbc/dxbc_sdbg.cpp @@ -87,9 +87,10 @@ SDBGChunk::SDBGChunk(void *data) for(size_t i = 0; i < m_FileHeaders.size(); i++) { - string filename = - string(asciiDatabase + m_FileHeaders[i].filenameOffset, m_FileHeaders[i].filenameLen); - string source = string(asciiDatabase + m_FileHeaders[i].sourceOffset, m_FileHeaders[i].sourceLen); + std::string filename = + std::string(asciiDatabase + m_FileHeaders[i].filenameOffset, m_FileHeaders[i].filenameLen); + std::string source = + std::string(asciiDatabase + m_FileHeaders[i].sourceOffset, m_FileHeaders[i].sourceLen); this->Files.push_back(make_pair(filename, source)); } @@ -127,7 +128,7 @@ void SDBGChunk::GetLocals(size_t instruction, uintptr_t offset, { } -string SDBGChunk::GetSymbolName(int symbolID) +std::string SDBGChunk::GetSymbolName(int symbolID) { RDCASSERT(symbolID >= 0 && symbolID < (int)m_SymbolTable.size()); @@ -136,14 +137,14 @@ string SDBGChunk::GetSymbolName(int symbolID) return GetSymbolName(sym.symbol.offset, sym.symbol.count); } -string SDBGChunk::GetSymbolName(int32_t symbolOffset, int32_t symbolLength) +std::string SDBGChunk::GetSymbolName(int32_t symbolOffset, int32_t symbolLength) { RDCASSERT(symbolOffset < m_Header.compilerSigOffset); RDCASSERT(symbolOffset + symbolLength <= m_Header.compilerSigOffset); int32_t offset = sizeof(m_Header) + m_Header.asciiDBOffset + symbolOffset; - return string(&m_RawData[offset], symbolLength); + return std::string(&m_RawData[offset], symbolLength); } }; // namespace DXBC \ No newline at end of file diff --git a/renderdoc/driver/shaders/dxbc/dxbc_sdbg.h b/renderdoc/driver/shaders/dxbc/dxbc_sdbg.h index c9a7fcf02..341b5b71c 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_sdbg.h +++ b/renderdoc/driver/shaders/dxbc/dxbc_sdbg.h @@ -29,7 +29,6 @@ #include using std::vector; using std::pair; -using std::string; #pragma once @@ -255,9 +254,9 @@ class SDBGChunk : public DXBCDebugChunk public: SDBGChunk(void *data); - string GetCompilerSig() const { return m_CompilerSig; } - string GetEntryFunction() const { return m_Entry; } - string GetShaderProfile() const { return m_Profile; } + std::string GetCompilerSig() const { return m_CompilerSig; } + std::string GetEntryFunction() const { return m_Entry; } + std::string GetShaderProfile() const { return m_Profile; } uint32_t GetShaderCompileFlags() const { return m_ShaderFlags; } void GetLineInfo(size_t instruction, uintptr_t offset, LineColumnInfo &lineInfo) const; @@ -271,8 +270,8 @@ private: bool m_HasDebugInfo; - string GetSymbolName(int symbolID); - string GetSymbolName(int32_t symbolOffset, int32_t symbolLength); + std::string GetSymbolName(int symbolID); + std::string GetSymbolName(int32_t symbolOffset, int32_t symbolLength); vector m_Instructions; vector m_Variables; @@ -284,9 +283,9 @@ private: uint32_t m_ShaderFlags; - string m_CompilerSig; - string m_Entry; - string m_Profile; + std::string m_CompilerSig; + std::string m_Entry; + std::string m_Profile; // these don't need to be exposed, a more processed and friendly // version is exposed diff --git a/renderdoc/driver/shaders/dxbc/dxbc_spdb.cpp b/renderdoc/driver/shaders/dxbc/dxbc_spdb.cpp index 396c1772b..71e18f2b0 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_spdb.cpp +++ b/renderdoc/driver/shaders/dxbc/dxbc_spdb.cpp @@ -132,7 +132,7 @@ SPDBChunk::SPDBChunk(DXBCFile *dxbc, void *chunk) RDCASSERT(hashtable[0] == 0); hashtable++; - std::map StreamNames; + std::map StreamNames; uint32_t numset = 0; for(uint32_t i = 0; i < maxBit; i++) @@ -675,7 +675,7 @@ SPDBChunk::SPDBChunk(DXBCFile *dxbc, void *chunk) m_Functions[0] = mainFunc; } - std::map Names; + std::map Names; if(StreamNames.find("/names") != StreamNames.end()) { @@ -728,7 +728,7 @@ SPDBChunk::SPDBChunk(DXBCFile *dxbc, void *chunk) while(cur < end) { DBIModule *mod = (DBIModule *)cur; - cur += sizeof(DBIModule) - sizeof(string) * 2; + cur += sizeof(DBIModule) - sizeof(std::string) * 2; char *moduleName = (char *)cur; cur += strlen(moduleName) + 1; @@ -741,7 +741,7 @@ SPDBChunk::SPDBChunk(DXBCFile *dxbc, void *chunk) cur++; DBIModule m; - memcpy(&m, mod, sizeof(DBIModule) - sizeof(string) * 2); + memcpy(&m, mod, sizeof(DBIModule) - sizeof(std::string) * 2); m.moduleName = moduleName; m.objectName = objectName; @@ -865,7 +865,7 @@ SPDBChunk::SPDBChunk(DXBCFile *dxbc, void *chunk) } else if(!strcmp(key, "hlslDefines")) { - string cmdlineDefines = "// Command line defines:\n\n"; + std::string cmdlineDefines = "// Command line defines:\n\n"; char *c = value; @@ -912,13 +912,14 @@ SPDBChunk::SPDBChunk(DXBCFile *dxbc, void *chunk) char *valend = c; cmdlineDefines += "#define "; - cmdlineDefines += string(defstart, defend) + " " + string(valstart, valend); + cmdlineDefines += + std::string(defstart, defend) + " " + std::string(valstart, valend); cmdlineDefines += "\n"; } else { cmdlineDefines += "#define "; - cmdlineDefines += string(defstart, defend); + cmdlineDefines += std::string(defstart, defend); cmdlineDefines += "\n"; } } diff --git a/renderdoc/driver/shaders/dxbc/dxbc_spdb.h b/renderdoc/driver/shaders/dxbc/dxbc_spdb.h index 0f04b4e66..3592c2bb1 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_spdb.h +++ b/renderdoc/driver/shaders/dxbc/dxbc_spdb.h @@ -34,7 +34,6 @@ using std::vector; using std::pair; -using std::string; namespace DXBC { @@ -176,8 +175,8 @@ struct DBIModule int32_t niCompiler; // invalid when this is read in-place! - string moduleName; - string objectName; + std::string moduleName; + std::string objectName; }; struct CompilandDetails @@ -193,7 +192,7 @@ struct CompilandDetails } FrontendVersion, BackendVersion; // invalid when this is read in-place! - string CompilerSig; + std::string CompilerSig; }; struct FileChecksum diff --git a/renderdoc/driver/shaders/spirv/spirv_common.h b/renderdoc/driver/shaders/spirv/spirv_common.h index a5d91a4c9..e1cef2f6d 100644 --- a/renderdoc/driver/shaders/spirv/spirv_common.h +++ b/renderdoc/driver/shaders/spirv/spirv_common.h @@ -32,7 +32,6 @@ #include "3rdparty/glslang/glslang/Include/ResourceLimits.h" #include "api/replay/renderdoc_replay.h" -using std::string; using std::vector; enum class SPIRVShaderStage @@ -127,9 +126,9 @@ struct SPVModule uint32_t sourceVer; std::string cmdline; - vector> sourceFiles; + vector> sourceFiles; - vector extensions; + vector extensions; vector capabilities; @@ -146,18 +145,18 @@ struct SPVModule vector structs; // struct types SPVInstruction *GetByID(uint32_t id); - string Disassemble(const string &entryPoint); + std::string Disassemble(const std::string &entryPoint); std::vector EntryPoints() const; - ShaderStage StageForEntry(const string &entryPoint) const; + ShaderStage StageForEntry(const std::string &entryPoint) const; - void MakeReflection(GraphicsAPI sourceAPI, ShaderStage stage, const string &entryPoint, + void MakeReflection(GraphicsAPI sourceAPI, ShaderStage stage, const std::string &entryPoint, ShaderReflection &reflection, ShaderBindpointMapping &mapping, SPIRVPatchData &patchData) const; }; -string CompileSPIRV(const SPIRVCompilationSettings &settings, const vector &sources, - vector &spirv); +std::string CompileSPIRV(const SPIRVCompilationSettings &settings, + const vector &sources, 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 6b69b2fbd..28e5c877f 100644 --- a/renderdoc/driver/shaders/spirv/spirv_compile.cpp +++ b/renderdoc/driver/shaders/spirv/spirv_compile.cpp @@ -139,13 +139,13 @@ TBuiltInResource DefaultResources = { }, }; -string CompileSPIRV(const SPIRVCompilationSettings &settings, - const std::vector &sources, vector &spirv) +std::string CompileSPIRV(const SPIRVCompilationSettings &settings, + const std::vector &sources, vector &spirv) { if(settings.stage == SPIRVShaderStage::Invalid) return "Invalid shader stage specified"; - string errors = ""; + std::string errors = ""; const char **strs = new const char *[sources.size()]; diff --git a/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp b/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp index eceff3f53..82e5d6d74 100644 --- a/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp +++ b/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp @@ -314,12 +314,12 @@ struct GeneratorID }; template -static string OptionalFlagString(EnumType e) +static std::string OptionalFlagString(EnumType e) { return (int)e ? " [" + ToStr(e) + "]" : ""; } -static string DefaultIDName(uint32_t ID) +static std::string DefaultIDName(uint32_t ID) { return StringFormat::Fmt("_%u_", ID); } @@ -347,7 +347,7 @@ struct SPVDecoration uint32_t val; - string Str() const + std::string Str() const { switch(decoration) { @@ -401,7 +401,7 @@ struct SPVDecoration struct SPVExtInstSet { SPVExtInstSet() : canonicalNames(NULL), friendlyNames(NULL) {} - string setname; + std::string setname; const char **canonicalNames; const char **friendlyNames; }; @@ -420,7 +420,7 @@ struct SPVEntryPoint // so we reference the function by ID uint32_t func; spv::ExecutionModel model; - string name; + std::string name; vector modes; }; @@ -473,13 +473,14 @@ struct SPVTypeData uint32_t id; - string name; + std::string name; bool IsBasicInt() const { return type == eUInt || type == eSInt; } bool IsScalar() const { return type < eBasicCount && type != eVoid; } - string DeclareVariable(const vector &vardecorations, const string &varName); + std::string DeclareVariable(const vector &vardecorations, + const std::string &varName); - const string &GetName() + const std::string &GetName() { if(name.empty()) { @@ -525,7 +526,7 @@ struct SPVTypeData } else if(type == eImage) { - string typestring = baseType->GetName(); + std::string typestring = baseType->GetName(); if(imgformat != spv::ImageFormatUnknown) typestring += ", " + ToStr(imgformat); @@ -613,7 +614,7 @@ struct SPVTypeData vector *decorations; // struct/function - vector > children; + vector > children; vector > childDecorations; // matches children // array @@ -699,7 +700,7 @@ struct SPVOperation SPVInstruction *minLod; } im; - void GetArg(const vector &ids, size_t idx, string &arg, + void GetArg(const vector &ids, size_t idx, std::string &arg, bool bracketArgumentsIfNeeded = true); }; @@ -765,7 +766,7 @@ struct SPVConstant return u32; } - string GetValString() + std::string GetValString() { RDCASSERT(children.empty()); @@ -808,7 +809,7 @@ struct SPVConstant return StringFormat::Fmt("!%u!", u32); } - string GetIDName() + std::string GetIDName() { if((specOp == spv::OpIAdd || specOp == spv::OpFAdd) && children.size() == 2) { @@ -833,7 +834,7 @@ struct SPVConstant } else if(specOp != spv::OpNop) { - string ret = StringFormat::Fmt("SpecOp%s(", ToStr(specOp).c_str()); + std::string ret = StringFormat::Fmt("SpecOp%s(", ToStr(specOp).c_str()); for(size_t i = 0; i < children.size(); i++) { @@ -868,14 +869,14 @@ struct SPVConstant if(identical) { - string ret = children[0]->GetValString() + "."; + std::string ret = children[0]->GetValString() + "."; for(size_t i = 0; i < children.size(); i++) ret += 'x'; return ret; } } - string ret; + std::string ret; if(type->type == SPVTypeData::eArray) { ret = type->baseType->GetName(); @@ -1002,14 +1003,14 @@ struct SPVInstruction struct { - string filename; + std::string filename; uint32_t line; uint32_t col; } source; - string str; + std::string str; - const string &GetIDName() + const std::string &GetIDName() { if(str.empty()) { @@ -1024,7 +1025,7 @@ struct SPVInstruction return str; } - string Disassemble(const vector &ids, bool inlineOp) + std::string Disassemble(const vector &ids, bool inlineOp) { switch(opcode) { @@ -1056,7 +1057,7 @@ struct SPVInstruction uint32_t retID = flow->targets[0]; - string arg; + std::string arg; if(ids[retID] == NULL) arg = StringFormat::Fmt("<%u>", retID); @@ -1074,7 +1075,7 @@ struct SPVInstruction { // we don't output the targets since that is handled specially - string conditionStr; + std::string conditionStr; if(flow->condition->op == NULL || flow->condition->op->complexity < NEVER_INLINE_COMPLEXITY) conditionStr = flow->condition->Disassemble(ids, true); else @@ -1131,7 +1132,7 @@ struct SPVInstruction } } - string dest, src; + std::string dest, src; op->GetArg(ids, 0, dest); op->GetArg(ids, 1, src, false); @@ -1156,7 +1157,7 @@ struct SPVInstruction { RDCASSERT(!inlineOp && op); - string dest, src; + std::string dest, src; op->GetArg(ids, 0, dest); op->GetArg(ids, 1, src, false); @@ -1173,7 +1174,7 @@ struct SPVInstruction { RDCASSERT(op); - string arg; + std::string arg; op->GetArg(ids, 0, arg, false); #if LOAD_STORE_CONSTRUCTORS @@ -1196,7 +1197,7 @@ struct SPVInstruction { RDCASSERT(op); - string ret = ""; + std::string ret = ""; if(!inlineOp) ret = StringFormat::Fmt("%s %s = ", op->type->GetName().c_str(), GetIDName().c_str()); @@ -1220,7 +1221,7 @@ struct SPVInstruction if(allEqual) { - string arg0; + std::string arg0; op->GetArg(ids, 0, arg0, false); ret += arg0 + ")"; return ret; @@ -1261,7 +1262,7 @@ struct SPVInstruction { char swizzle[] = "xyzw"; - string swizzleString; + std::string swizzleString; for(size_t j = begin; j <= end; j++) { @@ -1278,14 +1279,14 @@ struct SPVInstruction swizzleString.length() == op->arguments[i]->op->arguments[0]->op->type->vectorSize && !strncmp(swizzleString.c_str(), swizzle, swizzleString.length())) { - string base; + std::string base; op->arguments[i]->op->GetArg(ids, 0, base, false); ret += base; } else { - string base; + std::string base; op->arguments[i]->op->GetArg(ids, 0, base); ret += StringFormat::Fmt("%s.%s", base.c_str(), swizzleString.c_str()); @@ -1300,7 +1301,7 @@ struct SPVInstruction if(!added) { - string constituent; + std::string constituent; op->GetArg(ids, i, constituent, false); ret += constituent; } @@ -1322,13 +1323,13 @@ struct SPVInstruction { RDCASSERT(op); - string composite; + std::string composite; op->GetArg(ids, 0, composite); // unknown argument, we can't access chain it if(op->arguments[0]->var == NULL && op->arguments[0]->op == NULL) { - string ret = ""; + std::string ret = ""; if(!inlineOp) ret = StringFormat::Fmt("%s %s = ", op->type->GetName().c_str(), GetIDName().c_str()); @@ -1352,7 +1353,7 @@ struct SPVInstruction size_t start = (accessChain ? 1 : 0); size_t count = (accessChain ? op->arguments.size() : op->literals.size()); - string accessString = ""; + std::string accessString = ""; for(size_t i = start; i < count; i++) { @@ -1384,7 +1385,7 @@ struct SPVInstruction } else { - const pair &child = arg0type->children[idx]; + const pair &child = arg0type->children[idx]; if(child.second.empty()) accessString += StringFormat::Fmt("._member%u", idx); else @@ -1402,7 +1403,7 @@ struct SPVInstruction else { // dynamic indexing into this array - string arg; + std::string arg; op->GetArg(ids, i, arg); accessString += StringFormat::Fmt("[%s]", arg.c_str()); } @@ -1418,7 +1419,7 @@ struct SPVInstruction else { // dynamic indexing into this array - string arg; + std::string arg; op->GetArg(ids, i, arg); accessString += StringFormat::Fmt("[%s]", arg.c_str()); } @@ -1444,7 +1445,7 @@ struct SPVInstruction { // otherwise we have to treat it as another dynamic index, which is valid - string arg; + std::string arg; op->GetArg(ids, i, arg); accessString += StringFormat::Fmt("[%s]", arg.c_str()); @@ -1456,7 +1457,7 @@ struct SPVInstruction // vector (or matrix + extra) if(opcode == spv::OpVectorExtractDynamic) { - string arg; + std::string arg; op->GetArg(ids, 1, arg); accessString += StringFormat::Fmt("[%s]", arg.c_str()); } @@ -1474,11 +1475,11 @@ struct SPVInstruction } } - string ret = ""; + std::string ret = ""; if(opcode == spv::OpCompositeInsert) { - string insertObj; + std::string insertObj; op->GetArg(ids, 1, insertObj); // if we've been inlined, it means that there is a store of the result of @@ -1512,7 +1513,7 @@ struct SPVInstruction { RDCASSERT(op); - string ret = ""; + std::string ret = ""; if(!inlineOp) ret = StringFormat::Fmt("%s %s = ", op->type->GetName().c_str(), GetIDName().c_str()); @@ -1539,7 +1540,7 @@ struct SPVInstruction for(size_t i = 1; i < op->arguments.size(); i++) { - string arg; + std::string arg; op->GetArg(ids, i, arg, false); ret += arg; @@ -1555,12 +1556,12 @@ struct SPVInstruction { RDCASSERT(!inlineOp && op); - string image, coord, sample; + std::string image, coord, sample; op->GetArg(ids, 0, image); op->GetArg(ids, 1, coord, false); op->GetArg(ids, 2, sample, false); - string ret = + std::string ret = StringFormat::Fmt("%s %s = ImageTexelPointer(%s, %s, %s)", op->type->GetName().c_str(), GetIDName().c_str(), image.c_str(), coord.c_str(), sample.c_str()); @@ -1647,7 +1648,7 @@ struct SPVInstruction { RDCASSERT(op); - string ret = ""; + std::string ret = ""; if(!inlineOp && op->type && op->type->type != SPVTypeData::eVoid && opcode != spv::OpAtomicStore) @@ -1668,7 +1669,7 @@ struct SPVInstruction // last argument is the component, reads better to have this // as part of the operation (if it was a constant instead of // an ID - string arg; + std::string arg; op->GetArg(ids, numArgs - 1, arg); ret += "ImageGather[" + arg + "]("; @@ -1681,7 +1682,7 @@ struct SPVInstruction for(size_t i = 0; i < numArgs; i++) { - string arg; + std::string arg; op->GetArg(ids, i, arg, false); if(op->im.bias == op->arguments[i]) @@ -1761,7 +1762,7 @@ struct SPVInstruction { RDCASSERT(op); - string ret = ""; + std::string ret = ""; if(!inlineOp) ret = StringFormat::Fmt("%s %s = ", op->type->GetName().c_str(), GetIDName().c_str()); @@ -1840,7 +1841,7 @@ struct SPVInstruction lastvec = vec; if(i > 0) ret += ", "; - string arg; + std::string arg; op->GetArg(ids, vec, arg); ret += arg; @@ -1878,7 +1879,7 @@ struct SPVInstruction default: break; } - string a; + std::string a; op->GetArg(ids, 0, a); if(inlineOp) @@ -2023,7 +2024,7 @@ struct SPVInstruction default: RDCERR("Unhandled bin math op in switch"); break; } - string a, b; + std::string a, b; op->GetArg(ids, 0, a); op->GetArg(ids, 1, b); @@ -2038,7 +2039,7 @@ struct SPVInstruction // binary math function RDCASSERT(op); - string a, b; + std::string a, b; op->GetArg(ids, 0, a, false); op->GetArg(ids, 1, b, false); @@ -2052,7 +2053,7 @@ struct SPVInstruction { RDCASSERT(op); - string a, b, c; + std::string a, b, c; op->GetArg(ids, 0, a, false); op->GetArg(ids, 1, b, false); op->GetArg(ids, 2, c, false); @@ -2073,7 +2074,7 @@ struct SPVInstruction } // fallback for operations that we don't disassemble - string ret = "!!"; + std::string ret = "!!"; if(!str.empty() || id != 0) ret += GetIDName() + " <= "; @@ -2104,9 +2105,10 @@ struct SPVInstruction SPVVariable *var; // this ID is a variable }; -string SPVTypeData::DeclareVariable(const vector &vardecorations, const string &varName) +std::string SPVTypeData::DeclareVariable(const vector &vardecorations, + const std::string &varName) { - string ret = ""; + std::string ret = ""; const SPVDecoration *builtin = NULL; @@ -2117,7 +2119,7 @@ string SPVTypeData::DeclareVariable(const vector &vardecorations, builtin = &vardecorations[d]; continue; } - string decorationStr = vardecorations[d].Str(); + std::string decorationStr = vardecorations[d].Str(); if(!decorationStr.empty()) ret += decorationStr + " "; } @@ -2179,7 +2181,7 @@ string SPVTypeData::DeclareVariable(const vector &vardecorations, return ret; } -void SPVOperation::GetArg(const vector &ids, size_t idx, string &arg, +void SPVOperation::GetArg(const vector &ids, size_t idx, std::string &arg, bool bracketArgumentsIfNeeded) { if(inlineArgs & (1 << idx)) @@ -2335,9 +2337,9 @@ void FindFirstInstructionUse(SPVInstruction *op, SPVInstruction *search, SPVInst } } -string SPVModule::Disassemble(const string &entryPoint) +std::string SPVModule::Disassemble(const std::string &entryPoint) { - string retDisasm = ""; + std::string retDisasm = ""; // TODO filter to only functions/resources used by entryPoint @@ -2458,7 +2460,7 @@ string SPVModule::Disassemble(const string &entryPoint) { auto member = structs[i]->type->children[c]; - string varName = member.second; + std::string varName = member.second; if(varName.empty()) varName = StringFormat::Fmt("_member%u", c); @@ -2488,7 +2490,7 @@ string SPVModule::Disassemble(const string &entryPoint) globals[i]->id); } - string varName = globals[i]->str; + std::string varName = globals[i]->str; retDisasm += StringFormat::Fmt( "%s %s;\n", ToStr(globals[i]->var->storage).c_str(), globals[i]->var->type->DeclareVariable(globals[i]->decorations, varName).c_str()); @@ -2515,7 +2517,7 @@ string SPVModule::Disassemble(const string &entryPoint) continue; } - string varName = specConstants[i]->str; + std::string varName = specConstants[i]->str; retDisasm += StringFormat::Fmt( "%s = Specialize(%s);\n", specConstants[i]->constant->type->DeclareVariable(specConstants[i]->decorations, varName).c_str(), @@ -2529,11 +2531,11 @@ string SPVModule::Disassemble(const string &entryPoint) SPVFunction *func = funcs[f]->func; RDCASSERT(func && func->retType && func->funcType); - string args = ""; + std::string args = ""; for(size_t a = 0; a < func->funcType->children.size(); a++) { - const pair &arg = func->funcType->children[a]; + const pair &arg = func->funcType->children[a]; RDCASSERT(a < func->arguments.size()); const SPVInstruction *argname = func->arguments[a]; @@ -3094,7 +3096,7 @@ string SPVModule::Disassemble(const string &entryPoint) for(size_t v = 0; v < vars.size(); v++) { RDCASSERT(vars[v]->var && vars[v]->var->type); - retDisasm += string(indent, ' ') + + retDisasm += std::string(indent, ' ') + vars[v]->var->type->DeclareVariable(vars[v]->decorations, vars[v]->GetIDName()) + ";\n"; @@ -3119,7 +3121,7 @@ string SPVModule::Disassemble(const string &entryPoint) vector loopstartstack; vector loopmergestack; - string funcDisassembly = ""; + std::string funcDisassembly = ""; for(size_t o = 0; o < funcops.size(); o++) { @@ -3136,7 +3138,7 @@ string SPVModule::Disassemble(const string &entryPoint) handled = true; - funcDisassembly += string(indent, ' '); + funcDisassembly += std::string(indent, ' '); funcDisassembly += "}\n"; selectionstack.pop_back(); switchstack.pop_back(); @@ -3154,13 +3156,13 @@ string SPVModule::Disassemble(const string &entryPoint) if(t == targets.size() - 1) { - funcDisassembly += string(indent - tabSize, ' '); + funcDisassembly += std::string(indent - tabSize, ' '); funcDisassembly += "default:\n"; } else { RDCASSERT(t < values.size()); - funcDisassembly += string(indent - tabSize, ' '); + funcDisassembly += std::string(indent - tabSize, ' '); if(cond->op && cond->op->type->type == SPVTypeData::eSInt) { @@ -3182,7 +3184,7 @@ string SPVModule::Disassemble(const string &entryPoint) else if(!elsestack.empty() && elsestack.back() == funcops[o]->id) { // handle meeting an else block - funcDisassembly += string(indent - tabSize, ' '); + funcDisassembly += std::string(indent - tabSize, ' '); funcDisassembly += "} else "; if(o + 2 < funcops.size() && funcops[o + 1]->opcode == spv::OpSelectionMerge && @@ -3207,7 +3209,7 @@ string SPVModule::Disassemble(const string &entryPoint) if(!selectionstack.back().elseif) { indent -= tabSize; - funcDisassembly += string(indent, ' '); + funcDisassembly += std::string(indent, ' '); funcDisassembly += "}\n"; } selectionstack.pop_back(); @@ -3217,7 +3219,7 @@ string SPVModule::Disassemble(const string &entryPoint) // handle meeting a loop merge block indent -= tabSize; - funcDisassembly += string(indent, ' '); + funcDisassembly += std::string(indent, ' '); funcDisassembly += "}\n"; loopheadstack.pop_back(); @@ -3244,7 +3246,7 @@ string SPVModule::Disassemble(const string &entryPoint) // this block is a loop header // TODO handle if the loop header condition expression isn't sufficiently in-lined. // We need to force inline it. - funcDisassembly += string(indent, ' '); + funcDisassembly += std::string(indent, ' '); if(funcops[o]->block->exitFlow->flow->condition) { funcDisassembly += @@ -3306,7 +3308,7 @@ string SPVModule::Disassemble(const string &entryPoint) { // this branch is to the selection merge label of the switch statement, it must // be a break instruction - funcDisassembly += string(indent, ' '); + funcDisassembly += std::string(indent, ' '); funcDisassembly += "break;\n"; handled = true; @@ -3350,7 +3352,7 @@ string SPVModule::Disassemble(const string &entryPoint) else { // if we're skipping to the header of the loop before the end, this is a continue - funcDisassembly += string(indent, ' '); + funcDisassembly += std::string(indent, ' '); funcDisassembly += "continue;\n"; } } @@ -3358,12 +3360,12 @@ string SPVModule::Disassemble(const string &entryPoint) { // if we're skipping to the merge of the loop without going through the // branch conditional, this is a break - funcDisassembly += string(indent, ' '); + funcDisassembly += std::string(indent, ' '); funcDisassembly += "break;\n"; } else { - funcDisassembly += string(indent, ' '); + funcDisassembly += std::string(indent, ' '); funcDisassembly += funcops[o]->Disassemble(ids, false) + ";\n"; } } @@ -3387,7 +3389,7 @@ string SPVModule::Disassemble(const string &entryPoint) if(funcops[o]->opcode == spv::OpBranchConditional) { if(!elseif) - funcDisassembly += string(indent, ' '); + funcDisassembly += std::string(indent, ' '); funcDisassembly += "if(" + funcops[o]->Disassemble(ids, false) + ") {\n"; indent += tabSize; @@ -3402,7 +3404,7 @@ string SPVModule::Disassemble(const string &entryPoint) } else if(funcops[o]->opcode == spv::OpSwitch) { - funcDisassembly += string(indent, ' '); + funcDisassembly += std::string(indent, ' '); funcDisassembly += funcops[o]->Disassemble(ids, false) + " {\n"; indent += tabSize; @@ -3449,14 +3451,14 @@ string SPVModule::Disassemble(const string &entryPoint) // begins and continue as normal. if(indent > tabSize) { - retDisasm += string(tabSize, ' '); + retDisasm += std::string(tabSize, ' '); retDisasm += vars[v]->var->type->DeclareVariable(vars[v]->decorations, vars[v]->GetIDName()) + ";\n"; } else { - funcDisassembly += string(indent, ' '); + funcDisassembly += std::string(indent, ' '); funcDisassembly += vars[v]->var->type->DeclareVariable(vars[v]->decorations, vars[v]->GetIDName()); @@ -3470,10 +3472,10 @@ string SPVModule::Disassemble(const string &entryPoint) if(!printed) { - string storearg; + std::string storearg; store->op->GetArg(ids, 0, storearg); - funcDisassembly += string(indent, ' '); + funcDisassembly += std::string(indent, ' '); funcDisassembly += storearg; } funcDisassembly += @@ -3485,7 +3487,7 @@ string SPVModule::Disassemble(const string &entryPoint) else { // print separately - funcDisassembly += string(indent, ' '); + funcDisassembly += std::string(indent, ' '); funcDisassembly += funcops[o]->Disassemble(ids, false) + ";\n"; funcops[o]->line = (int)o; @@ -3506,14 +3508,14 @@ string SPVModule::Disassemble(const string &entryPoint) // begins and continue as normal. if(indent > tabSize) { - retDisasm += string(tabSize, ' '); + retDisasm += std::string(tabSize, ' '); retDisasm += vars[v]->var->type->DeclareVariable(vars[v]->decorations, vars[v]->GetIDName()) + ";\n"; } else { - funcDisassembly += string(indent, ' '); + funcDisassembly += std::string(indent, ' '); funcDisassembly += vars[v]->var->type->DeclareVariable(vars[v]->decorations, vars[v]->GetIDName()) + " = "; @@ -3529,7 +3531,7 @@ string SPVModule::Disassemble(const string &entryPoint) if(!printed) { - funcDisassembly += string(indent, ' '); + funcDisassembly += std::string(indent, ' '); funcDisassembly += funcops[o]->Disassemble(ids, false) + ";\n"; } } @@ -3556,14 +3558,14 @@ string SPVModule::Disassemble(const string &entryPoint) // begins and continue as normal. if(indent > tabSize) { - retDisasm += string(tabSize, ' '); + retDisasm += std::string(tabSize, ' '); retDisasm += vars[v]->var->type->DeclareVariable(vars[v]->decorations, vars[v]->GetIDName()) + ";\n"; } else { - funcDisassembly += string(indent, ' '); + funcDisassembly += std::string(indent, ' '); funcDisassembly += vars[v]->var->type->DeclareVariable(vars[v]->decorations, vars[v]->GetIDName()) + " = "; @@ -3579,13 +3581,13 @@ string SPVModule::Disassemble(const string &entryPoint) if(!printed) { - funcDisassembly += string(indent, ' '); + funcDisassembly += std::string(indent, ' '); funcDisassembly += funcops[o]->Disassemble(ids, false) + ";\n"; } } else { - funcDisassembly += string(indent, ' '); + funcDisassembly += std::string(indent, ' '); funcDisassembly += funcops[o]->Disassemble(ids, false) + ";\n"; } @@ -3607,7 +3609,7 @@ string SPVModule::Disassemble(const string &entryPoint) continue; RDCASSERT(vars[v]->var && vars[v]->var->type); - retDisasm += string(indent, ' ') + + retDisasm += std::string(indent, ' ') + vars[v]->var->type->DeclareVariable(vars[v]->decorations, vars[v]->GetIDName()) + ";\n"; } @@ -3920,7 +3922,7 @@ typedef bindpair cblockpair; typedef bindpair shaderrespair; void AddSignatureParameter(bool isInput, ShaderStage stage, uint32_t id, uint32_t structID, - uint32_t ®Index, std::vector accessChain, string varName, + uint32_t ®Index, std::vector accessChain, std::string varName, SPVTypeData *type, const vector &decorations, vector &sigarray, SPIRVPatchData &patchData) { @@ -4014,7 +4016,7 @@ void AddSignatureParameter(bool isInput, ShaderStage stage, uint32_t id, uint32_ continue; } - string baseName = isArray ? StringFormat::Fmt("%s[%u]", varName.c_str(), a) : varName; + std::string baseName = isArray ? StringFormat::Fmt("%s[%u]", varName.c_str(), a) : varName; AddSignatureParameter(isInput, stage, id, type->id, regIndex, patch.accessChain, baseName + "." + type->children[c].second, type->children[c].first, @@ -4051,7 +4053,7 @@ void AddSignatureParameter(bool isInput, ShaderStage stage, uint32_t id, uint32_ for(uint32_t a = 0; a < arraySize; a++) { - string n = varName; + std::string n = varName; if(isArray) { @@ -4122,7 +4124,7 @@ std::vector SPVModule::EntryPoints() const return ret; } -ShaderStage SPVModule::StageForEntry(const string &entryPoint) const +ShaderStage SPVModule::StageForEntry(const std::string &entryPoint) const { for(SPVInstruction *inst : entries) { @@ -4153,9 +4155,9 @@ ShaderStage SPVModule::StageForEntry(const string &entryPoint) const return ShaderStage::Count; } -void SPVModule::MakeReflection(GraphicsAPI sourceAPI, ShaderStage stage, const string &entryPoint, - ShaderReflection &reflection, ShaderBindpointMapping &mapping, - SPIRVPatchData &patchData) const +void SPVModule::MakeReflection(GraphicsAPI sourceAPI, ShaderStage stage, + const std::string &entryPoint, ShaderReflection &reflection, + ShaderBindpointMapping &mapping, SPIRVPatchData &patchData) const { vector inputs; vector outputs; @@ -4205,7 +4207,7 @@ void SPVModule::MakeReflection(GraphicsAPI sourceAPI, ShaderStage stage, const s bool isInput = inst->var->storage == spv::StorageClassInput; vector *sigarray = (isInput ? &inputs : &outputs); - string nm; + std::string nm; // try to use the instance/variable name if(!inst->str.empty()) nm = inst->str; @@ -4980,7 +4982,7 @@ void ParseSPIRV(uint32_t *spirv, size_t spirvLength, SPVModule &module) if(WordCount > 4) { - std::pair sourceFile; + std::pair sourceFile; SPVInstruction *filenameInst = module.GetByID(spirv[it + 3]); RDCASSERT(filenameInst); @@ -5044,7 +5046,7 @@ void ParseSPIRV(uint32_t *spirv, size_t spirvLength, SPVModule &module) { if(!module.sourceFiles.empty()) { - std::pair &sourceFile = module.sourceFiles.back(); + std::pair &sourceFile = module.sourceFiles.back(); sourceFile.second += (const char *)&spirv[it + 1]; } @@ -5072,7 +5074,7 @@ void ParseSPIRV(uint32_t *spirv, size_t spirvLength, SPVModule &module) } case spv::OpExtension: { - string ext = (const char *)&spirv[it + 1]; + std::string ext = (const char *)&spirv[it + 1]; module.extensions.push_back(ext); break; } @@ -6481,7 +6483,7 @@ void ParseSPIRV(uint32_t *spirv, size_t spirvLength, SPVModule &module) if(varInst->opcode == spv::OpFunction) { size_t bracket = varInst->str.find('('); - if(bracket != string::npos) + if(bracket != std::string::npos) varInst->str = varInst->str.substr(0, bracket); } diff --git a/renderdoc/driver/vulkan/vk_core.h b/renderdoc/driver/vulkan/vk_core.h index ede047c94..f617fea9f 100644 --- a/renderdoc/driver/vulkan/vk_core.h +++ b/renderdoc/driver/vulkan/vk_core.h @@ -805,7 +805,7 @@ private: VkDeviceSize memoryOffset, VkMemoryRequirements mrq); std::vector GetImplicitRenderPassBarriers(uint32_t subpass = 0); - string MakeRenderPassOpString(bool store); + std::string MakeRenderPassOpString(bool store); bool IsDrawInRenderPass(); @@ -853,8 +853,8 @@ private: bool m_LayersEnabled[VkCheckLayer_Max] = {}; // in vk_.cpp - void AddRequiredExtensions(bool instance, vector &extensionList, - const std::set &supportedExtensions); + void AddRequiredExtensions(bool instance, vector &extensionList, + const std::set &supportedExtensions); bool PatchIndirectDraw(VkIndirectPatchType type, DrawcallDescription &draw, byte *&argptr, byte *argend); diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp index 8eb12747a..3ea673974 100644 --- a/renderdoc/driver/vulkan/vk_debug.cpp +++ b/renderdoc/driver/vulkan/vk_debug.cpp @@ -2474,9 +2474,9 @@ void VulkanReplay::HistogramMinMax::Init(WrappedVulkan *driver, VkDescriptorPool if(driver->GetDriverInfo().TexelFetchBrokenDriver()) defines += "#define NO_TEXEL_FETCH\n"; - defines += string("#define SHADER_RESTYPE ") + ToStr(t) + "\n"; - defines += string("#define UINT_TEX ") + (f == 1 ? "1" : "0") + "\n"; - defines += string("#define SINT_TEX ") + (f == 2 ? "1" : "0") + "\n"; + defines += std::string("#define SHADER_RESTYPE ") + ToStr(t) + "\n"; + defines += std::string("#define UINT_TEX ") + (f == 1 ? "1" : "0") + "\n"; + defines += std::string("#define SINT_TEX ") + (f == 2 ? "1" : "0") + "\n"; glsl = GenerateGLSLShader(GetEmbeddedResource(glsl_histogram_comp), eShaderVulkan, 430, defines); diff --git a/renderdoc/driver/vulkan/vk_info.h b/renderdoc/driver/vulkan/vk_info.h index 952c43a19..13e2afc92 100644 --- a/renderdoc/driver/vulkan/vk_info.h +++ b/renderdoc/driver/vulkan/vk_info.h @@ -157,7 +157,7 @@ struct VulkanCreationInfo { Shader() : refl(NULL), mapping(NULL), patchData(NULL) {} ResourceId module; - string entryPoint; + std::string entryPoint; ShaderReflection *refl; ShaderBindpointMapping *mapping; SPIRVPatchData *patchData; @@ -463,13 +463,13 @@ struct VulkanCreationInfo SPVModule spirv; - string unstrippedPath; + std::string unstrippedPath; struct Reflection { uint32_t stageIndex; - string entryPoint; - string disassembly; + std::string entryPoint; + std::string disassembly; ShaderReflection refl; ShaderBindpointMapping mapping; SPIRVPatchData patchData; @@ -477,7 +477,7 @@ struct VulkanCreationInfo void Init(VulkanResourceManager *resourceMan, ResourceId id, const SPVModule &spv, const std::string &entry, VkShaderStageFlagBits stage); }; - std::map m_Reflections; + std::map m_Reflections; }; std::map m_ShaderModule; @@ -495,7 +495,7 @@ struct VulkanCreationInfo }; std::map m_DescSetPool; - std::map m_Names; + std::map m_Names; std::map m_SwapChain; std::map m_DescSetLayout; std::map m_DescUpdateTemplate; diff --git a/renderdoc/driver/vulkan/vk_posix.cpp b/renderdoc/driver/vulkan/vk_posix.cpp index 75694a1af..c0e411f8e 100644 --- a/renderdoc/driver/vulkan/vk_posix.cpp +++ b/renderdoc/driver/vulkan/vk_posix.cpp @@ -44,8 +44,8 @@ bool VulkanReplay::IsOutputWindowVisible(uint64_t id) return true; } -void WrappedVulkan::AddRequiredExtensions(bool instance, vector &extensionList, - const std::set &supportedExtensions) +void WrappedVulkan::AddRequiredExtensions(bool instance, vector &extensionList, + const std::set &supportedExtensions) { bool device = !instance; @@ -226,7 +226,7 @@ static std::string GenerateJSON(const std::string &sopath) char *txt = (char *)driver_vulkan_renderdoc_json; int len = driver_vulkan_renderdoc_json_len; - string json = string(txt, txt + len); + std::string json = std::string(txt, txt + len); const char dllPathString[] = ".\\\\renderdoc.dll"; @@ -237,7 +237,7 @@ static std::string GenerateJSON(const std::string &sopath) const char majorString[] = "[MAJOR]"; idx = json.find(majorString); - while(idx != string::npos) + while(idx != std::string::npos) { json = json.substr(0, idx) + STRINGIZE(RENDERDOC_VERSION_MAJOR) + json.substr(idx + sizeof(majorString) - 1); @@ -248,7 +248,7 @@ static std::string GenerateJSON(const std::string &sopath) const char minorString[] = "[MINOR]"; idx = json.find(minorString); - while(idx != string::npos) + while(idx != std::string::npos) { json = json.substr(0, idx) + STRINGIZE(RENDERDOC_VERSION_MINOR) + json.substr(idx + sizeof(minorString) - 1); @@ -278,7 +278,7 @@ static std::string GetSOFromJSON(const std::string &json) fclose(f); } - string ret = ""; + std::string ret = ""; // The line is: // "library_path": "/foo/bar/librenderdoc.so", @@ -313,7 +313,7 @@ enum class LayerPath : int ITERABLE_OPERATORS(LayerPath); -string LayerRegistrationPath(LayerPath path) +std::string LayerRegistrationPath(LayerPath path) { switch(path) { @@ -323,10 +323,10 @@ string LayerRegistrationPath(LayerPath path) { const char *xdg = getenv("XDG_DATA_HOME"); if(xdg && FileIO::exists(xdg)) - return string(xdg) + "/vulkan/implicit_layer.d/renderdoc_capture.json"; + return std::string(xdg) + "/vulkan/implicit_layer.d/renderdoc_capture.json"; const char *home_path = getenv("HOME"); - return string(home_path != NULL ? home_path : "") + + return std::string(home_path != NULL ? home_path : "") + "/.local/share/vulkan/implicit_layer.d/renderdoc_capture.json"; } default: break; @@ -358,7 +358,7 @@ bool VulkanReplay::CheckVulkanLayer(VulkanLayerFlags &flags, std::vectorsecond.m_Reflections[entry.name].refl; } -vector VulkanReplay::GetDisassemblyTargets() +vector VulkanReplay::GetDisassemblyTargets() { - vector ret; + vector ret; VkDevice dev = m_pDriver->GetDev(); const VkLayerDispatchTable *vt = ObjDisp(dev); @@ -364,8 +364,8 @@ vector VulkanReplay::GetDisassemblyTargets() return ret; } -string VulkanReplay::DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, - const string &target) +std::string VulkanReplay::DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, + const std::string &target) { auto it = m_pDriver->m_CreationInfo.m_ShaderModule.find( GetResourceManager()->GetLiveID(refl->resourceId)); @@ -1715,7 +1715,7 @@ void VulkanReplay::SavePipelineState(uint32_t eventId) } } -void VulkanReplay::FillCBufferVariables(ResourceId shader, string entryPoint, uint32_t cbufSlot, +void VulkanReplay::FillCBufferVariables(ResourceId shader, std::string entryPoint, uint32_t cbufSlot, rdcarray &outvars, const bytebuf &data) { // Correct SPIR-V will ultimately need to set explicit layout information for each type. @@ -3434,9 +3434,9 @@ void VulkanReplay::GetTextureData(ResourceId tex, uint32_t arrayIdx, uint32_t mi } } -void VulkanReplay::BuildCustomShader(string source, string entry, +void VulkanReplay::BuildCustomShader(std::string source, std::string entry, const ShaderCompileFlags &compileFlags, ShaderStage type, - ResourceId *id, string *errors) + ResourceId *id, std::string *errors) { SPIRVShaderStage stage = SPIRVShaderStage::Invalid; @@ -3454,13 +3454,13 @@ void VulkanReplay::BuildCustomShader(string source, string entry, return; } - vector sources; + vector sources; sources.push_back(source); vector spirv; SPIRVCompilationSettings settings(SPIRVSourceLanguage::VulkanGLSL, stage); - string output = CompileSPIRV(settings, sources, spirv); + std::string output = CompileSPIRV(settings, sources, spirv); if(spirv.empty()) { @@ -3548,9 +3548,9 @@ ResourceId VulkanReplay::ApplyCustomShader(ResourceId shader, ResourceId texid, return GetResID(GetDebugManager()->GetCustomTexture()); } -void VulkanReplay::BuildTargetShader(ShaderEncoding sourceEncoding, bytebuf source, string entry, - const ShaderCompileFlags &compileFlags, ShaderStage type, - ResourceId *id, string *errors) +void VulkanReplay::BuildTargetShader(ShaderEncoding sourceEncoding, bytebuf source, + std::string entry, const ShaderCompileFlags &compileFlags, + ShaderStage type, ResourceId *id, std::string *errors) { vector spirv; @@ -3572,12 +3572,12 @@ void VulkanReplay::BuildTargetShader(ShaderEncoding sourceEncoding, bytebuf sour return; } - vector sources; + vector sources; sources.push_back(std::string((char *)source.begin(), (char *)source.end())); SPIRVCompilationSettings settings(SPIRVSourceLanguage::VulkanGLSL, stage); - string output = CompileSPIRV(settings, sources, spirv); + std::string output = CompileSPIRV(settings, sources, spirv); if(spirv.empty()) { diff --git a/renderdoc/driver/vulkan/vk_replay.h b/renderdoc/driver/vulkan/vk_replay.h index db3e60dbc..1f8f02915 100644 --- a/renderdoc/driver/vulkan/vk_replay.h +++ b/renderdoc/driver/vulkan/vk_replay.h @@ -245,8 +245,9 @@ public: rdcarray GetShaderEntryPoints(ResourceId shader); ShaderReflection *GetShader(ResourceId shader, ShaderEntryPoint entry); - vector GetDisassemblyTargets(); - string DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, const string &target); + vector GetDisassemblyTargets(); + std::string DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, + const std::string &target); vector GetUsage(ResourceId id); @@ -314,11 +315,12 @@ public: { return {ShaderEncoding::SPIRV, ShaderEncoding::GLSL}; } - void BuildTargetShader(ShaderEncoding sourceEncoding, bytebuf source, string entry, + void BuildTargetShader(ShaderEncoding sourceEncoding, bytebuf source, std::string entry, const ShaderCompileFlags &compileFlags, ShaderStage type, ResourceId *id, - string *errors); - void BuildCustomShader(string source, string entry, const ShaderCompileFlags &compileFlags, - ShaderStage type, ResourceId *id, string *errors); + std::string *errors); + void BuildCustomShader(std::string source, std::string entry, + const ShaderCompileFlags &compileFlags, ShaderStage type, ResourceId *id, + std::string *errors); void FreeCustomShader(ResourceId id); bool RenderTexture(TextureDisplay cfg); @@ -327,7 +329,7 @@ public: void RenderHighlightBox(float w, float h, float scale); - void FillCBufferVariables(ResourceId shader, string entryPoint, uint32_t cbufSlot, + void FillCBufferVariables(ResourceId shader, std::string entryPoint, uint32_t cbufSlot, rdcarray &outvars, const bytebuf &data); vector PixelHistory(vector events, ResourceId target, uint32_t x, diff --git a/renderdoc/driver/vulkan/vk_win32.cpp b/renderdoc/driver/vulkan/vk_win32.cpp index 90a86c65e..189a11724 100644 --- a/renderdoc/driver/vulkan/vk_win32.cpp +++ b/renderdoc/driver/vulkan/vk_win32.cpp @@ -84,8 +84,8 @@ bool VulkanReplay::IsOutputWindowVisible(uint64_t id) return (IsWindowVisible(m_OutputWindows[id].wnd) == TRUE); } -void WrappedVulkan::AddRequiredExtensions(bool instance, vector &extensionList, - const std::set &supportedExtensions) +void WrappedVulkan::AddRequiredExtensions(bool instance, 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 a6b64e0cc..d879b992f 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp @@ -225,9 +225,9 @@ std::vector WrappedVulkan::GetImplicitRenderPassBarriers(u return ret; } -string WrappedVulkan::MakeRenderPassOpString(bool store) +std::string WrappedVulkan::MakeRenderPassOpString(bool store) { - string opDesc = ""; + std::string opDesc = ""; const VulkanCreationInfo::RenderPass &info = m_CreationInfo.m_RenderPass[m_BakedCmdBufferInfo[m_LastCmdBufferID].state.renderPass]; diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp index 98d6fd456..89eb28f2c 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(vector &Layers) { for(auto it = Layers.begin(); it != Layers.end();) { @@ -210,7 +210,7 @@ ReplayStatus WrappedVulkan::Initialise(VkInitParams ¶ms, uint64_t sectionVer ++it; } - std::set supportedExtensions; + std::set supportedExtensions; for(size_t i = 0; i <= params.Layers.size(); i++) { @@ -1177,7 +1177,7 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi // in the serialised VkDeviceCreateInfo don't double-free VkDeviceCreateInfo createInfo = CreateInfo; - std::vector Extensions; + std::vector Extensions; for(uint32_t i = 0; i < createInfo.enabledExtensionCount; i++) { // don't include the debug marker extension @@ -1212,13 +1212,13 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME) != Extensions.end()) m_ExtensionsEnabled[VkCheckExt_EXT_vertex_divisor] = true; - std::vector Layers; + std::vector Layers; for(uint32_t i = 0; i < createInfo.enabledLayerCount; i++) Layers.push_back(createInfo.ppEnabledLayerNames[i]); StripUnwantedLayers(Layers); - std::set supportedExtensions; + std::set supportedExtensions; for(size_t i = 0; i <= Layers.size(); i++) { diff --git a/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp index 4ed03b241..00b2bfb87 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp @@ -599,7 +599,7 @@ bool WrappedVulkan::Serialise_vkCmdDrawIndirect(SerialiserType &ser, VkCommandBu m_IndirectBufferSize = RDCMAX(m_IndirectBufferSize, sizeof(VkDrawIndirectCommand) + (count > 0 ? count - 1 : 0) * stride); - string name = "vkCmdDrawIndirect"; + std::string name = "vkCmdDrawIndirect"; if(!IsDrawInRenderPass()) { @@ -977,7 +977,7 @@ bool WrappedVulkan::Serialise_vkCmdDrawIndexedIndirect(SerialiserType &ser, m_IndirectBufferSize = RDCMAX(m_IndirectBufferSize, sizeof(VkDrawIndexedIndirectCommand) + (count > 0 ? count - 1 : 0) * stride); - string name = "vkCmdDrawIndexedIndirect"; + std::string name = "vkCmdDrawIndexedIndirect"; if(!IsDrawInRenderPass()) { @@ -2263,7 +2263,7 @@ bool WrappedVulkan::Serialise_vkCmdClearAttachments(SerialiserType &ser, { AddEvent(); - string name = "vkCmdClearAttachments("; + std::string name = "vkCmdClearAttachments("; for(uint32_t a = 0; a < attachmentCount; a++) { name += ToStr(pAttachments[a].colorAttachment); @@ -2664,7 +2664,7 @@ bool WrappedVulkan::Serialise_vkCmdDrawIndirectCountKHR( RDCMAX(m_IndirectBufferSize, sizeof(VkDrawIndirectCommand) + (maxDrawCount > 0 ? maxDrawCount - 1 : 0) * stride); - string name = "vkCmdDrawIndirectCountKHR"; + std::string name = "vkCmdDrawIndirectCountKHR"; if(!IsDrawInRenderPass()) { @@ -2978,7 +2978,7 @@ bool WrappedVulkan::Serialise_vkCmdDrawIndexedIndirectCountKHR( RDCMAX(m_IndirectBufferSize, sizeof(VkDrawIndexedIndirectCommand) + (maxDrawCount > 0 ? maxDrawCount - 1 : 0) * stride); - string name = "vkCmdDrawIndexedIndirectCountKHR"; + std::string name = "vkCmdDrawIndexedIndirectCountKHR"; if(!IsDrawInRenderPass()) { @@ -3139,7 +3139,7 @@ bool WrappedVulkan::Serialise_vkCmdDrawIndirectByteCountEXT( Unwrap(counterBuffer), counterBufferOffset, counterOffset, vertexStride); - string name = "vkCmdDrawIndirectByteCountEXT"; + std::string name = "vkCmdDrawIndirectByteCountEXT"; if(!IsDrawInRenderPass()) { diff --git a/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp index ba962dbc4..fbfc43da5 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp @@ -780,7 +780,8 @@ VkResult WrappedVulkan::vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR m_TextRenderer->BeginText(textstate); int flags = activeWindow ? RenderDoc::eOverlay_ActiveWindow : 0; - string overlayText = RenderDoc::Inst().GetOverlayText(RDCDriver::Vulkan, m_FrameCounter, flags); + std::string overlayText = + RenderDoc::Inst().GetOverlayText(RDCDriver::Vulkan, m_FrameCounter, flags); if(!overlayText.empty()) m_TextRenderer->RenderText(textstate, 0.0f, 0.0f, overlayText.c_str()); diff --git a/renderdoc/os/os_specific.cpp b/renderdoc/os/os_specific.cpp index cf2d4dced..518ad01f3 100644 --- a/renderdoc/os/os_specific.cpp +++ b/renderdoc/os/os_specific.cpp @@ -27,8 +27,6 @@ #include #include "strings/string_utils.h" -using std::string; - int utf8printf(char *buf, size_t bufsize, const char *fmt, va_list args); namespace StringFormat @@ -55,7 +53,7 @@ int vsnprintf(char *str, size_t bufSize, const char *format, va_list args) return ::utf8printf(str, bufSize, format, args); } -string Fmt(const char *format, ...) +std::string Fmt(const char *format, ...) { va_list args; va_start(args, format); @@ -72,7 +70,7 @@ string Fmt(const char *format, ...) va_end(args); va_end(args2); - string ret = buf; + std::string ret = buf; delete[] buf; @@ -132,7 +130,7 @@ int Wide2UTF8(wchar_t chr, char mbchr[4]) }; // namespace StringFormat -string Callstack::AddressDetails::formattedString(const char *commonPath) +std::string Callstack::AddressDetails::formattedString(const char *commonPath) { char fmt[512] = {0}; @@ -140,8 +138,8 @@ string Callstack::AddressDetails::formattedString(const char *commonPath) if(commonPath) { - string common = strlower(string(commonPath)); - string fn = strlower(filename.substr(0, common.length())); + std::string common = strlower(std::string(commonPath)); + std::string fn = strlower(filename.substr(0, common.length())); if(common == fn) { @@ -157,9 +155,9 @@ string Callstack::AddressDetails::formattedString(const char *commonPath) return fmt; } -string OSUtility::MakeMachineIdentString(uint64_t ident) +std::string OSUtility::MakeMachineIdentString(uint64_t ident) { - string ret = ""; + std::string ret = ""; if(ident & MachineIdent_Windows) ret += "Windows "; diff --git a/renderdoc/os/os_specific.h b/renderdoc/os/os_specific.h index f03e6ea55..6f03cf6fe 100644 --- a/renderdoc/os/os_specific.h +++ b/renderdoc/os/os_specific.h @@ -41,7 +41,6 @@ #include "api/replay/renderdoc_replay.h" #include "common/common.h" -using std::string; using std::vector; struct CaptureOptions; @@ -66,7 +65,7 @@ ExecuteResult InjectIntoProcess(uint32_t pid, const rdcarray // n*: - string parseResult(result); + std::string parseResult(result); const size_t len = parseResult.length(); if(parseResult[0] == 'p') { @@ -108,7 +108,7 @@ int GetIdentPort(pid_t childPid) while(i < len) { const size_t netStart = parseResult.find(netString, i); - if(netStart != string::npos) + if(netStart != std::string::npos) { tokenStart = netStart + strlen(netString); i = tokenStart; diff --git a/renderdoc/os/posix/apple/apple_stringio.cpp b/renderdoc/os/posix/apple/apple_stringio.cpp index 52346bdb1..fd3e45c57 100644 --- a/renderdoc/os/posix/apple/apple_stringio.cpp +++ b/renderdoc/os/posix/apple/apple_stringio.cpp @@ -61,31 +61,31 @@ bool GetKeyState(int key) namespace FileIO { -string GetTempRootPath() +std::string GetTempRootPath() { return "/tmp"; } -string GetAppFolderFilename(const string &filename) +std::string GetAppFolderFilename(const std::string &filename) { passwd *pw = getpwuid(getuid()); const char *homedir = pw->pw_dir; - string ret = string(homedir) + "/.renderdoc/"; + std::string ret = std::string(homedir) + "/.renderdoc/"; mkdir(ret.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); return ret + filename; } -void GetExecutableFilename(string &selfName) +void GetExecutableFilename(std::string &selfName) { char path[512] = {0}; uint32_t pathSize = (uint32_t)sizeof(path); if(_NSGetExecutablePath(path, &pathSize) == 0) { - selfName = string(path); + selfName = std::string(path); } else { @@ -94,7 +94,7 @@ void GetExecutableFilename(string &selfName) memset(allocPath, 0, pathSize); if(_NSGetExecutablePath(path, &pathSize) == 0) { - selfName = string(path); + selfName = std::string(path); } else { @@ -110,12 +110,12 @@ void GetExecutableFilename(string &selfName) readlink(selfName.c_str(), path, 511); if(path[0] != 0) - selfName = string(path); + selfName = std::string(path); } int LibraryLocator = 42; -void GetLibraryFilename(string &selfName) +void GetLibraryFilename(std::string &selfName) { Dl_info info; if(dladdr(&LibraryLocator, &info)) diff --git a/renderdoc/os/posix/linux/linux_callstack.cpp b/renderdoc/os/posix/linux/linux_callstack.cpp index c74e4d376..e4052d89d 100644 --- a/renderdoc/os/posix/linux/linux_callstack.cpp +++ b/renderdoc/os/posix/linux/linux_callstack.cpp @@ -178,7 +178,8 @@ private: if(addr >= m_Modules[i].base && addr < m_Modules[i].end) { uint64_t relative = addr - m_Modules[i].base + m_Modules[i].offset; - string cmd = StringFormat::Fmt("addr2line -fCe \"%s\" 0x%llx", m_Modules[i].path, relative); + std::string cmd = + StringFormat::Fmt("addr2line -fCe \"%s\" 0x%llx", m_Modules[i].path, relative); FILE *f = ::popen(cmd.c_str(), "r"); diff --git a/renderdoc/os/posix/linux/linux_process.cpp b/renderdoc/os/posix/linux/linux_process.cpp index fa46bb5d5..d5eac7a4b 100644 --- a/renderdoc/os/posix/linux/linux_process.cpp +++ b/renderdoc/os/posix/linux/linux_process.cpp @@ -41,14 +41,14 @@ char **GetCurrentEnvironment() std::vector getSockets(pid_t childPid) { std::vector sockets; - string dirPath = StringFormat::Fmt("/proc/%d/fd", (int)childPid); + std::string dirPath = StringFormat::Fmt("/proc/%d/fd", (int)childPid); std::vector files = FileIO::GetFilesInDirectory(dirPath.c_str()); if(files.empty()) return sockets; for(const PathEntry &file : files) { - string target = StringFormat::Fmt("%s/%s", dirPath.c_str(), file.filename.c_str()); + std::string target = StringFormat::Fmt("%s/%s", dirPath.c_str(), file.filename.c_str()); char linkname[1024]; ssize_t length = readlink(target.c_str(), linkname, 1023); if(length == -1) @@ -67,7 +67,7 @@ int GetIdentPort(pid_t childPid) { int ret = 0; - string procfile = StringFormat::Fmt("/proc/%d/net/tcp", (int)childPid); + std::string procfile = StringFormat::Fmt("/proc/%d/net/tcp", (int)childPid); int waitTime = INITIAL_WAIT_TIME; diff --git a/renderdoc/os/posix/linux/linux_stringio.cpp b/renderdoc/os/posix/linux/linux_stringio.cpp index c63333622..0c575b96b 100644 --- a/renderdoc/os/posix/linux/linux_stringio.cpp +++ b/renderdoc/os/posix/linux/linux_stringio.cpp @@ -47,8 +47,6 @@ #include #endif -using std::string; - namespace Keyboard { void Init() @@ -259,39 +257,39 @@ bool GetKeyState(int key) namespace FileIO { -string GetTempRootPath() +std::string GetTempRootPath() { return "/tmp"; } -string GetAppFolderFilename(const string &filename) +std::string GetAppFolderFilename(const std::string &filename) { passwd *pw = getpwuid(getuid()); const char *homedir = pw->pw_dir; - string ret = string(homedir) + "/.renderdoc/"; + std::string ret = std::string(homedir) + "/.renderdoc/"; mkdir(ret.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); return ret + filename; } -void GetExecutableFilename(string &selfName) +void GetExecutableFilename(std::string &selfName) { char path[512] = {0}; readlink("/proc/self/exe", path, 511); - selfName = string(path); + selfName = std::string(path); } int LibraryLocator = 42; -void GetLibraryFilename(string &selfName) +void GetLibraryFilename(std::string &selfName) { // this is a hack, but the only reliable way to find the absolute path to the library. // dladdr would be fine but it returns the wrong result for symbols in the library - string librenderdoc_path; + std::string librenderdoc_path; FILE *f = fopen("/proc/self/maps", "r"); @@ -366,7 +364,7 @@ void GetLibraryFilename(string &selfName) char *end = strchr(c, '\n'); if(end) - librenderdoc_path = string(c, end - c); + librenderdoc_path = std::string(c, end - c); } delete[] map_string; diff --git a/renderdoc/os/posix/posix_libentry.cpp b/renderdoc/os/posix/posix_libentry.cpp index 773610e36..7ef7be0d0 100644 --- a/renderdoc/os/posix/posix_libentry.cpp +++ b/renderdoc/os/posix/posix_libentry.cpp @@ -63,7 +63,7 @@ void library_loaded() RenderDoc::Inst().SetCaptureFileTemplate(capturefile); } - string curfile; + std::string curfile; FileIO::GetExecutableFilename(curfile); RDCLOG("Loading into %s", curfile.c_str()); diff --git a/renderdoc/os/posix/posix_network.cpp b/renderdoc/os/posix/posix_network.cpp index 7bdf11beb..271642b3e 100644 --- a/renderdoc/os/posix/posix_network.cpp +++ b/renderdoc/os/posix/posix_network.cpp @@ -40,8 +40,6 @@ #include "posix_network.h" -using std::string; - // because strerror_r is a complete mess... static std::string errno_string(int err) { diff --git a/renderdoc/os/posix/posix_process.cpp b/renderdoc/os/posix/posix_process.cpp index 1c728eed8..426d1ad57 100644 --- a/renderdoc/os/posix/posix_process.cpp +++ b/renderdoc/os/posix/posix_process.cpp @@ -224,19 +224,19 @@ static void SetupZombieCollectionHandler() namespace FileIO { void ReleaseFDAfterFork(); -string FindFileInPath(const string &fileName); +std::string FindFileInPath(const std::string &fileName); }; -static const string GetAbsoluteAppPathFromName(const string &appName) +static const std::string GetAbsoluteAppPathFromName(const std::string &appName) { - string appPath; + std::string appPath; // If the application name contains a slash character convert it to an absolute path and return it - if(appName.find("/") != string::npos) + if(appName.find("/") != std::string::npos) { char realpathBuffer[PATH_MAX]; - string appDir = get_dirname(appName); - string appBasename = get_basename(appName); + std::string appDir = get_dirname(appName); + std::string appBasename = get_basename(appName); realpath(appDir.c_str(), realpathBuffer); appPath = realpathBuffer; appPath += "/" + appBasename; @@ -253,9 +253,9 @@ static vector &GetEnvModifications() return envCallbacks; } -static std::map EnvStringToEnvMap(const char **envstring) +static std::map EnvStringToEnvMap(const char **envstring) { - std::map ret; + std::map ret; const char **e = envstring; @@ -269,8 +269,8 @@ static std::map EnvStringToEnvMap(const char **envstring) continue; } - string name; - string value; + std::string name; + std::string value; name.assign(*e, equals); value = equals + 1; @@ -283,30 +283,30 @@ static std::map EnvStringToEnvMap(const char **envstring) return ret; } -static string shellExpand(const string &in) +static std::string shellExpand(const std::string &in) { - string path = trim(in); + std::string path = trim(in); // if it begins with ./ then replace with working directory if(path[0] == '.' && path[1] == '/') { char cwd[1024] = {}; getcwd(cwd, 1023); - return string(cwd) + path.substr(1); + return std::string(cwd) + path.substr(1); } // if it's ~/... then replace with $HOME and return if(path[0] == '~' && path[1] == '/') - return string(getenv("HOME")) + path.substr(1); + return std::string(getenv("HOME")) + path.substr(1); // if it's ~user/... then use getpwname if(path[0] == '~') { size_t slash = path.find('/'); - string username; + std::string username; - if(slash != string::npos) + if(slash != std::string::npos) { RDCASSERT(slash > 1); username = path.substr(1, slash - 1); @@ -320,10 +320,10 @@ static string shellExpand(const string &in) if(pwdata) { - if(slash != string::npos) - return string(pwdata->pw_dir) + path.substr(slash); + if(slash != std::string::npos) + return std::string(pwdata->pw_dir) + path.substr(slash); - return string(pwdata->pw_dir); + return std::string(pwdata->pw_dir); } } @@ -346,14 +346,15 @@ void Process::ApplyEnvironmentModification() { // turn environment string to a UTF-8 map char **currentEnvironment = GetCurrentEnvironment(); - std::map currentEnv = EnvStringToEnvMap((const char **)currentEnvironment); + std::map currentEnv = + EnvStringToEnvMap((const char **)currentEnvironment); vector &modifications = GetEnvModifications(); for(size_t i = 0; i < modifications.size(); i++) { EnvironmentModification &m = modifications[i]; - string value = currentEnv[m.name.c_str()]; + std::string value = currentEnv[m.name.c_str()]; switch(m.mod) { @@ -418,8 +419,8 @@ static pid_t RunProcess(const char *app, const char *workingDir, const char *cmd if(!app) return (pid_t)0; - string appName = app; - string workDir = (workingDir && workingDir[0]) ? workingDir : get_dirname(appName); + std::string appName = app; + std::string workDir = (workingDir && workingDir[0]) ? workingDir : get_dirname(appName); // handle funky apple .app folders that aren't actually executables #if ENABLED(RDOC_APPLE) @@ -465,7 +466,7 @@ static pid_t RunProcess(const char *app, const char *workingDir, const char *cmd c = cmdLine; - string a; + std::string a; argc = 0; // current argument we're fetching @@ -558,7 +559,7 @@ static pid_t RunProcess(const char *app, const char *workingDir, const char *cmd } } - const string appPath(GetAbsoluteAppPathFromName(appName)); + const std::string appPath(GetAbsoluteAppPathFromName(appName)); pid_t childPid = 0; @@ -664,14 +665,14 @@ uint32_t Process::LaunchProcess(const char *app, const char *workingDir, const c { stdoutRead = read(stdoutPipe[0], chBuf, sizeof(chBuf)); if(stdoutRead > 0) - result->strStdout += string(chBuf, stdoutRead); + result->strStdout += std::string(chBuf, stdoutRead); } while(stdoutRead > 0); do { stderrRead = read(stderrPipe[0], chBuf, sizeof(chBuf)); if(stderrRead > 0) - result->strStderror += string(chBuf, stderrRead); + result->strStderror += std::string(chBuf, stderrRead); } while(stderrRead > 0); @@ -687,7 +688,7 @@ uint32_t Process::LaunchScript(const char *script, const char *workingDir, const bool internal, ProcessResult *result) { // Change parameters to invoke command interpreter - string args = "-lc \"" + string(script) + " " + string(argList) + "\""; + std::string args = "-lc \"" + std::string(script) + " " + std::string(argList) + "\""; return LaunchProcess("bash", workingDir, args.c_str(), internal, result); } @@ -706,7 +707,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); + std::map env = EnvStringToEnvMap((const char **)currentEnvironment); vector modifications = GetEnvModifications(); for(const EnvironmentModification &e : envList) @@ -715,7 +716,7 @@ ExecuteResult Process::LaunchAndInjectIntoProcess(const char *app, const char *w if(capturefile == NULL) capturefile = ""; - string binpath, libpath, ownlibpath; + std::string binpath, libpath, ownlibpath; { FileIO::GetExecutableFilename(binpath); binpath = get_dirname(binpath); @@ -741,7 +742,7 @@ ExecuteResult Process::LaunchAndInjectIntoProcess(const char *app, const char *w libfile = libpath + "/" + libfile; #endif - string optstr = opts.EncodeAsString(); + std::string optstr = opts.EncodeAsString(); modifications.push_back( EnvironmentModification(EnvMod::Append, EnvSep::Platform, LIB_PATH_ENV_VAR, binpath.c_str())); @@ -762,7 +763,7 @@ ExecuteResult Process::LaunchAndInjectIntoProcess(const char *app, const char *w { EnvironmentModification &m = modifications[i]; - string &value = env[m.name.c_str()]; + std::string &value = env[m.name.c_str()]; switch(m.mod) { @@ -803,7 +804,7 @@ ExecuteResult Process::LaunchAndInjectIntoProcess(const char *app, const char *w int i = 0; for(auto it = env.begin(); it != env.end(); it++) { - string envline = it->first + "=" + it->second; + std::string envline = it->first + "=" + it->second; envp[i] = new char[envline.size() + 1]; memcpy(envp[i], envline.c_str(), envline.size() + 1); i++; diff --git a/renderdoc/os/posix/posix_stringio.cpp b/renderdoc/os/posix/posix_stringio.cpp index 27ad341fa..46dc8ceb4 100644 --- a/renderdoc/os/posix/posix_stringio.cpp +++ b/renderdoc/os/posix/posix_stringio.cpp @@ -41,17 +41,15 @@ #include "os/os_specific.h" #include "strings/string_utils.h" -using std::string; - // gives us an address to identify this so with static int soLocator = 0; namespace FileIO { // in posix/.../..._stringio.cpp -string GetTempRootPath(); +std::string GetTempRootPath(); -string GetHomeFolderFilename() +std::string GetHomeFolderFilename() { passwd *pw = getpwuid(getuid()); const char *homedir = pw->pw_dir; @@ -59,14 +57,14 @@ string GetHomeFolderFilename() return homedir; } -string GetTempFolderFilename() +std::string GetTempFolderFilename() { return GetTempRootPath() + "/"; } -void CreateParentDirectory(const string &filename) +void CreateParentDirectory(const std::string &filename) { - string fn = get_dirname(filename); + std::string fn = get_dirname(filename); // want trailing slash so that we create all directories fn.push_back('/'); @@ -76,7 +74,7 @@ void CreateParentDirectory(const string &filename) size_t offs = fn.find('/', 1); - while(offs != string::npos) + while(offs != std::string::npos) { // create directory path from 0 to offs by NULLing the // / at offs, mkdir, then set it back @@ -88,7 +86,7 @@ void CreateParentDirectory(const string &filename) } } -bool IsRelativePath(const string &path) +bool IsRelativePath(const std::string &path) { if(path.empty()) return false; @@ -96,17 +94,17 @@ bool IsRelativePath(const string &path) return path.front() != '/'; } -string GetFullPathname(const string &filename) +std::string GetFullPathname(const std::string &filename) { char path[PATH_MAX + 1] = {0}; realpath(filename.c_str(), path); - return string(path); + return std::string(path); } -string FindFileInPath(const string &fileName) +std::string FindFileInPath(const std::string &fileName) { - string filePath; + std::string filePath; // Search the PATH directory list for the application (like shell which) to get the absolute path // Return "" if no exectuable found in the PATH list @@ -122,7 +120,7 @@ string FindFileInPath(const string &fileName) const char *path = strtok(localPath, pathSeparator); while(path) { - string testPath(path); + std::string testPath(path); testPath += "/" + fileName; if(!access(testPath.c_str(), X_OK)) { @@ -136,14 +134,14 @@ string FindFileInPath(const string &fileName) return filePath; } -string GetReplayAppFilename() +std::string GetReplayAppFilename() { // look up the shared object's path via dladdr Dl_info info; dladdr((void *)&soLocator, &info); - string path = info.dli_fname ? info.dli_fname : ""; + std::string path = info.dli_fname ? info.dli_fname : ""; path = get_dirname(path); - string replay = path + "/qrenderdoc"; + std::string replay = path + "/qrenderdoc"; FILE *f = FileIO::fopen(replay.c_str(), "r"); if(f) @@ -190,10 +188,10 @@ string GetReplayAppFilename() return "qrenderdoc"; } -void GetDefaultFiles(const char *logBaseName, string &capture_filename, string &logging_filename, - string &target) +void GetDefaultFiles(const char *logBaseName, std::string &capture_filename, + std::string &logging_filename, std::string &target) { - string path; + std::string path; GetExecutableFilename(path); const char *mod = strrchr(path.c_str(), '/'); @@ -204,7 +202,7 @@ void GetDefaultFiles(const char *logBaseName, string &capture_filename, string & else mod = "unknown"; - target = string(mod); + target = std::string(mod); time_t t = time(NULL); tm now = *localtime(&t); @@ -228,7 +226,7 @@ void GetDefaultFiles(const char *logBaseName, string &capture_filename, string & temp_folder, mod, 1900 + now.tm_year, now.tm_mon + 1, now.tm_mday, now.tm_hour, now.tm_min); - capture_filename = string(temp_filename); + capture_filename = std::string(temp_filename); snprintf(temp_filename, sizeof(temp_filename) - 1, "%s/RenderDoc/%s_%04d.%02d.%02d_%02d.%02d.%02d.log", temp_folder, logBaseName, @@ -237,12 +235,12 @@ void GetDefaultFiles(const char *logBaseName, string &capture_filename, string & // set by UI when launching programs so all logging goes to the same file char *logfile_override = getenv("RENDERDOC_DEBUG_LOG_FILE"); if(logfile_override) - logging_filename = string(logfile_override); + logging_filename = std::string(logfile_override); else - logging_filename = string(temp_filename); + logging_filename = std::string(temp_filename); } -uint64_t GetModifiedTimestamp(const string &filename) +uint64_t GetModifiedTimestamp(const std::string &filename) { struct ::stat st; int res = stat(filename.c_str(), &st); @@ -352,7 +350,7 @@ std::vector GetFilesInDirectory(const char *path) if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) continue; - string fullpath = path; + std::string fullpath = path; fullpath += '/'; fullpath += ent->d_name; @@ -405,9 +403,9 @@ std::string ErrorString() return buf; } -string getline(FILE *f) +std::string getline(FILE *f) { - string ret; + std::string ret; while(!FileIO::feof(f)) { diff --git a/renderdoc/os/win32/win32_hook.cpp b/renderdoc/os/win32/win32_hook.cpp index 6f486cea9..31a183722 100644 --- a/renderdoc/os/win32/win32_hook.cpp +++ b/renderdoc/os/win32/win32_hook.cpp @@ -95,7 +95,7 @@ struct DllHookset vector altmodules; vector FunctionHooks; DWORD OrdinalBase = 0; - vector OrdinalNames; + vector OrdinalNames; std::vector Callbacks; Threading::CriticalSection ordinallock; @@ -159,7 +159,7 @@ struct CachedHookData RDCEraseEl(lowername); } - std::map DllHooks; + std::map DllHooks; HMODULE ownmodule; Threading::CriticalSection lock; char lowername[512]; @@ -244,7 +244,7 @@ struct CachedHookData DWORD err = GetLastError(); char *slash = strrchr(filename, L'\\'); - string basename = slash ? strlower(string(slash + 1)) : ""; + std::string basename = slash ? strlower(std::string(slash + 1)) : ""; if(err == 0 && basename == it->first) { @@ -830,12 +830,12 @@ void LibraryHooks::RegisterFunctionHook(const char *libraryName, const FunctionH return; } } - s_HookData->DllHooks[strlower(string(libraryName))].FunctionHooks.push_back(hook); + s_HookData->DllHooks[strlower(std::string(libraryName))].FunctionHooks.push_back(hook); } void LibraryHooks::RegisterLibraryHook(const char *libraryName, FunctionLoadCallback loadedCallback) { - s_HookData->DllHooks[strlower(string(libraryName))].Callbacks.push_back(loadedCallback); + s_HookData->DllHooks[strlower(std::string(libraryName))].Callbacks.push_back(loadedCallback); } void LibraryHooks::IgnoreLibrary(const char *libraryName) diff --git a/renderdoc/os/win32/win32_network.cpp b/renderdoc/os/win32/win32_network.cpp index 2067523d7..c9bcc2132 100644 --- a/renderdoc/os/win32/win32_network.cpp +++ b/renderdoc/os/win32/win32_network.cpp @@ -407,7 +407,7 @@ Socket *CreateClientSocket(const char *host, uint16_t port, int timeoutMS) hints.ai_socktype = SOCK_STREAM; hints.ai_protocol = IPPROTO_TCP; - std::wstring whost = StringFormat::UTF82Wide(string(host)); + std::wstring whost = StringFormat::UTF82Wide(std::string(host)); addrinfoW *addrResult = NULL; int res = GetAddrInfoW(whost.c_str(), portwstr, &hints, &addrResult); diff --git a/renderdoc/os/win32/win32_process.cpp b/renderdoc/os/win32/win32_process.cpp index cef4834d6..d696bea41 100644 --- a/renderdoc/os/win32/win32_process.cpp +++ b/renderdoc/os/win32/win32_process.cpp @@ -467,7 +467,7 @@ static PROCESS_INFORMATION RunProcess(const char *app, const char *workingDir, c if(workingDir != NULL && workingDir[0] != 0) workdir = StringFormat::UTF82Wide(std::string(workingDir)); else - workdir = StringFormat::UTF82Wide(get_dirname(string(app))); + workdir = StringFormat::UTF82Wide(get_dirname(std::string(app))); wchar_t *paramsAlloc = NULL; @@ -829,7 +829,7 @@ ExecuteResult Process::InjectIntoProcess(uint32_t pid, const rdcarraystrStdout += s; if(!success && !dwOutputRead) @@ -1048,7 +1048,7 @@ uint32_t Process::LaunchProcess(const char *app, const char *workingDir, const c for(;;) { success = ReadFile(hChildStdError_Rd, chBuf, sizeof(chBuf), &dwErrorRead, NULL); - s = string(chBuf, dwErrorRead); + s = std::string(chBuf, dwErrorRead); result->strStderror += s; if(!success && !dwErrorRead) @@ -1072,7 +1072,7 @@ uint32_t Process::LaunchScript(const char *script, const char *workingDir, const bool internal, ProcessResult *result) { // Change parameters to invoke command interpreter - string args = "/C " + string(script) + " " + string(argList); + std::string args = "/C " + std::string(script) + " " + std::string(argList); return LaunchProcess("cmd.exe", workingDir, args.c_str(), internal, result); } @@ -1491,11 +1491,11 @@ bool Process::StartGlobalHook(const char *pathmatch, const char *capturefile, paramsAlloc.resize(2048); // serialise to string with two chars per byte - string optstr = opts.EncodeAsString(); + std::string optstr = opts.EncodeAsString(); std::wstring wcapturefile = - capturefile == NULL ? L"" : StringFormat::UTF82Wide(string(capturefile)); - std::wstring wpathmatch = StringFormat::UTF82Wide(string(pathmatch)); + capturefile == NULL ? L"" : StringFormat::UTF82Wide(std::string(capturefile)); + std::wstring wpathmatch = StringFormat::UTF82Wide(std::string(pathmatch)); std::string debugLogfile = RDCGETLOGFILE(); std::wstring wdebugLogfile = StringFormat::UTF82Wide(debugLogfile); diff --git a/renderdoc/os/win32/win32_stringio.cpp b/renderdoc/os/win32/win32_stringio.cpp index d68cfe3e6..3bd847cec 100644 --- a/renderdoc/os/win32/win32_stringio.cpp +++ b/renderdoc/os/win32/win32_stringio.cpp @@ -36,7 +36,6 @@ #include "strings/string_utils.h" using std::set; -using std::wstring; // gives us an address to identify this dll with static int dllLocator = 0; @@ -63,7 +62,7 @@ std::string GetDynamicEmbeddedResource(int resource) const char *resData = (const char *)LockResource(data); if(resData) - return string(resData, resData + resSize); + return std::string(resData, resData + resSize); } return ""; @@ -160,44 +159,44 @@ bool GetKeyState(int key) namespace FileIO { -void GetExecutableFilename(string &selfName) +void GetExecutableFilename(std::string &selfName) { wchar_t curFile[512] = {0}; GetModuleFileNameW(NULL, curFile, 511); - selfName = StringFormat::Wide2UTF8(wstring(curFile)); + selfName = StringFormat::Wide2UTF8(std::wstring(curFile)); } -void GetLibraryFilename(string &selfName) +void GetLibraryFilename(std::string &selfName) { wchar_t curFile[512] = {0}; GetModuleFileNameW(GetModuleHandleA(STRINGIZE(RDOC_DLL_FILE) ".dll"), curFile, 511); - selfName = StringFormat::Wide2UTF8(wstring(curFile)); + selfName = StringFormat::Wide2UTF8(std::wstring(curFile)); } -bool IsRelativePath(const string &path) +bool IsRelativePath(const std::string &path) { if(path.empty()) return false; - wstring wpath = StringFormat::UTF82Wide(path.c_str()); + std::wstring wpath = StringFormat::UTF82Wide(path.c_str()); return PathIsRelativeW(wpath.c_str()) != 0; } -string GetFullPathname(const string &filename) +std::string GetFullPathname(const std::string &filename) { - wstring wfn = StringFormat::UTF82Wide(filename); + std::wstring wfn = StringFormat::UTF82Wide(filename); wchar_t path[512] = {0}; GetFullPathNameW(wfn.c_str(), ARRAY_COUNT(path) - 1, path, NULL); - return StringFormat::Wide2UTF8(wstring(path)); + return StringFormat::Wide2UTF8(std::wstring(path)); } -string FindFileInPath(const string &file) +std::string FindFileInPath(const std::string &file) { - string filePath; + std::string filePath; // Search the PATH directory list for the application (like shell where) to get the absolute path // Return "" if no exectuable found in the PATH list @@ -209,14 +208,14 @@ string FindFileInPath(const string &file) char *next = NULL; const char *pathSeparator = ";"; const char *path = strtok_s(envPath, pathSeparator, &next); - wstring fileName = StringFormat::UTF82Wide(file); + std::wstring fileName = StringFormat::UTF82Wide(file); while(path) { - wstring testPath = StringFormat::UTF82Wide(path); + std::wstring testPath = StringFormat::UTF82Wide(path); // Check for the following extensions. If fileName already has one, they will be ignored. - std::vector extensions; + std::vector extensions; extensions.push_back(L".exe"); extensions.push_back(L".bat"); @@ -226,7 +225,7 @@ string FindFileInPath(const string &file) if(SearchPathW(testPath.c_str(), fileName.c_str(), extensions[i].c_str(), ARRAY_COUNT(foundPath) - 1, foundPath, NULL) != 0) { - filePath = StringFormat::Wide2UTF8(wstring(foundPath)); + filePath = StringFormat::Wide2UTF8(std::wstring(foundPath)); break; } } @@ -239,7 +238,7 @@ string FindFileInPath(const string &file) void CreateParentDirectory(const std::string &filename) { - wstring wfn = StringFormat::UTF82Wide(get_dirname(filename)); + std::wstring wfn = StringFormat::UTF82Wide(get_dirname(filename)); // This function needs \\s not /s. So stupid! for(size_t i = 0; i < wfn.size(); i++) @@ -255,7 +254,7 @@ void CreateParentDirectory(const std::string &filename) } // Find all directories we need to create - std::vector directoriesToCreate; + std::vector directoriesToCreate; while(!wfn.empty()) { DWORD fileAttributes = GetFileAttributesW(wfn.c_str()); @@ -265,7 +264,7 @@ void CreateParentDirectory(const std::string &filename) directoriesToCreate.push_back(wfn); size_t seperatorPos = wfn.find_last_of(L'\\'); - if(seperatorPos == string::npos) + if(seperatorPos == std::string::npos) break; else wfn = wfn.substr(0, seperatorPos); @@ -278,7 +277,7 @@ void CreateParentDirectory(const std::string &filename) } } -string GetReplayAppFilename() +std::string GetReplayAppFilename() { HMODULE hModule = NULL; GetModuleHandleEx( @@ -287,9 +286,9 @@ string GetReplayAppFilename() wchar_t curFile[512] = {0}; GetModuleFileNameW(hModule, curFile, 511); - string path = StringFormat::Wide2UTF8(wstring(curFile)); + std::string path = StringFormat::Wide2UTF8(std::wstring(curFile)); path = get_dirname(path); - string exe = path + "/qrenderdoc.exe"; + std::string exe = path + "/qrenderdoc.exe"; FILE *f = FileIO::fopen(exe.c_str(), "rb"); if(f) @@ -321,14 +320,14 @@ string GetReplayAppFilename() if(type == REG_EXPAND_SZ || type == REG_SZ) { - return StringFormat::Wide2UTF8(wstring(curFile)); + return StringFormat::Wide2UTF8(std::wstring(curFile)); } return ""; } -void GetDefaultFiles(const char *logBaseName, string &capture_filename, string &logging_filename, - string &target) +void GetDefaultFiles(const char *logBaseName, std::string &capture_filename, + std::string &logging_filename, std::string &target) { wchar_t temp_filename[MAX_PATH]; @@ -350,7 +349,7 @@ void GetDefaultFiles(const char *logBaseName, string &capture_filename, string & mod++; // now points to base filename without extension - target = StringFormat::Wide2UTF8(wstring(mod)); + target = StringFormat::Wide2UTF8(std::wstring(mod)); time_t t = time(NULL); tm now; @@ -361,24 +360,24 @@ void GetDefaultFiles(const char *logBaseName, string &capture_filename, string & wsprintf(filename_start, L"RenderDoc\\%ls_%04d.%02d.%02d_%02d.%02d.rdc", mod, 1900 + now.tm_year, now.tm_mon + 1, now.tm_mday, now.tm_hour, now.tm_min); - capture_filename = StringFormat::Wide2UTF8(wstring(temp_filename)); + capture_filename = StringFormat::Wide2UTF8(std::wstring(temp_filename)); *filename_start = 0; - wstring wbase = StringFormat::UTF82Wide(string(logBaseName)); + std::wstring wbase = StringFormat::UTF82Wide(std::string(logBaseName)); wsprintf(filename_start, L"RenderDoc\\%ls_%04d.%02d.%02d_%02d.%02d.%02d.log", wbase.c_str(), 1900 + now.tm_year, now.tm_mon + 1, now.tm_mday, now.tm_hour, now.tm_min, now.tm_sec); - logging_filename = StringFormat::Wide2UTF8(wstring(temp_filename)); + logging_filename = StringFormat::Wide2UTF8(std::wstring(temp_filename)); } -string GetHomeFolderFilename() +std::string GetHomeFolderFilename() { PWSTR docsPath; SHGetKnownFolderPath(FOLDERID_Documents, KF_FLAG_SIMPLE_IDLIST | KF_FLAG_DONT_UNEXPAND, NULL, &docsPath); - wstring documents = docsPath; + std::wstring documents = docsPath; CoTaskMemFree(docsPath); if(documents[documents.size() - 1] == '/' || documents[documents.size() - 1] == '\\') @@ -387,7 +386,7 @@ string GetHomeFolderFilename() return StringFormat::Wide2UTF8(documents); } -string GetAppFolderFilename(const string &filename) +std::string GetAppFolderFilename(const std::string &filename) { PWSTR appDataPath = NULL; HRESULT hr = SHGetKnownFolderPath( @@ -395,7 +394,7 @@ string GetAppFolderFilename(const string &filename) if(appDataPath == NULL || FAILED(hr)) return ""; - wstring appdata = appDataPath; + std::wstring appdata = appDataPath; CoTaskMemFree(appDataPath); if(appdata[appdata.size() - 1] == '/' || appdata[appdata.size() - 1] == '\\') @@ -405,22 +404,22 @@ string GetAppFolderFilename(const string &filename) CreateDirectoryW(appdata.c_str(), NULL); - string ret = StringFormat::Wide2UTF8(appdata) + filename; + std::string ret = StringFormat::Wide2UTF8(appdata) + filename; return ret; } -string GetTempFolderFilename() +std::string GetTempFolderFilename() { wchar_t temp_filename[MAX_PATH]; GetTempPathW(MAX_PATH, temp_filename); - return StringFormat::Wide2UTF8(wstring(temp_filename)); + return StringFormat::Wide2UTF8(std::wstring(temp_filename)); } -uint64_t GetModifiedTimestamp(const string &filename) +uint64_t GetModifiedTimestamp(const std::string &filename) { - wstring wfn = StringFormat::UTF82Wide(filename); + std::wstring wfn = StringFormat::UTF82Wide(filename); struct __stat64 st; int res = _wstat64(wfn.c_str(), &st); @@ -435,16 +434,16 @@ uint64_t GetModifiedTimestamp(const string &filename) bool Copy(const char *from, const char *to, bool allowOverwrite) { - wstring wfrom = StringFormat::UTF82Wide(string(from)); - wstring wto = StringFormat::UTF82Wide(string(to)); + std::wstring wfrom = StringFormat::UTF82Wide(std::string(from)); + std::wstring wto = StringFormat::UTF82Wide(std::string(to)); return ::CopyFileW(wfrom.c_str(), wto.c_str(), allowOverwrite == false) != 0; } bool Move(const char *from, const char *to, bool allowOverwrite) { - wstring wfrom = StringFormat::UTF82Wide(string(from)); - wstring wto = StringFormat::UTF82Wide(string(to)); + std::wstring wfrom = StringFormat::UTF82Wide(std::string(from)); + std::wstring wto = StringFormat::UTF82Wide(std::string(to)); if(exists(to)) { @@ -459,7 +458,7 @@ bool Move(const char *from, const char *to, bool allowOverwrite) void Delete(const char *path) { - wstring wpath = StringFormat::UTF82Wide(string(path)); + std::wstring wpath = StringFormat::UTF82Wide(std::string(path)); ::DeleteFileW(wpath.c_str()); } @@ -477,7 +476,7 @@ std::vector GetFilesInDirectory(const char *path) if(driveMask & mask) { - string fn = "A:/"; + std::string fn = "A:/"; fn[0] = char('A' + i); ret.push_back(PathEntry(fn.c_str(), PathProperty::Directory)); @@ -487,7 +486,7 @@ std::vector GetFilesInDirectory(const char *path) return ret; } - string pathstr = path; + std::string pathstr = path; // normalise path to windows style for(size_t i = 0; i < pathstr.size(); i++) @@ -501,7 +500,7 @@ std::vector GetFilesInDirectory(const char *path) // append '\*' to do the search we want pathstr += "\\*"; - wstring wpath = StringFormat::UTF82Wide(pathstr); + std::wstring wpath = StringFormat::UTF82Wide(pathstr); WIN32_FIND_DATAW findData = {}; HANDLE find = FindFirstFileW(wpath.c_str(), &findData); @@ -574,8 +573,8 @@ std::vector GetFilesInDirectory(const char *path) FILE *fopen(const char *filename, const char *mode) { - wstring wfn = StringFormat::UTF82Wide(string(filename)); - wstring wmode = StringFormat::UTF82Wide(string(mode)); + std::wstring wfn = StringFormat::UTF82Wide(std::string(filename)); + std::wstring wmode = StringFormat::UTF82Wide(std::string(mode)); FILE *ret = NULL; ::_wfopen_s(&ret, wfn.c_str(), wmode.c_str()); @@ -584,7 +583,7 @@ FILE *fopen(const char *filename, const char *mode) bool exists(const char *filename) { - wstring wfn = StringFormat::UTF82Wide(filename); + std::wstring wfn = StringFormat::UTF82Wide(filename); struct __stat64 st; int res = _wstat64(wfn.c_str(), &st); @@ -603,9 +602,9 @@ std::string ErrorString() return buf; } -string getline(FILE *f) +std::string getline(FILE *f) { - string ret; + std::string ret; while(!FileIO::feof(f)) { @@ -667,7 +666,7 @@ static HANDLE logHandle = NULL; bool logfile_open(const char *filename) { - wstring wfn = StringFormat::UTF82Wide(string(filename)); + std::wstring wfn = StringFormat::UTF82Wide(std::string(filename)); logHandle = CreateFileW(wfn.c_str(), FILE_APPEND_DATA, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); @@ -709,7 +708,7 @@ std::string logfile_readall(const char *filename) if(!exists(filename)) return StringFormat::Fmt("Logfile '%s' doesn't exist", filename); - wstring wfn = StringFormat::UTF82Wide(string(filename)); + std::wstring wfn = StringFormat::UTF82Wide(std::string(filename)); HANDLE h = CreateFileW(wfn.c_str(), FILE_READ_DATA, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -766,7 +765,7 @@ void logfile_close(const char *filename) { // we can just try to delete the file. If it's open elsewhere in another process, the delete // will fail. - wstring wpath = StringFormat::UTF82Wide(string(filename)); + std::wstring wpath = StringFormat::UTF82Wide(std::string(filename)); ::DeleteFileW(wpath.c_str()); } } @@ -781,11 +780,11 @@ void sntimef(time_t utcTime, char *str, size_t bufSize, const char *format) wchar_t *buf = new wchar_t[bufSize + 1]; buf[bufSize] = 0; - wstring wfmt = StringFormat::UTF82Wide(string(format)); + std::wstring wfmt = StringFormat::UTF82Wide(std::string(format)); wcsftime(buf, bufSize, wfmt.c_str(), &tmv); - string result = StringFormat::Wide2UTF8(wstring(buf)); + std::string result = StringFormat::Wide2UTF8(std::wstring(buf)); delete[] buf; @@ -800,14 +799,14 @@ void Shutdown() { } -string Wide2UTF8(const wstring &s) +std::string Wide2UTF8(const std::wstring &s) { int bytes_required = WideCharToMultiByte(CP_UTF8, 0, s.c_str(), -1, NULL, 0, NULL, NULL); if(bytes_required == 0) return ""; - string ret; + std::string ret; ret.resize(bytes_required); int res = WideCharToMultiByte(CP_UTF8, 0, s.c_str(), -1, &ret[0], bytes_required, NULL, NULL); @@ -827,14 +826,14 @@ string Wide2UTF8(const wstring &s) return ret; } -wstring UTF82Wide(const string &s) +std::wstring UTF82Wide(const std::string &s) { int chars_required = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, NULL, 0); if(chars_required == 0) return L""; - wstring ret; + std::wstring ret; ret.resize(chars_required); int res = MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, &ret[0], chars_required); @@ -859,7 +858,7 @@ namespace OSUtility { void WriteOutput(int channel, const char *str) { - wstring wstr = StringFormat::UTF82Wide(string(str)); + std::wstring wstr = StringFormat::UTF82Wide(std::string(str)); if(channel == OSUtility::Output_DebugMon) OutputDebugStringW(wstr.c_str()); diff --git a/renderdoc/replay/app_api.cpp b/renderdoc/replay/app_api.cpp index 5325767a3..eb26be40f 100644 --- a/renderdoc/replay/app_api.cpp +++ b/renderdoc/replay/app_api.cpp @@ -194,12 +194,12 @@ static uint32_t IsTargetControlConnected() static uint32_t LaunchReplayUI(uint32_t connectTargetControl, const char *cmdline) { - string replayapp = FileIO::GetReplayAppFilename(); + std::string replayapp = FileIO::GetReplayAppFilename(); if(replayapp.empty()) return 0; - string cmd = cmdline ? cmdline : ""; + std::string cmd = cmdline ? cmdline : ""; if(connectTargetControl) cmd += StringFormat::Fmt(" --targetcontrol localhost:%u", RenderDoc::Inst().GetTargetControlIdent()); @@ -312,7 +312,7 @@ extern "C" RENDERDOC_API int RENDERDOC_CC RENDERDOC_GetAPI(RENDERDOC_Version ver int ret = 0; int major = 0, minor = 0, patch = 0; - string supportedVersions = ""; + std::string supportedVersions = ""; #define API_VERSION_HANDLE(enumver, actualver) \ supportedVersions += " " STRINGIZE(CONCAT(API_, enumver)); \ diff --git a/renderdoc/replay/entry_points.cpp b/renderdoc/replay/entry_points.cpp index ff1147bbb..49c0e1eb2 100644 --- a/renderdoc/replay/entry_points.cpp +++ b/renderdoc/replay/entry_points.cpp @@ -374,7 +374,7 @@ extern "C" RENDERDOC_API void *RENDERDOC_CC RENDERDOC_AllocArrayMem(uint64_t sz) extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_EnumerateRemoteTargets(const char *host, uint32_t nextIdent) { - string s = "localhost"; + std::string s = "localhost"; if(host != NULL && host[0] != '\0') s = host; diff --git a/renderdoc/replay/replay_controller.cpp b/renderdoc/replay/replay_controller.cpp index 7bce11e74..f94cbb141 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(); + vector targets = m_pDevice->GetDisassemblyTargets(); ret.reserve(targets.size()); for(const std::string &t : targets) @@ -1929,7 +1929,7 @@ rdcpair ReplayController::BuildTargetShader( StringFormat::Fmt("Shader Encoding '%s' is not supported", ToStr(sourceEncoding).c_str())); ResourceId id; - string errs; + std::string errs; switch(type) { @@ -1956,7 +1956,7 @@ rdcpair ReplayController::BuildCustomShader( CHECK_REPLAY_THREAD(); ResourceId id; - string errs; + std::string errs; switch(type) { diff --git a/renderdoc/replay/replay_driver.h b/renderdoc/replay/replay_driver.h index 83ed1507c..3c22a6636 100644 --- a/renderdoc/replay/replay_driver.h +++ b/renderdoc/replay/replay_driver.h @@ -105,9 +105,9 @@ public: virtual rdcarray GetShaderEntryPoints(ResourceId shader) = 0; virtual ShaderReflection *GetShader(ResourceId shader, ShaderEntryPoint entry) = 0; - virtual vector GetDisassemblyTargets() = 0; - virtual string DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, - const string &target) = 0; + virtual vector GetDisassemblyTargets() = 0; + virtual std::string DisassembleShader(ResourceId pipeline, const ShaderReflection *refl, + const std::string &target) = 0; virtual vector GetUsage(ResourceId id) = 0; @@ -137,9 +137,9 @@ public: virtual void GetTextureData(ResourceId tex, uint32_t arrayIdx, uint32_t mip, const GetTextureDataParams ¶ms, bytebuf &data) = 0; - virtual void BuildTargetShader(ShaderEncoding sourceEncoding, bytebuf source, string entry, + virtual void BuildTargetShader(ShaderEncoding sourceEncoding, bytebuf source, std::string entry, const ShaderCompileFlags &compileFlags, ShaderStage type, - ResourceId *id, string *errors) = 0; + ResourceId *id, std::string *errors) = 0; virtual rdcarray GetTargetShaderEncodings() = 0; virtual void ReplaceResource(ResourceId from, ResourceId to) = 0; virtual void RemoveReplacement(ResourceId id) = 0; @@ -149,7 +149,7 @@ public: virtual CounterDescription DescribeCounter(GPUCounter counterID) = 0; virtual vector FetchCounters(const vector &counterID) = 0; - virtual void FillCBufferVariables(ResourceId shader, string entryPoint, uint32_t cbufSlot, + virtual void FillCBufferVariables(ResourceId shader, std::string entryPoint, uint32_t cbufSlot, rdcarray &outvars, const bytebuf &data) = 0; virtual vector PixelHistory(vector events, ResourceId target, @@ -213,8 +213,9 @@ public: const MeshDisplay &cfg) = 0; virtual bool RenderTexture(TextureDisplay cfg) = 0; - virtual void BuildCustomShader(string source, string entry, const ShaderCompileFlags &compileFlags, - ShaderStage type, ResourceId *id, string *errors) = 0; + virtual void BuildCustomShader(std::string source, std::string entry, + const ShaderCompileFlags &compileFlags, ShaderStage type, + ResourceId *id, std::string *errors) = 0; virtual ResourceId ApplyCustomShader(ResourceId shader, ResourceId texid, uint32_t mip, uint32_t arrayIdx, uint32_t sampleIdx, CompType typeHint) = 0; virtual void FreeCustomShader(ResourceId id) = 0; diff --git a/renderdoc/serialise/serialiser_tests.cpp b/renderdoc/serialise/serialiser_tests.cpp index e118245f5..7e44448c7 100644 --- a/renderdoc/serialise/serialiser_tests.cpp +++ b/renderdoc/serialise/serialiser_tests.cpp @@ -595,7 +595,7 @@ TEST_CASE("Verify multiple chunks can be merged", "[serialiser][chunks]") { SCOPED_SERIALISE_CHUNK(STRING_AND_INT); - string s = "string in STRING_AND_INT"; + std::string s = "string in STRING_AND_INT"; int i = 4096; SERIALISE_ELEMENT(s); @@ -695,7 +695,7 @@ TEST_CASE("Verify multiple chunks can be merged", "[serialiser][chunks]") } case STRING_AND_INT: { - string s; + std::string s; int i = 0; SERIALISE_ELEMENT(s); @@ -733,7 +733,7 @@ TEST_CASE("Read/write container types", "[serialiser][structured]") SCOPED_SERIALISE_CHUNK(5); std::vector v; - std::pair p; + std::pair p; std::list l; v.push_back(1); @@ -770,7 +770,7 @@ TEST_CASE("Read/write container types", "[serialiser][structured]") CHECK(chunkID == 5); std::vector v; - std::pair p; + std::pair p; std::list l; SERIALISE_ELEMENT(v); @@ -819,7 +819,7 @@ TEST_CASE("Read/write container types", "[serialiser][structured]") ser.ReadChunk(); { std::vector v; - std::pair p; + std::pair p; std::list l; SERIALISE_ELEMENT(v); @@ -967,7 +967,7 @@ void DoSerialise(SerialiserType &ser, struct1 &el) struct struct2 { - string name; + std::string name; std::vector floats; std::vector viewports; }; diff --git a/renderdoc/strings/string_utils.cpp b/renderdoc/strings/string_utils.cpp index 84486ca9e..ef0c79102 100644 --- a/renderdoc/strings/string_utils.cpp +++ b/renderdoc/strings/string_utils.cpp @@ -196,11 +196,10 @@ void merge(const std::vector &in, std::string &out, const char sep) std::string removeFromEnd(const std::string &value, const std::string &ending) { - string::size_type pos; - pos = value.rfind(ending); + size_t pos = value.rfind(ending); // Create new string from beginning to pattern - if(string::npos != pos) + if(std::string::npos != pos) return value.substr(0, pos); // If pattern not found, just return original string diff --git a/renderdoc/strings/utf8printf.cpp b/renderdoc/strings/utf8printf.cpp index 65afcf9cd..0a1002be5 100644 --- a/renderdoc/strings/utf8printf.cpp +++ b/renderdoc/strings/utf8printf.cpp @@ -954,7 +954,7 @@ void formatargument(char type, void *rawarg, FormatterParams formatter, char *&o len = RDCMIN(len, precision); // convert the substring to UTF-8 - string str = StringFormat::Wide2UTF8(std::wstring(ws, ws + len)); + std::string str = StringFormat::Wide2UTF8(std::wstring(ws, ws + len)); // add left padding, if necessary if(formatter.Width != FormatterParams::NoWidth && len < width && diff --git a/renderdoccmd/renderdoccmd.cpp b/renderdoccmd/renderdoccmd.cpp index 111eb4eba..2b3dae5bc 100644 --- a/renderdoccmd/renderdoccmd.cpp +++ b/renderdoccmd/renderdoccmd.cpp @@ -41,9 +41,6 @@ rdcstr DoStringise(const uint32_t &el) #include -using std::string; -using std::wstring; - bool usingKillSignal = false; volatile bool killSignal = false; @@ -215,10 +212,11 @@ struct ThumbCommand : public Command virtual void AddOptions(cmdline::parser &parser) { parser.set_footer(""); - parser.add("out", 'o', "The output filename to save the file to", true, "filename.jpg"); - parser.add("format", 'f', - "The format of the output file. If empty, detected from filename", false, "", - cmdline::oneof("jpg", "png", "bmp", "tga")); + parser.add("out", 'o', "The output filename to save the file to", true, + "filename.jpg"); + parser.add("format", 'f', + "The format of the output file. If empty, detected from filename", + false, "", cmdline::oneof("jpg", "png", "bmp", "tga")); parser.add( "max-size", 's', "The maximum dimension of the thumbnail. Default is 0, which is unlimited.", false, 0); @@ -237,15 +235,15 @@ struct ThumbCommand : public Command return 0; } - string filename = rest[0]; + std::string filename = rest[0]; rest.erase(rest.begin()); RENDERDOC_InitGlobalEnv(m_Env, convertArgs(rest)); - string outfile = parser.get("out"); + std::string outfile = parser.get("out"); - string format = parser.get("format"); + std::string format = parser.get("format"); uint32_t maxsize = parser.get("max-size"); @@ -341,9 +339,9 @@ struct CaptureCommand : public Command } std::string executable = parser.rest()[0]; - std::string workingDir = parser.get("working-dir"); + std::string workingDir = parser.get("working-dir"); std::string cmdLine; - std::string logFile = parser.get("capture-file"); + std::string logFile = parser.get("capture-file"); for(size_t i = 1; i < parser.rest().size(); i++) { @@ -422,8 +420,8 @@ struct InjectCommand : public Command virtual int Execute(cmdline::parser &parser, const CaptureOptions &opts) { uint32_t PID = parser.get("PID"); - std::string workingDir = parser.get("working-dir"); - std::string logFile = parser.get("capture-file"); + std::string workingDir = parser.get("working-dir"); + std::string logFile = parser.get("capture-file"); std::cout << "Injecting into PID " << PID << std::endl; @@ -460,7 +458,7 @@ struct RemoteServerCommand : public Command virtual void AddOptions(cmdline::parser &parser) { parser.add("daemon", 'd', "Go into the background."); - parser.add( + parser.add( "host", 'h', "The interface to listen on. By default listens on all interfaces", false, ""); parser.add("port", 'p', "The port to listen on.", false, RENDERDOC_GetDefaultRemoteServerPort()); @@ -474,7 +472,7 @@ struct RemoteServerCommand : public Command virtual bool IsCaptureCommand() { return false; } virtual int Execute(cmdline::parser &parser, const CaptureOptions &) { - string host = parser.get("host"); + std::string host = parser.get("host"); uint32_t port = parser.get("port"); RENDERDOC_InitGlobalEnv(m_Env, convertArgs(parser.rest())); @@ -520,8 +518,9 @@ struct ReplayCommand : public Command parser.add("height", 'h', "The preview window height.", false, 720); parser.add("loops", 'l', "How many times to loop the replay, or 0 for indefinite.", false, 0); - parser.add("remote-host", 0, - "Instead of replaying locally, replay on this host over the network.", false); + parser.add("remote-host", 0, + "Instead of replaying locally, replay on this host over the network.", + false); parser.add("remote-port", 0, "If --remote-host is set, use this port.", false, RENDERDOC_GetDefaultRemoteServerPort()); } @@ -542,7 +541,7 @@ struct ReplayCommand : public Command return 0; } - string filename = rest[0]; + std::string filename = rest[0]; rest.erase(rest.begin()); @@ -550,20 +549,21 @@ struct ReplayCommand : public Command if(parser.exist("remote-host")) { - std::cout << "Replaying '" << filename << "' on " << parser.get("remote-host") << ":" - << parser.get("remote-port") << "." << std::endl; + std::cout << "Replaying '" << filename << "' on " << parser.get("remote-host") + << ":" << parser.get("remote-port") << "." << std::endl; IRemoteServer *remote = NULL; - ReplayStatus status = RENDERDOC_CreateRemoteServerConnection( - parser.get("remote-host").c_str(), parser.get("remote-port"), &remote); + ReplayStatus status = + RENDERDOC_CreateRemoteServerConnection(parser.get("remote-host").c_str(), + parser.get("remote-port"), &remote); if(remote == NULL || status != ReplayStatus::Succeeded) { std::cerr << "Error: " << ToStr(status) << " - Couldn't connect to " - << parser.get("remote-host") << ":" << parser.get("remote-port") - << "." << std::endl; + << parser.get("remote-host") << ":" + << parser.get("remote-port") << "." << std::endl; std::cerr << " Have you run renderdoccmd remoteserver on '" - << parser.get("remote-host") << "'?" << std::endl; + << parser.get("remote-host") << "'?" << std::endl; return 1; } @@ -671,12 +671,12 @@ struct ConvertCommand : public Command virtual void AddOptions(cmdline::parser &parser) { - parser.add("filename", 'f', "The file to convert from.", false); - parser.add("output", 'o', "The file to convert to.", false); - parser.add("input-format", 'i', "The format of the input file.", false, "", - formats_reader()); - parser.add("convert-format", 'c', "The format of the output file.", false, "", - formats_reader()); + parser.add("filename", 'f', "The file to convert from.", false); + parser.add("output", 'o', "The file to convert to.", false); + parser.add("input-format", 'i', "The format of the input file.", false, "", + formats_reader()); + parser.add("convert-format", 'c', "The format of the output file.", false, "", + formats_reader()); parser.add("list-formats", '\0', "Print a list of target formats."); parser.stop_at_rest(true); } @@ -695,8 +695,8 @@ struct ConvertCommand : public Command return 0; } - std::string infile = parser.get("filename"); - std::string outfile = parser.get("output"); + std::string infile = parser.get("filename"); + std::string outfile = parser.get("output"); if(infile.empty()) { @@ -712,8 +712,8 @@ struct ConvertCommand : public Command return 1; } - std::string infmt = parser.get("input-format"); - std::string outfmt = parser.get("convert-format"); + std::string infmt = parser.get("input-format"); + std::string outfmt = parser.get("convert-format"); // sort the formats by the length of the extension, so we check the longest ones first. This // means that .zip.xml will get chosen before just .xml @@ -727,10 +727,10 @@ struct ConvertCommand : public Command // try to guess the format by looking for the extension in the filename for(CaptureFileFormat f : m_Formats) { - string extension = "."; + std::string extension = "."; extension += f.extension; - if(infile.find(extension.c_str()) != string::npos) + if(infile.find(extension.c_str()) != std::string::npos) { infmt = f.extension; break; @@ -750,10 +750,10 @@ struct ConvertCommand : public Command // try to guess the format by looking for the extension in the filename for(CaptureFileFormat f : m_Formats) { - string extension = "."; + std::string extension = "."; extension += f.extension; - if(outfile.find(extension.c_str()) != string::npos) + if(outfile.find(extension.c_str()) != std::string::npos) { outfmt = f.extension; break; @@ -849,9 +849,9 @@ struct CapAltBitCommand : public Command virtual void AddOptions(cmdline::parser &parser) { parser.add("pid", 0, ""); - parser.add("capfile", 0, ""); - parser.add("debuglog", 0, ""); - parser.add("capopts", 0, ""); + parser.add("capfile", 0, ""); + parser.add("debuglog", 0, ""); + parser.add("capopts", 0, ""); parser.stop_at_rest(true); } virtual const char *Description() { return "Internal use only!"; } @@ -860,7 +860,7 @@ struct CapAltBitCommand : public Command virtual int Execute(cmdline::parser &parser, const CaptureOptions &) { CaptureOptions cmdopts; - cmdopts.DecodeFromString(parser.get("capopts")); + cmdopts.DecodeFromString(parser.get("capopts")); RENDERDOC_InitGlobalEnv(m_Env, rdcarray()); @@ -879,7 +879,7 @@ struct CapAltBitCommand : public Command for(int i = 0; i < numEnvs; i++) { - string typeString = rest[i * 3 + 0]; + std::string typeString = rest[i * 3 + 0]; EnvMod type = EnvMod::Set; EnvSep sep = EnvSep::NoSep; @@ -939,12 +939,12 @@ struct CapAltBitCommand : public Command EnvironmentModification(type, sep, rest[i * 3 + 1].c_str(), rest[i * 3 + 2].c_str())); } - string debuglog = parser.get("debuglog"); + std::string debuglog = parser.get("debuglog"); RENDERDOC_SetDebugLogFile(debuglog.c_str()); ExecuteResult result = RENDERDOC_InjectIntoProcess( - parser.get("pid"), env, parser.get("capfile").c_str(), cmdopts, false); + parser.get("pid"), env, parser.get("capfile").c_str(), cmdopts, false); if(result.status == ReplayStatus::Succeeded) return result.ident; @@ -1248,12 +1248,12 @@ int renderdoccmd(const GlobalEnvironment &env, std::vector &argv) if(it->second->IsCaptureCommand()) { - cmd.add("working-dir", 'd', "Set the working directory of the program, if launched.", - false); - cmd.add("capture-file", 'c', - "Set the filename template for new captures. Frame number will be " - "automatically appended.", - false); + cmd.add("working-dir", 'd', + "Set the working directory of the program, if launched.", false); + cmd.add("capture-file", 'c', + "Set the filename template for new captures. Frame number will be " + "automatically appended.", + false); cmd.add("wait-for-exit", 'w', "Wait for the target program to exit, before returning."); // CaptureOptions diff --git a/renderdoccmd/renderdoccmd_android.cpp b/renderdoccmd/renderdoccmd_android.cpp index da075e539..6ce9873e2 100644 --- a/renderdoccmd/renderdoccmd_android.cpp +++ b/renderdoccmd/renderdoccmd_android.cpp @@ -41,7 +41,6 @@ extern "C" { #include #define ANDROID_LOG(...) __android_log_print(ANDROID_LOG_INFO, "renderdoccmd", __VA_ARGS__); -using std::string; using std::vector; using std::istringstream; @@ -378,7 +377,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() +vector getRenderdoccmdArgs() { JNIEnv *env; android_state->activity->vm->AttachCurrentThread(&env, 0); @@ -396,7 +395,7 @@ vector getRenderdoccmdArgs() jstring jsParam1 = (jstring)env->CallObjectMethod(intent, gseid, env->NewStringUTF("renderdoccmd")); - vector ret; + vector ret; if(jsParam1) // Check if arg value found { ret.push_back("renderdoccmd"); @@ -404,7 +403,7 @@ vector getRenderdoccmdArgs() istringstream iss(param1); while(iss) { - string sub; + std::string sub; iss >> sub; ret.push_back(sub); } @@ -416,7 +415,7 @@ vector getRenderdoccmdArgs() void *cmdthread(void *) { - vector args = getRenderdoccmdArgs(); + vector args = getRenderdoccmdArgs(); if(args.size()) { ANDROID_LOG("Entering cmd thread"); diff --git a/renderdoccmd/renderdoccmd_apple.cpp b/renderdoccmd/renderdoccmd_apple.cpp index dce64a8e4..7521554f6 100644 --- a/renderdoccmd/renderdoccmd_apple.cpp +++ b/renderdoccmd/renderdoccmd_apple.cpp @@ -28,8 +28,6 @@ #include #include -using std::string; - void Daemonise() { } diff --git a/renderdoccmd/renderdoccmd_linux.cpp b/renderdoccmd/renderdoccmd_linux.cpp index efdc9402b..7bde729a4 100644 --- a/renderdoccmd/renderdoccmd_linux.cpp +++ b/renderdoccmd/renderdoccmd_linux.cpp @@ -42,7 +42,6 @@ #include -using std::string; using std::vector; void Daemonise() @@ -76,7 +75,7 @@ struct VulkanRegisterCommand : public Command std::cout << "Not fixing vulkan layer issues, and suppressing future warnings." << std::endl; std::cout << "To undo, remove '$HOME/.renderdoc/ignore_vulkan_layer_issues'." << std::endl; - string ignorePath = string(getenv("HOME")) + "/.renderdoc/"; + std::string ignorePath = std::string(getenv("HOME")) + "/.renderdoc/"; mkdir(ignorePath.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); @@ -495,7 +494,7 @@ int main(int argc, char *argv[]) // add compiled-in support to version line { - string support = "APIs supported at compile-time: "; + std::string support = "APIs supported at compile-time: "; int count = 0; #if defined(RENDERDOC_SUPPORT_VULKAN) diff --git a/renderdoccmd/renderdoccmd_win32.cpp b/renderdoccmd/renderdoccmd_win32.cpp index a86369fe6..6251aa9d5 100644 --- a/renderdoccmd/renderdoccmd_win32.cpp +++ b/renderdoccmd/renderdoccmd_win32.cpp @@ -35,8 +35,6 @@ #include #include -using std::string; -using std::wstring; using std::vector; static std::string conv(const std::wstring &str) @@ -246,13 +244,13 @@ void DisplayRendererPreview(IReplayController *renderer, TextureDisplay &display struct UpgradeCommand : public Command { UpgradeCommand(const GlobalEnvironment &env) : Command(env) {} - virtual void AddOptions(cmdline::parser &parser) { parser.add("path", 0, ""); } + virtual void AddOptions(cmdline::parser &parser) { parser.add("path", 0, ""); } virtual const char *Description() { return "Internal use only!"; } virtual bool IsInternalOnly() { return true; } virtual bool IsCaptureCommand() { return false; } virtual int Execute(cmdline::parser &parser, const CaptureOptions &) { - wstring wide_path = conv(parser.get("path")); + std::wstring wide_path = conv(parser.get("path")); if(wide_path.back() != '\\' && wide_path.back() != '/') wide_path += L'\\'; @@ -264,7 +262,7 @@ struct UpgradeCommand : public Command ZeroMemory(&zip, sizeof(zip)); bool successful = false; - wstring failReason = L"\"Unknown error\""; + std::wstring failReason = L"\"Unknown error\""; mz_bool b = mz_zip_reader_init_file(&zip, "./update.zip", 0); @@ -295,7 +293,7 @@ struct UpgradeCommand : public Command while(*fn) *(wfn++) = wchar_t(*(fn++)); - wstring target = wide_path + conv; + std::wstring target = wide_path + conv; wfn = &target[0]; @@ -338,7 +336,7 @@ struct UpgradeCommand : public Command while(*fn) *(wfn++) = wchar_t(*(fn++)); - wstring target = wide_path + conv; + std::wstring target = wide_path + conv; wfn = &target[0]; @@ -386,7 +384,7 @@ struct UpgradeCommand : public Command while(*fn) *(wfn++) = wchar_t(*(fn++)); - wstring target = wide_path + conv; + std::wstring target = wide_path + conv; wfn = &target[0]; @@ -408,7 +406,7 @@ struct UpgradeCommand : public Command } // run original UI exe and tell it an update succeeded - wstring cmdline = L"\""; + std::wstring cmdline = L"\""; cmdline += wide_path; cmdline += L"/qrenderdoc.exe\" "; if(successful) @@ -534,8 +532,8 @@ struct CrashHandlerCommand : public Command } else { - report += " \"" + string(name.begin(), name.end()) + "\": \"" + - string(val.begin(), val.end()) + "\",\n"; + report += " \"" + std::string(name.begin(), name.end()) + "\": \"" + + std::string(val.begin(), val.end()) + "\",\n"; } } @@ -616,22 +614,22 @@ struct GlobalHookCommand : public Command GlobalHookCommand(const GlobalEnvironment &env) : Command(env) {} virtual void AddOptions(cmdline::parser &parser) { - parser.add("match", 0, ""); - parser.add("capfile", 0, ""); - parser.add("debuglog", 0, ""); - parser.add("capopts", 0, ""); + parser.add("match", 0, ""); + parser.add("capfile", 0, ""); + parser.add("debuglog", 0, ""); + parser.add("capopts", 0, ""); } virtual const char *Description() { return "Internal use only!"; } virtual bool IsInternalOnly() { return true; } virtual bool IsCaptureCommand() { return false; } virtual int Execute(cmdline::parser &parser, const CaptureOptions &) { - wstring wpathmatch = conv(parser.get("match")); - string capfile = parser.get("capfile"); - string debuglog = parser.get("debuglog"); + std::wstring wpathmatch = conv(parser.get("match")); + std::string capfile = parser.get("capfile"); + std::string debuglog = parser.get("debuglog"); CaptureOptions cmdopts; - cmdopts.DecodeFromString(parser.get("capopts")); + cmdopts.DecodeFromString(parser.get("capopts")); // make sure the user doesn't accidentally run this with 'a' as a parameter or something. // "a.exe" is over 4 characters so this limit should not be a problem. @@ -735,7 +733,7 @@ int main(int, char *) argv.resize(argc); for(size_t i = 0; i < argv.size(); i++) - argv[i] = conv(wstring(wargv[i])); + argv[i] = conv(std::wstring(wargv[i])); if(argv.empty()) argv.push_back("renderdoccmd");