Don't call gl::output unless perf is enabled.

gl::output allocates a pretty large stack buffer, so it has to call _chkstk. This is rather slow, so avoid calling gl::output if perf and tracing are disabled. BUG= Review URL: https://codereview.appspot.com/6843043 git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1471 736b8ea6-26fd-11df-bfd4-992fa37f6226

Don't call gl::output unless perf is enabled.
5dc3b8b4 · daniel@transgaming.com · 7cfb53f3 · 5dc3b8b4 · 5dc3b8b4
Commit 5dc3b8b4 authored Nov 28, 2012 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

debug.cpp src/common/debug.cpp +6 -0

version.h src/common/version.h +1 -1

No files found.
--- a/src/common/debug.cpp
+++ b/src/common/debug.cpp
@@ -84,6 +84,12 @@ bool perfActive()
 ScopedPerfEventHelper::ScopedPerfEventHelper(const char* format, ...)
 {
 #if !defined(ANGLE_DISABLE_PERF)
+#if defined(ANGLE_DISABLE_TRACE)
+    if (!perfActive())
+    {
+        return;
+    }
+#endif
    va_list vararg;
    va_start(vararg, format);
    output(true, reinterpret_cast<PerfOutputFunction>(D3DPERF_BeginEvent), format, vararg);

--- a/src/common/version.h
+++ b/src/common/version.h
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 1
 #define BUILD_VERSION 0
-#define BUILD_REVISION 1389
+#define BUILD_REVISION 1390

 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)