lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-25 16:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expose ToStr interface publicly, split out into separate files

Browse Source 
* Note that while this is public and uses std::string, because it's a
  template with specialisations in a .inl the string never crosses a
  module boundary - each including module has its own implementation.
* This will be used as part of the upcoming serialisation refactor.
* Some POD structs are still given ToStr implementations as we haven't
  yet switched over the serialisation system to expect all structs to
  have serialise functions.
This commit is contained in:
baldurk
2017-11-03 16:23:02 +00:00
parent 834edf0dc2
commit 3aa3262089
99 changed files with 5927 additions and 6088 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoccmd/renderdoccmd.cpp
+21 -6
View File
@@ -28,6 +28,19 @@
#include <replay/version.h>
#include <string>
// normally this is in the renderdoc core library, but it's needed for the 'unknown enum' path,
// so we implement it here using ostringstream. It's not great, but this is a very uncommon path -
// either for invalid values or for when a new enum is added and the code isn't updated
template <>
std::string DoStringise(const uint32_t &el)
{
std::ostringstream oss;
oss << el;
return oss.str();
}
#include <replay/renderdoc_tostr.inl>
using std::string;
using std::wstring;
@@ -280,13 +293,14 @@ struct ThumbCommand : public Command
bytebuf buf;
ICaptureFile *file = RENDERDOC_OpenCaptureFile(filename.c_str());
if(file->OpenStatus() == ReplayStatus::Succeeded)
ReplayStatus st = file->OpenStatus();
if(st == ReplayStatus::Succeeded)
{
buf = file->GetThumbnail(type, maxsize);
}
else
{
std::cerr << "Couldn't open '" << filename << "'" << std::endl;
std::cerr << "Couldn't open '" << filename << "': " << ToStr(st) << std::endl;
}
file->Shutdown();
@@ -540,8 +554,9 @@ struct ReplayCommand : public Command
if(remote == NULL || status != ReplayStatus::Succeeded)
{
std::cerr << "Error: Couldn't connect to " << parser.get<string>("remote-host") << ":"
<< parser.get<uint32_t>("remote-port") << "." << std::endl;
std::cerr << "Error: " << ToStr(status) << " - Couldn't connect to "
<< parser.get<string>("remote-host") << ":" << parser.get<uint32_t>("remote-port")
<< "." << std::endl;
std::cerr << " Have you run renderdoccmd remoteserver on '"
<< parser.get<string>("remote-host") << "'?" << std::endl;
return 1;
@@ -563,7 +578,7 @@ struct ReplayCommand : public Command
}
else
{
std::cerr << "Couldn't load and replay '" << filename << "'." << std::endl;
std::cerr << "Couldn't load and replay '" << filename << "': " << ToStr(status) << std::endl;
}
remote->ShutdownConnection();
@@ -595,7 +610,7 @@ struct ReplayCommand : public Command
}
else
{
std::cerr << "Couldn't load and replay '" << filename << "'." << std::endl;
std::cerr << "Couldn't load and replay '" << filename << "': " << ToStr(status) << std::endl;
return 1;
}
}