michael@0: From: Jeff Gilbert <jgilbert@mozilla.com>
michael@0: 
michael@0: diff --git a/gfx/angle/src/compiler/Diagnostics.cpp b/gfx/angle/src/compiler/Diagnostics.cpp
michael@0: --- a/gfx/angle/src/compiler/Diagnostics.cpp
michael@0: +++ b/gfx/angle/src/compiler/Diagnostics.cpp
michael@0: @@ -1,17 +1,17 @@
michael@0:  //
michael@0:  // Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
michael@0:  // Use of this source code is governed by a BSD-style license that can be
michael@0:  // found in the LICENSE file.
michael@0:  //
michael@0:  
michael@0:  #include "compiler/Diagnostics.h"
michael@0:  
michael@0: -#include "compiler/debug.h"
michael@0: +#include "compiler/compiler_debug.h"
michael@0:  #include "compiler/InfoSink.h"
michael@0:  #include "compiler/preprocessor/SourceLocation.h"
michael@0:  
michael@0:  TDiagnostics::TDiagnostics(TInfoSink& infoSink) :
michael@0:      mInfoSink(infoSink),
michael@0:      mNumErrors(0),
michael@0:      mNumWarnings(0)
michael@0:  {
michael@0: diff --git a/gfx/angle/src/compiler/DirectiveHandler.cpp b/gfx/angle/src/compiler/DirectiveHandler.cpp
michael@0: --- a/gfx/angle/src/compiler/DirectiveHandler.cpp
michael@0: +++ b/gfx/angle/src/compiler/DirectiveHandler.cpp
michael@0: @@ -3,17 +3,17 @@
michael@0:  // Use of this source code is governed by a BSD-style license that can be
michael@0:  // found in the LICENSE file.
michael@0:  //
michael@0:  
michael@0:  #include "compiler/DirectiveHandler.h"
michael@0:  
michael@0:  #include <sstream>
michael@0:  
michael@0: -#include "compiler/debug.h"
michael@0: +#include "compiler/compiler_debug.h"
michael@0:  #include "compiler/Diagnostics.h"
michael@0:  
michael@0:  static TBehavior getBehavior(const std::string& str)
michael@0:  {
michael@0:      static const std::string kRequire("require");
michael@0:      static const std::string kEnable("enable");
michael@0:      static const std::string kDisable("disable");
michael@0:      static const std::string kWarn("warn");
michael@0: diff --git a/gfx/angle/src/compiler/OutputGLSLBase.cpp b/gfx/angle/src/compiler/OutputGLSLBase.cpp
michael@0: --- a/gfx/angle/src/compiler/OutputGLSLBase.cpp
michael@0: +++ b/gfx/angle/src/compiler/OutputGLSLBase.cpp
michael@0: @@ -1,16 +1,16 @@
michael@0:  //
michael@0:  // Copyright (c) 2002-2011 The ANGLE Project Authors. All rights reserved.
michael@0:  // Use of this source code is governed by a BSD-style license that can be
michael@0:  // found in the LICENSE file.
michael@0:  //
michael@0:  
michael@0:  #include "compiler/OutputGLSLBase.h"
michael@0: -#include "compiler/debug.h"
michael@0: +#include "compiler/compiler_debug.h"
michael@0:  
michael@0:  #include <cfloat>
michael@0:  
michael@0:  namespace
michael@0:  {
michael@0:  TString arrayBrackets(const TType& type)
michael@0:  {
michael@0:      ASSERT(type.isArray());
michael@0: diff --git a/gfx/angle/src/compiler/OutputHLSL.cpp b/gfx/angle/src/compiler/OutputHLSL.cpp
michael@0: --- a/gfx/angle/src/compiler/OutputHLSL.cpp
michael@0: +++ b/gfx/angle/src/compiler/OutputHLSL.cpp
michael@0: @@ -2,17 +2,17 @@
michael@0:  // Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
michael@0:  // Use of this source code is governed by a BSD-style license that can be
michael@0:  // found in the LICENSE file.
michael@0:  //
michael@0:  
michael@0:  #include "compiler/OutputHLSL.h"
michael@0:  
michael@0:  #include "common/angleutils.h"
michael@0: -#include "compiler/debug.h"
michael@0: +#include "compiler/compiler_debug.h"
michael@0:  #include "compiler/DetectDiscontinuity.h"
michael@0:  #include "compiler/InfoSink.h"
michael@0:  #include "compiler/SearchSymbol.h"
michael@0:  #include "compiler/UnfoldShortCircuit.h"
michael@0:  
michael@0:  #include <algorithm>
michael@0:  #include <cfloat>
michael@0:  #include <stdio.h>
michael@0: diff --git a/gfx/angle/src/compiler/Types.h b/gfx/angle/src/compiler/Types.h
michael@0: --- a/gfx/angle/src/compiler/Types.h
michael@0: +++ b/gfx/angle/src/compiler/Types.h
michael@0: @@ -6,17 +6,17 @@
michael@0:  
michael@0:  #ifndef _TYPES_INCLUDED
michael@0:  #define _TYPES_INCLUDED
michael@0:  
michael@0:  #include "common/angleutils.h"
michael@0:  
michael@0:  #include "compiler/BaseTypes.h"
michael@0:  #include "compiler/Common.h"
michael@0: -#include "compiler/debug.h"
michael@0: +#include "compiler/compiler_debug.h"
michael@0:  
michael@0:  struct TPublicType;
michael@0:  class TType;
michael@0:  
michael@0:  class TField
michael@0:  {
michael@0:  public:
michael@0:      POOL_ALLOCATOR_NEW_DELETE();
michael@0: diff --git a/gfx/angle/src/compiler/debug.cpp b/gfx/angle/src/compiler/compiler_debug.cpp
michael@0: rename from gfx/angle/src/compiler/debug.cpp
michael@0: rename to gfx/angle/src/compiler/compiler_debug.cpp
michael@0: --- a/gfx/angle/src/compiler/debug.cpp
michael@0: +++ b/gfx/angle/src/compiler/compiler_debug.cpp
michael@0: @@ -1,17 +1,17 @@
michael@0:  //
michael@0:  // Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
michael@0:  // Use of this source code is governed by a BSD-style license that can be
michael@0:  // found in the LICENSE file.
michael@0:  //
michael@0:  
michael@0: -// debug.cpp: Debugging utilities.
michael@0: +// compiler_debug.cpp: Debugging utilities.
michael@0:  
michael@0: -#include "compiler/debug.h"
michael@0: +#include "compiler/compiler_debug.h"
michael@0:  
michael@0:  #include <stdarg.h>
michael@0:  #include <stdio.h>
michael@0:  
michael@0:  #include "compiler/InitializeParseContext.h"
michael@0:  #include "compiler/ParseHelper.h"
michael@0:  
michael@0:  static const int kTraceBufferLen = 1024;
michael@0: diff --git a/gfx/angle/src/compiler/debug.h b/gfx/angle/src/compiler/compiler_debug.h
michael@0: rename from gfx/angle/src/compiler/debug.h
michael@0: rename to gfx/angle/src/compiler/compiler_debug.h
michael@0: --- a/gfx/angle/src/compiler/debug.h
michael@0: +++ b/gfx/angle/src/compiler/compiler_debug.h
michael@0: @@ -1,15 +1,15 @@
michael@0:  //
michael@0:  // Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
michael@0:  // Use of this source code is governed by a BSD-style license that can be
michael@0:  // found in the LICENSE file.
michael@0:  //
michael@0:  
michael@0: -// debug.h: Debugging utilities.
michael@0: +// compiler_debug.h: Debugging utilities.
michael@0:  
michael@0:  #ifndef COMPILER_DEBUG_H_
michael@0:  #define COMPILER_DEBUG_H_
michael@0:  
michael@0:  #include <assert.h>
michael@0:  
michael@0:  #ifdef _DEBUG
michael@0:  #define TRACE_ENABLED  // define to enable debug message tracing
michael@0: diff --git a/gfx/angle/src/compiler/osinclude.h b/gfx/angle/src/compiler/osinclude.h
michael@0: --- a/gfx/angle/src/compiler/osinclude.h
michael@0: +++ b/gfx/angle/src/compiler/osinclude.h
michael@0: @@ -30,17 +30,17 @@
michael@0:  #include <windows.h>
michael@0:  #elif defined(ANGLE_OS_POSIX)
michael@0:  #include <pthread.h>
michael@0:  #include <semaphore.h>
michael@0:  #include <errno.h>
michael@0:  #endif  // ANGLE_OS_WIN
michael@0:  
michael@0:  
michael@0: -#include "compiler/debug.h"
michael@0: +#include "compiler/compiler_debug.h"
michael@0:  
michael@0:  //
michael@0:  // Thread Local Storage Operations
michael@0:  //
michael@0:  #if defined(ANGLE_OS_WIN)
michael@0:  typedef DWORD OS_TLSIndex;
michael@0:  #define OS_INVALID_TLS_INDEX (TLS_OUT_OF_INDEXES)
michael@0:  #elif defined(ANGLE_OS_POSIX)