Add information to bench output.
http://codereview.appspot.com/4602057/
git-svn-id: http://skia.googlecode.com/svn/trunk@1598 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/bench/benchmain.cpp b/bench/benchmain.cpp
index 34f8a1a..7fce807 100644
--- a/bench/benchmain.cpp
+++ b/bench/benchmain.cpp
@@ -355,16 +355,59 @@
// report our current settings
{
SkString str;
- str.printf("skia bench: alpha=0x%02X antialias=%d filter=%d\n",
+ str.printf("skia bench: alpha=0x%02X antialias=%d filter=%d",
forceAlpha, forceAA, forceFilter);
+ str.appendf(" rotate=%d scale=%d clip=%d",
+ doRotate, doScale, doClip);
+
+ const char * ditherName;
+ switch (forceDither) {
+ case SkTriState::kDefault: ditherName = "default"; break;
+ case SkTriState::kTrue: ditherName = "true"; break;
+ case SkTriState::kFalse: ditherName = "false"; break;
+ default: ditherName = "<invalid>"; break;
+ }
+ str.appendf(" dither=%s", ditherName);
+
+ if (hasStrokeWidth) {
+ str.appendf(" strokeWidth=%f", strokeWidth);
+ } else {
+ str.append(" strokeWidth=none");
+ }
+
+#if defined(SK_SCALAR_IS_FLOAT)
+ str.append(" scalar=float");
+#elif defined(SK_SCALAR_IS_FIXED)
+ str.append(" scalar=fixed");
+#endif
+
+#if defined(SK_BUILD_FOR_WIN32)
+ str.append(" system=WIN32");
+#elif defined(SK_BUILD_FOR_MAC)
+ str.append(" system=MAC");
+#elif defined(SK_BUILD_FOR_ANDROID)
+ str.append(" system=ANDROID");
+#elif defined(SK_BUILD_FOR_UNIX)
+ str.append(" system=UNIX");
+#else
+ str.append(" system=other");
+#endif
+
+#if defined(SK_DEBUG)
+ str.append(" DEBUG");
+#endif
+ str.append("\n");
log_progress(str);
}
GrContext* context = NULL;
+ //Don't do GL when fixed.
+#if !defined(SK_SCALAR_IS_FIXED)
SkEGLContext eglContext;
if (eglContext.init(1024, 1024)) {
context = GrContext::CreateGLShaderContext();
}
+#endif
BenchTimer timer = BenchTimer();