Revert "Remove separate compilerdebug.h in favor of debug.h"

src/compiler.gypi

@@ -113,6 +113,8 @@
             'compiler/translator/VersionGLSL.h',
             'compiler/translator/blocklayout.cpp',
             'compiler/translator/blocklayout.h',
+            'compiler/translator/compilerdebug.cpp',
+            'compiler/translator/compilerdebug.h',
             'compiler/translator/depgraph/DependencyGraph.cpp',
             'compiler/translator/depgraph/DependencyGraph.h',
             'compiler/translator/depgraph/DependencyGraphBuilder.cpp',

src/compiler/translator/BaseTypes.h

@@ -7,7 +7,7 @@
 #ifndef COMPILER_TRANSLATOR_BASETYPES_H_
 #define COMPILER_TRANSLATOR_BASETYPES_H_
 
-#include "common/debug.h"
+#include "compiler/translator/compilerdebug.h"
 
 //
 // Precision qualifiers

src/compiler/translator/Common.h

@@ -14,9 +14,9 @@
 #include <limits>
 #include <stdio.h>
 
-#include "common/angleutils.h"
-#include "common/debug.h"
 #include "compiler/translator/PoolAlloc.h"
+#include "compiler/translator/compilerdebug.h"
+#include "common/angleutils.h"
 
 struct TSourceLoc {
     int first_file;

src/compiler/translator/Diagnostics.cpp

@@ -6,7 +6,7 @@
 
 #include "compiler/translator/Diagnostics.h"
 
-#include "common/debug.h"
+#include "compiler/translator/compilerdebug.h"
 #include "compiler/translator/InfoSink.h"
 #include "compiler/preprocessor/SourceLocation.h"
 
@@ -50,6 +50,11 @@ void TDiagnostics::writeInfo(Severity severity,
     sink << "'" << token <<  "' : " << reason << " " << extra << "\n";
 }
 
+void TDiagnostics::writeDebug(const std::string& str)
+{
+    mInfoSink.debug << str;
+}
+
 void TDiagnostics::print(ID id,
                          const pp::SourceLocation& loc,
                          const std::string& text)

src/compiler/translator/Diagnostics.h

@@ -29,6 +29,8 @@ class TDiagnostics : public pp::Diagnostics, angle::NonCopyable
                    const std::string& token,
                    const std::string& extra);
 
+    void writeDebug(const std::string& str);
+
   protected:
     virtual void print(ID id,
                        const pp::SourceLocation& loc,

src/compiler/translator/DirectiveHandler.cpp

@@ -8,7 +8,7 @@
 
 #include <sstream>
 
-#include "common/debug.h"
+#include "compiler/translator/compilerdebug.h"
 #include "compiler/translator/Diagnostics.h"
 
 static TBehavior getBehavior(const std::string& str)

src/compiler/translator/InitializeVariables.cpp

@@ -5,8 +5,7 @@
 //
 
 #include "compiler/translator/InitializeVariables.h"
-
-#include "common/debug.h"
+#include "compiler/translator/compilerdebug.h"
 
 namespace
 {

src/compiler/translator/OutputGLSLBase.cpp

@@ -5,8 +5,7 @@
 //
 
 #include "compiler/translator/OutputGLSLBase.h"
-
-#include "common/debug.h"
+#include "compiler/translator/compilerdebug.h"
 
 #include <cfloat>
 

src/compiler/translator/OutputHLSL.cpp

@@ -11,7 +11,6 @@
 #include <stdio.h>
 
 #include "common/angleutils.h"
-#include "common/debug.h"
 #include "common/utilities.h"
 #include "compiler/translator/BuiltInFunctionEmulator.h"
 #include "compiler/translator/BuiltInFunctionEmulatorHLSL.h"
@@ -27,6 +26,7 @@
 #include "compiler/translator/UniformHLSL.h"
 #include "compiler/translator/UtilsHLSL.h"
 #include "compiler/translator/blocklayout.h"
+#include "compiler/translator/compilerdebug.h"
 #include "compiler/translator/util.h"
 
 namespace sh

src/compiler/translator/ParseContext.cpp

@@ -198,6 +198,11 @@ void TParseContext::warning(const TSourceLoc& loc,
                           srcLoc, reason, token, extraInfo);
 }
 
+void TParseContext::trace(const char* str)
+{
+    diagnostics.writeDebug(str);
+}
+
 //
 // Same error message for all places assignments don't work.
 //

src/compiler/translator/ParseContext.h

@@ -78,6 +78,7 @@ struct TParseContext {
                const char* extraInfo="");
     void warning(const TSourceLoc& loc, const char* reason, const char* token,
                  const char* extraInfo="");
+    void trace(const char* str);
     void recover();
 
     // This method is guaranteed to succeed, even if no variable with 'name' exists.

src/compiler/translator/RegenerateStructNames.cpp

@@ -4,8 +4,8 @@
 // found in the LICENSE file.
 //
 
-#include "common/debug.h"
 #include "compiler/translator/RegenerateStructNames.h"
+#include "compiler/translator/compilerdebug.h"
 
 void RegenerateStructNames::visitSymbol(TIntermSymbol *symbol)
 {

src/compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp

@@ -4,8 +4,8 @@
 // found in the LICENSE file.
 //
 
-#include "common/debug.h"
 #include "compiler/translator/ScalarizeVecAndMatConstructorArgs.h"
+#include "compiler/translator/compilerdebug.h"
 
 #include <algorithm>
 

src/compiler/translator/ShaderVars.cpp

@@ -9,7 +9,7 @@
 
 #include <GLSLANG/ShaderLang.h>
 
-#include "common/debug.h"
+#include "compiler/translator/compilerdebug.h"
 
 namespace sh
 {

src/compiler/translator/Types.h

@@ -8,10 +8,10 @@
 #define COMPILER_TRANSLATOR_TYPES_H_
 
 #include "common/angleutils.h"
-#include "common/debug.h"
 
 #include "compiler/translator/BaseTypes.h"
 #include "compiler/translator/Common.h"
+#include "compiler/translator/compilerdebug.h"
 
 struct TPublicType;
 class TType;

src/compiler/translator/compilerdebug.cpp

+//
+// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+
+// debug.cpp: Debugging utilities.
+
+#include "compiler/translator/compilerdebug.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "compiler/translator/InitializeParseContext.h"
+#include "compiler/translator/ParseContext.h"
+
+#ifdef TRACE_ENABLED
+static const int kTraceBufferLen = 1024;
+
+extern "C" {
+void Trace(const char *format, ...) {
+    if (!format) return;
+
+    TParseContext* parseContext = GetGlobalParseContext();
+    if (parseContext) {
+        char buf[kTraceBufferLen];
+        va_list args;
+        va_start(args, format);
+        vsnprintf(buf, kTraceBufferLen, format, args);
+        va_end(args);
+
+        parseContext->trace(buf);
+    }
+}
+}  // extern "C"
+#endif  // TRACE_ENABLED
+

src/compiler/translator/compilerdebug.h

+//
+// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+
+// debug.h: Debugging utilities.
+
+#ifndef COMPILER_TRANSLATOR_COMPILERDEBUG_H_
+#define COMPILER_TRANSLATOR_COMPILERDEBUG_H_
+
+#include <assert.h>
+
+#ifdef _DEBUG
+#define TRACE_ENABLED  // define to enable debug message tracing
+#endif  // _DEBUG
+
+// Outputs text to the debug log
+#ifdef TRACE_ENABLED
+
+#ifdef  __cplusplus
+extern "C" {
+#endif  // __cplusplus
+void Trace(const char* format, ...);
+#ifdef  __cplusplus
+}
+#endif  // __cplusplus
+
+#else   // TRACE_ENABLED
+
+#define Trace(...) ((void)0)
+
+#endif  // TRACE_ENABLED
+
+// A macro asserting a condition and outputting failures to the debug log
+#define ASSERT(expression) do { \
+    if(!(expression)) \
+        Trace("Assert failed: %s(%d): "#expression"\n", __FUNCTION__, __LINE__); \
+    assert(expression); \
+} while(0)
+
+#define UNIMPLEMENTED() do { \
+    Trace("Unimplemented invoked: %s(%d)\n", __FUNCTION__, __LINE__); \
+    assert(false); \
+} while(0)
+
+#define UNREACHABLE() do { \
+    Trace("Unreachable reached: %s(%d)\n", __FUNCTION__, __LINE__); \
+    assert(false); \
+} while(0)
+
+#endif   // COMPILER_TRANSLATOR_COMPILERDEBUG_H_
+