diff --git a/renderdoc/android/android_patch.cpp b/renderdoc/android/android_patch.cpp index 7499e0e9a..d3705a88e 100644 --- a/renderdoc/android/android_patch.cpp +++ b/renderdoc/android/android_patch.cpp @@ -146,7 +146,7 @@ bool AddManifestToAPK(const rdcstr &apk, const rdcstr &tmpDir, const bytebuf &ma rdcstr aapt = getToolPath(ToolDir::BuildTools, "aapt", false); // write the manifest to disk - FileIO::WriteAll((tmpDir + "AndroidManifest.xml").c_str(), manifest); + FileIO::WriteAll(tmpDir + "AndroidManifest.xml", manifest); // run aapt to add the manifest Process::ProcessResult result = diff --git a/renderdoc/common/common.cpp b/renderdoc/common/common.cpp index 0daeae055..5bd0b5843 100644 --- a/renderdoc/common/common.cpp +++ b/renderdoc/common/common.cpp @@ -275,7 +275,7 @@ void rdclog_filename(const char *filename) if(logfileHandle && previous.c_str()) { rdcstr previousContents; - FileIO::ReadAll(previous.c_str(), previousContents); + FileIO::ReadAll(previous, previousContents); if(!previousContents.empty()) FileIO::logfile_append(logfileHandle, previousContents.c_str(), previousContents.size()); diff --git a/renderdoc/driver/ihv/amd/amd_isa.cpp b/renderdoc/driver/ihv/amd/amd_isa.cpp index 9a33d6501..cbd677b84 100644 --- a/renderdoc/driver/ihv/amd/amd_isa.cpp +++ b/renderdoc/driver/ihv/amd/amd_isa.cpp @@ -188,7 +188,7 @@ rdcstr DisassembleSPIRV(ShaderStage stage, const bytebuf &shaderBytes, const rdc tempPath.c_str(), stageName, tempPath.c_str(), stageName, tempPath.c_str(), stageName, tempPath.c_str(), stageName, tempPath.c_str(), tempPath.c_str()); - FileIO::WriteAll(inPath.c_str(), shaderBytes); + FileIO::WriteAll(inPath, shaderBytes); // try to locate the amdspv relative to our running program rdcstr amdspv = LocatePluginFile(pluginPath, amdspv_name); @@ -210,18 +210,18 @@ rdcstr DisassembleSPIRV(ShaderStage stage, const bytebuf &shaderBytes, const rdc if(amdil) { - FileIO::ReadAll(StringFormat::Fmt("%sout.il", tempPath.c_str()).c_str(), ret); + FileIO::ReadAll(StringFormat::Fmt("%sout.il", tempPath.c_str()), ret); } else { - FileIO::ReadAll(StringFormat::Fmt("%sout.txt", tempPath.c_str()).c_str(), ret); + FileIO::ReadAll(StringFormat::Fmt("%sout.txt", tempPath.c_str()), ret); rdcstr statsfile = StringFormat::Fmt("%sstats.txt", tempPath.c_str()); if(FileIO::exists(statsfile.c_str())) { rdcstr stats; - FileIO::ReadAll(statsfile.c_str(), stats); + FileIO::ReadAll(statsfile, stats); ret += "\n\n" + stats; } @@ -359,7 +359,7 @@ rdcstr DisassembleGLSL(ShaderStage stage, const bytebuf &shaderBytes, const rdcs if(!found) return "; Invalid ISA Target specified"; - FileIO::WriteAll(inPath.c_str(), shaderBytes); + FileIO::WriteAll(inPath, shaderBytes); // try to locate the amdspv relative to our running program rdcstr vc = LocatePluginFile(pluginPath, virtualcontext_name); @@ -380,7 +380,7 @@ rdcstr DisassembleGLSL(ShaderStage stage, const bytebuf &shaderBytes, const rdcs rdcstr ret; { - FileIO::ReadAll(outPath.c_str(), ret); + FileIO::ReadAll(outPath, ret); while(ret.back() == '\0') ret.pop_back(); @@ -388,7 +388,7 @@ rdcstr DisassembleGLSL(ShaderStage stage, const bytebuf &shaderBytes, const rdcs if(FileIO::exists(statsPath.c_str())) { rdcstr stats; - FileIO::ReadAll(statsPath.c_str(), stats); + FileIO::ReadAll(statsPath, stats); ret += "\n\n" + stats; } } diff --git a/renderdoc/os/os_specific.h b/renderdoc/os/os_specific.h index 39867b27d..1a4a5eb93 100644 --- a/renderdoc/os/os_specific.h +++ b/renderdoc/os/os_specific.h @@ -330,9 +330,9 @@ void logfile_close(LogFileHandle *logHandle, const char *deleteFilename); rdcstr logfile_readall(const char *filename); // utility functions -inline bool WriteAll(const char *filename, const void *buffer, size_t size) +inline bool WriteAll(const rdcstr &filename, const void *buffer, size_t size) { - FILE *f = FileIO::fopen(filename, "wb"); + FILE *f = FileIO::fopen(filename.c_str(), "wb"); if(f == NULL) return false; @@ -344,21 +344,21 @@ inline bool WriteAll(const char *filename, const void *buffer, size_t size) } template -bool WriteAll(const char *filename, const rdcarray &buffer) +bool WriteAll(const rdcstr &filename, const rdcarray &buffer) { return WriteAll(filename, buffer.data(), buffer.size() * sizeof(T)); } template -bool WriteAll(const char *filename, const rdcstr &buffer) +bool WriteAll(const rdcstr &filename, const rdcstr &buffer) { return WriteAll(filename, buffer.c_str(), buffer.length()); } template -bool ReadAll(const char *filename, rdcarray &buffer) +bool ReadAll(const rdcstr &filename, rdcarray &buffer) { - FILE *f = FileIO::fopen(filename, "rb"); + FILE *f = FileIO::fopen(filename.c_str(), "rb"); if(f == NULL) return false; @@ -375,9 +375,9 @@ bool ReadAll(const char *filename, rdcarray &buffer) return numRead == buffer.size(); } -inline bool ReadAll(const char *filename, rdcstr &str) +inline bool ReadAll(const rdcstr &filename, rdcstr &str) { - FILE *f = FileIO::fopen(filename, "rb"); + FILE *f = FileIO::fopen(filename.c_str(), "rb"); if(f == NULL) return false;