commit 6850947e144818ccdf9bab267b3d8c9fe3b88abb
author Geoff Lang <geofflang@chromium.org> Mon Oct 07 17:06:30 2013 -0400
committer Geoff Lang <geofflang@chromium.org> Thu Oct 17 09:37:04 2013 -0400
tree 6e7c5fe61d1e0874b8aa871ada723ad85a232d0d
parent c3597523bc92ed32dfe34fa9d54a9a0a09e071fc

Added a define that removes d3d includes from the common directory so that d3d9 headers are not included in the translator project.

src/common/debug.cpp

diff --git a/src/common/debug.cpp b/src/common/debug.cpp
index 2333740..5b0f9c1 100644
--- a/src/common/debug.cpp
+++ b/src/common/debug.cpp
@@ -8,12 +8,18 @@
 
 #include "common/debug.h"
 #include "common/system.h"
+
+#if defined(ANGLE_ENABLE_D3D_EVENTS)
 #include <d3d9.h>
+#endif
 
 namespace gl
 {
-
+#if defined(ANGLE_ENABLE_D3D_EVENTS)
 typedef void (WINAPI *PerfOutputFunction)(D3DCOLOR, LPCWSTR);
+#else
+typedef void (*PerfOutputFunction)(unsigned int, const wchar_t*);
+#endif
 
 static void output(bool traceFileDebugOnly, PerfOutputFunction perfFunc, const char *format, va_list vararg)
 {
@@ -60,7 +66,7 @@
 {
     va_list vararg;
     va_start(vararg, format);
-#if defined(ANGLE_DISABLE_PERF)
+#if defined(ANGLE_DISABLE_PERF) || !defined(ANGLE_ENABLE_D3D_EVENTS)
     output(traceFileDebugOnly, NULL, format, vararg);
 #else
     output(traceFileDebugOnly, D3DPERF_SetMarker, format, vararg);
@@ -70,7 +76,7 @@
 
 bool perfActive()
 {
-#if defined(ANGLE_DISABLE_PERF)
+#if defined(ANGLE_DISABLE_PERF) || !defined(ANGLE_ENABLE_D3D_EVENTS)
     return false;
 #else
     static bool active = D3DPERF_GetStatus() != 0;
@@ -80,7 +86,7 @@
 
 ScopedPerfEventHelper::ScopedPerfEventHelper(const char* format, ...)
 {
-#if !defined(ANGLE_DISABLE_PERF)
+#if !defined(ANGLE_DISABLE_PERF) && defined(ANGLE_ENABLE_D3D_EVENTS)
 #if defined(ANGLE_DISABLE_TRACE)
     if (!perfActive())
     {
@@ -96,7 +102,7 @@
 
 ScopedPerfEventHelper::~ScopedPerfEventHelper()
 {
-#if !defined(ANGLE_DISABLE_PERF)
+#if !defined(ANGLE_DISABLE_PERF) && defined(ANGLE_ENABLE_D3D_EVENTS)
     if (perfActive())
     {
         D3DPERF_EndEvent();