Skip to content

S
swiftshader
Commit 271c511e by Greg Hartman
Options

Connect tracing and logcat

Change-Id: Icb27a7f83b44a1081cae2db15ac43c025a4d04fc Reviewed-on: https://swiftshader-review.googlesource.com/2681Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarGreg Hartman <ghartman@google.com>
parent 7ae353d9
Showing with 39 additions and 12 deletions
src/Common/Debug.cpp
...@@ -11,23 +11,38 @@ ...@@ -11,23 +11,38 @@
#include "Debug.hpp" #include "Debug.hpp"
#ifdef __ANDROID__
#include <utils/String8.h>
#include <log/log.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
void trace(const char *format, ...) #ifdef __ANDROID__
{ void trace(const char *format, ...)
if(false)
{ {
FILE *file = fopen("debug.txt", "a"); va_list vararg;
va_start(vararg, format);
if(file) ALOGI("%s", android::String8::formatV(format, vararg).string());
va_end(vararg);
}
#else
void trace(const char *format, ...)
{
if(false)
{ {
va_list vararg; FILE *file = fopen("debug.txt", "a");
va_start(vararg, format);
vfprintf(file, format, vararg); if(file)
va_end(vararg); {
va_list vararg;
va_start(vararg, format);
vfprintf(file, format, vararg);
va_end(vararg);
fclose(file); fclose(file);
}
} }
} }
} #endif
src/OpenGL/common/debug.cpp
...@@ -13,11 +13,22 @@ ...@@ -13,11 +13,22 @@
#include "common/debug.h" #include "common/debug.h"
#ifdef __ANDROID__
#include <utils/String8.h>
#include <log/log.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
namespace es namespace es
{ {
#ifdef __ANDROID__
void output(const char *format, va_list vararg)
{
ALOGI("%s", android::String8::formatV(format, vararg).string());
}
#else
static void output(const char *format, va_list vararg) static void output(const char *format, va_list vararg)
{ {
if(false) if(false)
...@@ -34,6 +45,7 @@ namespace es ...@@ -34,6 +45,7 @@ namespace es
} }
} }
} }
#endif
void trace(const char *format, ...) void trace(const char *format, ...)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment