mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-07-28 18:31:40 +00:00
Add a viewer of the diagnostic log in the UI itself
This commit is contained in:
@@ -564,7 +564,7 @@ extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_GetAndroidFriendlyName(cons
|
||||
friendly = Android::GetFriendlyName(deviceID);
|
||||
}
|
||||
|
||||
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_EnumerateAndroidDevices(rdcstr *deviceList)
|
||||
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_EnumerateAndroidDevices(rdcstr &deviceList)
|
||||
{
|
||||
std::string adbStdout = Android::adbExecCommand("", "devices", ".", true).strStdout;
|
||||
|
||||
@@ -592,7 +592,7 @@ extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_EnumerateAndroidDevices(rdc
|
||||
}
|
||||
}
|
||||
|
||||
*deviceList = ret;
|
||||
deviceList = ret;
|
||||
}
|
||||
|
||||
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_AndroidInitialise()
|
||||
|
||||
@@ -2293,6 +2293,9 @@ analysis program.
|
||||
)");
|
||||
extern "C" RENDERDOC_API const char *RENDERDOC_CC RENDERDOC_GetLogFile();
|
||||
|
||||
DOCUMENT("Internal function for fetching the contents of a log");
|
||||
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_GetLogFileContents(rdcstr &logfile);
|
||||
|
||||
DOCUMENT("Internal function for logging text simply.");
|
||||
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_LogText(const char *text);
|
||||
|
||||
@@ -2351,7 +2354,7 @@ extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_GetAndroidFriendlyName(cons
|
||||
rdcstr &friendly);
|
||||
|
||||
DOCUMENT("Internal function for enumerating android devices.");
|
||||
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_EnumerateAndroidDevices(rdcstr *deviceList);
|
||||
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_EnumerateAndroidDevices(rdcstr &deviceList);
|
||||
|
||||
DOCUMENT("Internal function for initialising android use.");
|
||||
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_AndroidInitialise();
|
||||
|
||||
@@ -182,6 +182,20 @@ rdcstr DoStringise(const EnvSep &el)
|
||||
END_ENUM_STRINGISE();
|
||||
}
|
||||
|
||||
template <>
|
||||
rdcstr DoStringise(const LogType &el)
|
||||
{
|
||||
BEGIN_ENUM_STRINGISE(LogType)
|
||||
{
|
||||
STRINGISE_ENUM_CLASS(Debug);
|
||||
STRINGISE_ENUM_CLASS_NAMED(Comment, "Log");
|
||||
STRINGISE_ENUM_CLASS(Warning);
|
||||
STRINGISE_ENUM_CLASS(Error);
|
||||
STRINGISE_ENUM_CLASS(Fatal);
|
||||
}
|
||||
END_ENUM_STRINGISE();
|
||||
}
|
||||
|
||||
template <>
|
||||
rdcstr DoStringise(const Topology &el)
|
||||
{
|
||||
|
||||
@@ -3373,6 +3373,7 @@ DOCUMENT(R"(The type of a log message
|
||||
enum class LogType : int32_t
|
||||
{
|
||||
Debug,
|
||||
First = Debug,
|
||||
Comment,
|
||||
Warning,
|
||||
Error,
|
||||
@@ -3382,6 +3383,8 @@ enum class LogType : int32_t
|
||||
|
||||
DECLARE_REFLECTION_ENUM(LogType);
|
||||
|
||||
ITERABLE_OPERATORS(LogType);
|
||||
|
||||
#if defined(ENABLE_PYTHON_FLAG_ENUMS)
|
||||
|
||||
ENABLE_PYTHON_FLAG_ENUMS;
|
||||
|
||||
@@ -251,6 +251,11 @@ extern "C" RENDERDOC_API const char *RENDERDOC_CC RENDERDOC_GetLogFile()
|
||||
return RDCGETLOGFILE();
|
||||
}
|
||||
|
||||
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_GetLogFileContents(rdcstr &logfile)
|
||||
{
|
||||
logfile = FileIO::logfile_readall(RDCGETLOGFILE());
|
||||
}
|
||||
|
||||
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_InitGlobalEnv(GlobalEnvironment env,
|
||||
const rdcarray<rdcstr> &args)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user