lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-03 21:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove use of const char * in public API and OS specific where possible

Browse Source 
* This prevents unnecessary conversions back and forth between rdcstr and const
  char * when going through interfaces. In the OS specific layer this is rarely
  an issue because most of the implementations don't convert to rdcstr, but it
  is convenient to be able to pass in an rdcstr directly. The few cases where
  there's an unecessary construction of an rdcstr is acceptable.
* A couple of places in the public API need to return a string from a global
  function, so can't return an rdcstr due to C ABI, so they still return a const
  char *.
* Similarly const char * is kept for logging, to avoid a dependency on rdcstr
  and because that's one place where unnecessary conversions/constructions may
  be impactful.
This commit is contained in:
baldurk
2020-12-07 17:44:50 +00:00
parent df6fec13f9
commit e5f4ca7bb8
109 changed files with 777 additions and 840 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/android_tools.cpp
+19 -26
View File
@@ -43,7 +43,7 @@ bool toolExists(const rdcstr &path)
{
if(path.empty())
return false;
return FileIO::exists(path.c_str()) || FileIO::exists((path + ".exe").c_str());
return FileIO::exists(path) || FileIO::exists(path + ".exe");
}
rdcstr getToolInSDK(ToolDir subdir, const rdcstr &jdkroot, const rdcstr &sdkroot,
const rdcstr &toolname)
@@ -90,7 +90,7 @@ rdcstr getToolInSDK(ToolDir subdir, const rdcstr &jdkroot, const rdcstr &sdkroot
toolpath = sdkroot + "/build-tools/";
rdcarray<PathEntry> paths;
FileIO::GetFilesInDirectory(toolpath.c_str(), paths);
FileIO::GetFilesInDirectory(toolpath, paths);
if(paths.empty())
break;
@@ -235,44 +235,37 @@ rdcstr getToolPath(ToolDir subdir, const rdcstr &toolname, bool checkExist)
}
// now try to find it based on heuristics/environment variables
const char *env = Process::GetEnvVariable("JAVA_HOME");
jdk = Process::GetEnvVariable("JAVA_HOME");
sdk = Process::GetEnvVariable("ANDROID_HOME");
jdk = env ? env : "";
env = Process::GetEnvVariable("ANDROID_HOME");
sdk = env ? env : "";
if(sdk.empty() || !FileIO::exists(sdk.c_str()))
if(sdk.empty() || !FileIO::exists(sdk))
{
env = Process::GetEnvVariable("ANDROID_SDK_ROOT");
sdk = env ? env : "";
sdk = Process::GetEnvVariable("ANDROID_SDK_ROOT");
}
if(sdk.empty() || !FileIO::exists(sdk.c_str()))
if(sdk.empty() || !FileIO::exists(sdk))
{
env = Process::GetEnvVariable("ANDROID_SDK");
sdk = env ? env : "";
sdk = Process::GetEnvVariable("ANDROID_SDK");
}
if(sdk.empty() || !FileIO::exists(sdk.c_str()))
if(sdk.empty() || !FileIO::exists(sdk))
{
env = Process::GetEnvVariable("ANDROID_SDK_HOME");
sdk = env ? env : "";
sdk = Process::GetEnvVariable("ANDROID_SDK_HOME");
}
#if ENABLED(RDOC_APPLE)
// on macOS it's common not to have the environment variable globally available, so try the home
// Library folder first, then the global folder
if(sdk.empty() || !FileIO::exists(sdk.c_str()))
if(sdk.empty() || !FileIO::exists(sdk))
{
rdcstr librarySDK = FileIO::GetHomeFolderFilename() + "/Library/Android/sdk";
sdk = FileIO::exists(librarySDK.c_str()) ? librarySDK : "";
sdk = FileIO::exists(librarySDK) ? librarySDK : "";
}
if(sdk.empty() || !FileIO::exists(sdk.c_str()))
if(sdk.empty() || !FileIO::exists(sdk))
{
rdcstr librarySDK = "/Library/Android/sdk";
sdk = FileIO::exists(librarySDK.c_str()) ? librarySDK : "";
sdk = FileIO::exists(librarySDK) ? librarySDK : "";
}
#endif
@@ -318,7 +311,7 @@ Process::ProcessResult execScript(const rdcstr &script, const rdcstr &args, cons
RDCLOG("SCRIPT: %s", script.c_str());
Process::ProcessResult result;
Process::LaunchScript(script.c_str(), workDir.c_str(), args.c_str(), true, &result);
Process::LaunchScript(script, workDir, args, true, &result);
return result;
}
Process::ProcessResult execCommand(const rdcstr &exe, const rdcstr &args, const rdcstr &workDir,
@@ -328,7 +321,7 @@ Process::ProcessResult execCommand(const rdcstr &exe, const rdcstr &args, const
RDCLOG("COMMAND: %s '%s'", exe.c_str(), args.c_str());
Process::ProcessResult result;
Process::LaunchProcess(exe.c_str(), workDir.c_str(), args.c_str(), true, &result);
Process::LaunchProcess(exe, workDir, args, true, &result);
return result;
}
Process::ProcessResult adbExecCommand(const rdcstr &device, const rdcstr &args,
@@ -353,16 +346,16 @@ void initAdb()
RDCLOG("Initialising adb using '%s'", adb.c_str());
if(adb.empty() || (!FileIO::exists(adb.c_str()) && !FileIO::exists((adb + ".exe").c_str())))
if(adb.empty() || (!FileIO::exists(adb) && !FileIO::exists(adb + ".exe")))
{
if(FileIO::FindFileInPath(adb.c_str()) == "")
if(FileIO::FindFileInPath(adb) == "")
RDCWARN(
"Couldn't locate adb. Ensure adb is in PATH, ANDROID_SDK or ANDROID_HOME is set, or you "
"configure your SDK location");
}
Process::ProcessResult res = {};
Process::LaunchProcess(adb.c_str(), workdir.c_str(), "start-server", true, &res);
Process::LaunchProcess(adb, workdir, "start-server", true, &res);
if(res.strStdout.find("daemon") >= 0 || res.strStderror.find("daemon") >= 0)
{