1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/gfx/angle/angle-build-dedupe-debug-cpp-h.patch Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,180 @@
1.4 +From: Jeff Gilbert <jgilbert@mozilla.com>
1.5 +
1.6 +diff --git a/gfx/angle/src/compiler/Diagnostics.cpp b/gfx/angle/src/compiler/Diagnostics.cpp
1.7 +--- a/gfx/angle/src/compiler/Diagnostics.cpp
1.8 ++++ b/gfx/angle/src/compiler/Diagnostics.cpp
1.9 +@@ -1,17 +1,17 @@
1.10 + //
1.11 + // Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
1.12 + // Use of this source code is governed by a BSD-style license that can be
1.13 + // found in the LICENSE file.
1.14 + //
1.15 +
1.16 + #include "compiler/Diagnostics.h"
1.17 +
1.18 +-#include "compiler/debug.h"
1.19 ++#include "compiler/compiler_debug.h"
1.20 + #include "compiler/InfoSink.h"
1.21 + #include "compiler/preprocessor/SourceLocation.h"
1.22 +
1.23 + TDiagnostics::TDiagnostics(TInfoSink& infoSink) :
1.24 + mInfoSink(infoSink),
1.25 + mNumErrors(0),
1.26 + mNumWarnings(0)
1.27 + {
1.28 +diff --git a/gfx/angle/src/compiler/DirectiveHandler.cpp b/gfx/angle/src/compiler/DirectiveHandler.cpp
1.29 +--- a/gfx/angle/src/compiler/DirectiveHandler.cpp
1.30 ++++ b/gfx/angle/src/compiler/DirectiveHandler.cpp
1.31 +@@ -3,17 +3,17 @@
1.32 + // Use of this source code is governed by a BSD-style license that can be
1.33 + // found in the LICENSE file.
1.34 + //
1.35 +
1.36 + #include "compiler/DirectiveHandler.h"
1.37 +
1.38 + #include <sstream>
1.39 +
1.40 +-#include "compiler/debug.h"
1.41 ++#include "compiler/compiler_debug.h"
1.42 + #include "compiler/Diagnostics.h"
1.43 +
1.44 + static TBehavior getBehavior(const std::string& str)
1.45 + {
1.46 + static const std::string kRequire("require");
1.47 + static const std::string kEnable("enable");
1.48 + static const std::string kDisable("disable");
1.49 + static const std::string kWarn("warn");
1.50 +diff --git a/gfx/angle/src/compiler/OutputGLSLBase.cpp b/gfx/angle/src/compiler/OutputGLSLBase.cpp
1.51 +--- a/gfx/angle/src/compiler/OutputGLSLBase.cpp
1.52 ++++ b/gfx/angle/src/compiler/OutputGLSLBase.cpp
1.53 +@@ -1,16 +1,16 @@
1.54 + //
1.55 + // Copyright (c) 2002-2011 The ANGLE Project Authors. All rights reserved.
1.56 + // Use of this source code is governed by a BSD-style license that can be
1.57 + // found in the LICENSE file.
1.58 + //
1.59 +
1.60 + #include "compiler/OutputGLSLBase.h"
1.61 +-#include "compiler/debug.h"
1.62 ++#include "compiler/compiler_debug.h"
1.63 +
1.64 + #include <cfloat>
1.65 +
1.66 + namespace
1.67 + {
1.68 + TString arrayBrackets(const TType& type)
1.69 + {
1.70 + ASSERT(type.isArray());
1.71 +diff --git a/gfx/angle/src/compiler/OutputHLSL.cpp b/gfx/angle/src/compiler/OutputHLSL.cpp
1.72 +--- a/gfx/angle/src/compiler/OutputHLSL.cpp
1.73 ++++ b/gfx/angle/src/compiler/OutputHLSL.cpp
1.74 +@@ -2,17 +2,17 @@
1.75 + // Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
1.76 + // Use of this source code is governed by a BSD-style license that can be
1.77 + // found in the LICENSE file.
1.78 + //
1.79 +
1.80 + #include "compiler/OutputHLSL.h"
1.81 +
1.82 + #include "common/angleutils.h"
1.83 +-#include "compiler/debug.h"
1.84 ++#include "compiler/compiler_debug.h"
1.85 + #include "compiler/DetectDiscontinuity.h"
1.86 + #include "compiler/InfoSink.h"
1.87 + #include "compiler/SearchSymbol.h"
1.88 + #include "compiler/UnfoldShortCircuit.h"
1.89 +
1.90 + #include <algorithm>
1.91 + #include <cfloat>
1.92 + #include <stdio.h>
1.93 +diff --git a/gfx/angle/src/compiler/Types.h b/gfx/angle/src/compiler/Types.h
1.94 +--- a/gfx/angle/src/compiler/Types.h
1.95 ++++ b/gfx/angle/src/compiler/Types.h
1.96 +@@ -6,17 +6,17 @@
1.97 +
1.98 + #ifndef _TYPES_INCLUDED
1.99 + #define _TYPES_INCLUDED
1.100 +
1.101 + #include "common/angleutils.h"
1.102 +
1.103 + #include "compiler/BaseTypes.h"
1.104 + #include "compiler/Common.h"
1.105 +-#include "compiler/debug.h"
1.106 ++#include "compiler/compiler_debug.h"
1.107 +
1.108 + struct TPublicType;
1.109 + class TType;
1.110 +
1.111 + class TField
1.112 + {
1.113 + public:
1.114 + POOL_ALLOCATOR_NEW_DELETE();
1.115 +diff --git a/gfx/angle/src/compiler/debug.cpp b/gfx/angle/src/compiler/compiler_debug.cpp
1.116 +rename from gfx/angle/src/compiler/debug.cpp
1.117 +rename to gfx/angle/src/compiler/compiler_debug.cpp
1.118 +--- a/gfx/angle/src/compiler/debug.cpp
1.119 ++++ b/gfx/angle/src/compiler/compiler_debug.cpp
1.120 +@@ -1,17 +1,17 @@
1.121 + //
1.122 + // Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
1.123 + // Use of this source code is governed by a BSD-style license that can be
1.124 + // found in the LICENSE file.
1.125 + //
1.126 +
1.127 +-// debug.cpp: Debugging utilities.
1.128 ++// compiler_debug.cpp: Debugging utilities.
1.129 +
1.130 +-#include "compiler/debug.h"
1.131 ++#include "compiler/compiler_debug.h"
1.132 +
1.133 + #include <stdarg.h>
1.134 + #include <stdio.h>
1.135 +
1.136 + #include "compiler/InitializeParseContext.h"
1.137 + #include "compiler/ParseHelper.h"
1.138 +
1.139 + static const int kTraceBufferLen = 1024;
1.140 +diff --git a/gfx/angle/src/compiler/debug.h b/gfx/angle/src/compiler/compiler_debug.h
1.141 +rename from gfx/angle/src/compiler/debug.h
1.142 +rename to gfx/angle/src/compiler/compiler_debug.h
1.143 +--- a/gfx/angle/src/compiler/debug.h
1.144 ++++ b/gfx/angle/src/compiler/compiler_debug.h
1.145 +@@ -1,15 +1,15 @@
1.146 + //
1.147 + // Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
1.148 + // Use of this source code is governed by a BSD-style license that can be
1.149 + // found in the LICENSE file.
1.150 + //
1.151 +
1.152 +-// debug.h: Debugging utilities.
1.153 ++// compiler_debug.h: Debugging utilities.
1.154 +
1.155 + #ifndef COMPILER_DEBUG_H_
1.156 + #define COMPILER_DEBUG_H_
1.157 +
1.158 + #include <assert.h>
1.159 +
1.160 + #ifdef _DEBUG
1.161 + #define TRACE_ENABLED // define to enable debug message tracing
1.162 +diff --git a/gfx/angle/src/compiler/osinclude.h b/gfx/angle/src/compiler/osinclude.h
1.163 +--- a/gfx/angle/src/compiler/osinclude.h
1.164 ++++ b/gfx/angle/src/compiler/osinclude.h
1.165 +@@ -30,17 +30,17 @@
1.166 + #include <windows.h>
1.167 + #elif defined(ANGLE_OS_POSIX)
1.168 + #include <pthread.h>
1.169 + #include <semaphore.h>
1.170 + #include <errno.h>
1.171 + #endif // ANGLE_OS_WIN
1.172 +
1.173 +
1.174 +-#include "compiler/debug.h"
1.175 ++#include "compiler/compiler_debug.h"
1.176 +
1.177 + //
1.178 + // Thread Local Storage Operations
1.179 + //
1.180 + #if defined(ANGLE_OS_WIN)
1.181 + typedef DWORD OS_TLSIndex;
1.182 + #define OS_INVALID_TLS_INDEX (TLS_OUT_OF_INDEXES)
1.183 + #elif defined(ANGLE_OS_POSIX)
