lee/renderdoc
1
0 Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-10-22 12:01:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change API enums to enum class, remove now redundant prefixing

Browse Source 
* This gives a little nicer syntax, a bit better type safety, and also
  reflects better for SWIG bindings. Overall it's a minor change but
  better.
* We don't update the C# UI at all, since it's soon to be removed and
  not worth the effort/code churn.
* For now so we're ABI compatible with C#, all enums are uint32_t, but
  that is an obvious optimisation in future to reduce struct packing.
* We avoid 'None' as an enum value, because it's a reserved word in
  python so will cause problems generating bindings.
This commit is contained in:
baldurk committed 2017-04-18 14:57:33 +01:00
1 parent 71e779a08f
commit d40fc8471d
158 files changed
+6386 -6176
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

renderdoc/common/common.cpp
+8 -14
View File
@@ -81,7 +81,7 @@ float SRGB8_lookuptable[256] = {
void rdcassert(const char *msg, const char *file, unsigned int line, const char *func)
{
rdclog_int(RDCLog_Error, RDCLOG_PROJECT, file, line, "Assertion failed: %s", msg);
rdclog_int(LogType::Error, RDCLOG_PROJECT, file, line, "Assertion failed: %s", msg);
}
#if 0
@@ -317,12 +317,12 @@ void rdclogprint_int(LogType type, const char *fullMsg, const char *msg)
#endif
#if ENABLED(OUTPUT_LOG_TO_STDOUT)
// don't output debug messages to stdout/stderr
if(type != RDCLog_Debug && log_output_enabled)
if(type != LogType::Debug && log_output_enabled)
OSUtility::WriteOutput(OSUtility::Output_StdOut, msg);
#endif
#if ENABLED(OUTPUT_LOG_TO_STDERR)
// don't output debug messages to stdout/stderr
if(type != RDCLog_Debug && log_output_enabled)
if(type != LogType::Debug && log_output_enabled)
OSUtility::WriteOutput(OSUtility::Output_StdErr, msg);
#endif
#if ENABLED(OUTPUT_LOG_TO_DISK)
@@ -340,12 +340,6 @@ static char rdclog_outputBuffer[rdclog_outBufSize + 1];
void rdclog_int(LogType type, const char *project, const char *file, unsigned int line,
const char *fmt, ...)
{
if(type <= RDCLog_First || type >= RDCLog_NumTypes)
{
RDCFATAL("Unexpected log type");
return;
}
va_list args;
va_start(args, fmt);
@@ -361,7 +355,7 @@ void rdclog_int(LogType type, const char *project, const char *file, unsigned in
StringFormat::snprintf(location, 63, "% 20s(%4d) - ", loc.c_str(), line);
#endif
const char *typestr[RDCLog_NumTypes] = {
const char *typestr[(uint32_t)LogType::Count] = {
"Debug ", "Log ", "Warning", "Error ", "Fatal ",
};
@@ -374,9 +368,9 @@ void rdclog_int(LogType type, const char *project, const char *file, unsigned in
char *output = rdclog_outputBuffer;
size_t available = rdclog_outBufSize;
int numWritten =
StringFormat::snprintf(output, available, "% 4s %06u: %s%s%s - ", project,
Process::GetCurrentPID(), timestamp, location, typestr[type]);
int numWritten = StringFormat::snprintf(output, available, "% 4s %06u: %s%s%s - ", project,
Process::GetCurrentPID(), timestamp, location,
typestr[(uint32_t)type]);
if(numWritten < 0)
{
@@ -388,7 +382,7 @@ void rdclog_int(LogType type, const char *project, const char *file, unsigned in
available -= numWritten;
// -3 is for the " - " after the type.
const char *noPrefixOutput = (output - 3 - (sizeof(typestr[type]) - 1));
const char *noPrefixOutput = (output - 3 - (sizeof(typestr[(uint32_t)type]) - 1));
numWritten = StringFormat::vsnprintf(output, available, fmt, args);