The Tor Browser / file comparison
comparison: gfx/angle/angle-build-dedupe-debug-cpp-h.patch
gfx/angle/angle-build-dedupe-debug-cpp-h.patch
- branch
- TOR_BUG_9701
- changeset 15
- b8a032363ba2
equal
deleted
inserted
replaced
| -1:000000000000 | 0:1d93fb13df6c |
|---|---|
| 1 From: Jeff Gilbert <jgilbert@mozilla.com> | |
| 2 | |
| 3 diff --git a/gfx/angle/src/compiler/Diagnostics.cpp b/gfx/angle/src/compiler/Diagnostics.cpp | |
| 4 --- a/gfx/angle/src/compiler/Diagnostics.cpp | |
| 5 +++ b/gfx/angle/src/compiler/Diagnostics.cpp | |
| 6 @@ -1,17 +1,17 @@ | |
| 7 // | |
| 8 // Copyright (c) 2012 The ANGLE Project Authors. All rights reserved. | |
| 9 // Use of this source code is governed by a BSD-style license that can be | |
| 10 // found in the LICENSE file. | |
| 11 // | |
| 12 | |
| 13 #include "compiler/Diagnostics.h" | |
| 14 | |
| 15 -#include "compiler/debug.h" | |
| 16 +#include "compiler/compiler_debug.h" | |
| 17 #include "compiler/InfoSink.h" | |
| 18 #include "compiler/preprocessor/SourceLocation.h" | |
| 19 | |
| 20 TDiagnostics::TDiagnostics(TInfoSink& infoSink) : | |
| 21 mInfoSink(infoSink), | |
| 22 mNumErrors(0), | |
| 23 mNumWarnings(0) | |
| 24 { | |
| 25 diff --git a/gfx/angle/src/compiler/DirectiveHandler.cpp b/gfx/angle/src/compiler/DirectiveHandler.cpp | |
| 26 --- a/gfx/angle/src/compiler/DirectiveHandler.cpp | |
| 27 +++ b/gfx/angle/src/compiler/DirectiveHandler.cpp | |
| 28 @@ -3,17 +3,17 @@ | |
| 29 // Use of this source code is governed by a BSD-style license that can be | |
| 30 // found in the LICENSE file. | |
| 31 // | |
| 32 | |
| 33 #include "compiler/DirectiveHandler.h" | |
| 34 | |
| 35 #include <sstream> | |
| 36 | |
| 37 -#include "compiler/debug.h" | |
| 38 +#include "compiler/compiler_debug.h" | |
| 39 #include "compiler/Diagnostics.h" | |
| 40 | |
| 41 static TBehavior getBehavior(const std::string& str) | |
| 42 { | |
| 43 static const std::string kRequire("require"); | |
| 44 static const std::string kEnable("enable"); | |
| 45 static const std::string kDisable("disable"); | |
| 46 static const std::string kWarn("warn"); | |
| 47 diff --git a/gfx/angle/src/compiler/OutputGLSLBase.cpp b/gfx/angle/src/compiler/OutputGLSLBase.cpp | |
| 48 --- a/gfx/angle/src/compiler/OutputGLSLBase.cpp | |
| 49 +++ b/gfx/angle/src/compiler/OutputGLSLBase.cpp | |
| 50 @@ -1,16 +1,16 @@ | |
| 51 // | |
| 52 // Copyright (c) 2002-2011 The ANGLE Project Authors. All rights reserved. | |
| 53 // Use of this source code is governed by a BSD-style license that can be | |
| 54 // found in the LICENSE file. | |
| 55 // | |
| 56 | |
| 57 #include "compiler/OutputGLSLBase.h" | |
| 58 -#include "compiler/debug.h" | |
| 59 +#include "compiler/compiler_debug.h" | |
| 60 | |
| 61 #include <cfloat> | |
| 62 | |
| 63 namespace | |
| 64 { | |
| 65 TString arrayBrackets(const TType& type) | |
| 66 { | |
| 67 ASSERT(type.isArray()); | |
| 68 diff --git a/gfx/angle/src/compiler/OutputHLSL.cpp b/gfx/angle/src/compiler/OutputHLSL.cpp | |
| 69 --- a/gfx/angle/src/compiler/OutputHLSL.cpp | |
| 70 +++ b/gfx/angle/src/compiler/OutputHLSL.cpp | |
| 71 @@ -2,17 +2,17 @@ | |
| 72 // Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved. | |
| 73 // Use of this source code is governed by a BSD-style license that can be | |
| 74 // found in the LICENSE file. | |
| 75 // | |
| 76 | |
| 77 #include "compiler/OutputHLSL.h" | |
| 78 | |
| 79 #include "common/angleutils.h" | |
| 80 -#include "compiler/debug.h" | |
| 81 +#include "compiler/compiler_debug.h" | |
| 82 #include "compiler/DetectDiscontinuity.h" | |
| 83 #include "compiler/InfoSink.h" | |
| 84 #include "compiler/SearchSymbol.h" | |
| 85 #include "compiler/UnfoldShortCircuit.h" | |
| 86 | |
| 87 #include <algorithm> | |
| 88 #include <cfloat> | |
| 89 #include <stdio.h> | |
| 90 diff --git a/gfx/angle/src/compiler/Types.h b/gfx/angle/src/compiler/Types.h | |
| 91 --- a/gfx/angle/src/compiler/Types.h | |
| 92 +++ b/gfx/angle/src/compiler/Types.h | |
| 93 @@ -6,17 +6,17 @@ | |
| 94 | |
| 95 #ifndef _TYPES_INCLUDED | |
| 96 #define _TYPES_INCLUDED | |
| 97 | |
| 98 #include "common/angleutils.h" | |
| 99 | |
| 100 #include "compiler/BaseTypes.h" | |
| 101 #include "compiler/Common.h" | |
| 102 -#include "compiler/debug.h" | |
| 103 +#include "compiler/compiler_debug.h" | |
| 104 | |
| 105 struct TPublicType; | |
| 106 class TType; | |
| 107 | |
| 108 class TField | |
| 109 { | |
| 110 public: | |
| 111 POOL_ALLOCATOR_NEW_DELETE(); | |
| 112 diff --git a/gfx/angle/src/compiler/debug.cpp b/gfx/angle/src/compiler/compiler_debug.cpp | |
| 113 rename from gfx/angle/src/compiler/debug.cpp | |
| 114 rename to gfx/angle/src/compiler/compiler_debug.cpp | |
| 115 --- a/gfx/angle/src/compiler/debug.cpp | |
| 116 +++ b/gfx/angle/src/compiler/compiler_debug.cpp | |
| 117 @@ -1,17 +1,17 @@ | |
| 118 // | |
| 119 // Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved. | |
| 120 // Use of this source code is governed by a BSD-style license that can be | |
| 121 // found in the LICENSE file. | |
| 122 // | |
| 123 | |
| 124 -// debug.cpp: Debugging utilities. | |
| 125 +// compiler_debug.cpp: Debugging utilities. | |
| 126 | |
| 127 -#include "compiler/debug.h" | |
| 128 +#include "compiler/compiler_debug.h" | |
| 129 | |
| 130 #include <stdarg.h> | |
| 131 #include <stdio.h> | |
| 132 | |
| 133 #include "compiler/InitializeParseContext.h" | |
| 134 #include "compiler/ParseHelper.h" | |
| 135 | |
| 136 static const int kTraceBufferLen = 1024; | |
| 137 diff --git a/gfx/angle/src/compiler/debug.h b/gfx/angle/src/compiler/compiler_debug.h | |
| 138 rename from gfx/angle/src/compiler/debug.h | |
| 139 rename to gfx/angle/src/compiler/compiler_debug.h | |
| 140 --- a/gfx/angle/src/compiler/debug.h | |
| 141 +++ b/gfx/angle/src/compiler/compiler_debug.h | |
| 142 @@ -1,15 +1,15 @@ | |
| 143 // | |
| 144 // Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved. | |
| 145 // Use of this source code is governed by a BSD-style license that can be | |
| 146 // found in the LICENSE file. | |
| 147 // | |
| 148 | |
| 149 -// debug.h: Debugging utilities. | |
| 150 +// compiler_debug.h: Debugging utilities. | |
| 151 | |
| 152 #ifndef COMPILER_DEBUG_H_ | |
| 153 #define COMPILER_DEBUG_H_ | |
| 154 | |
| 155 #include <assert.h> | |
| 156 | |
| 157 #ifdef _DEBUG | |
| 158 #define TRACE_ENABLED // define to enable debug message tracing | |
| 159 diff --git a/gfx/angle/src/compiler/osinclude.h b/gfx/angle/src/compiler/osinclude.h | |
| 160 --- a/gfx/angle/src/compiler/osinclude.h | |
| 161 +++ b/gfx/angle/src/compiler/osinclude.h | |
| 162 @@ -30,17 +30,17 @@ | |
| 163 #include <windows.h> | |
| 164 #elif defined(ANGLE_OS_POSIX) | |
| 165 #include <pthread.h> | |
| 166 #include <semaphore.h> | |
| 167 #include <errno.h> | |
| 168 #endif // ANGLE_OS_WIN | |
| 169 | |
| 170 | |
| 171 -#include "compiler/debug.h" | |
| 172 +#include "compiler/compiler_debug.h" | |
| 173 | |
| 174 // | |
| 175 // Thread Local Storage Operations | |
| 176 // | |
| 177 #if defined(ANGLE_OS_WIN) | |
| 178 typedef DWORD OS_TLSIndex; | |
| 179 #define OS_INVALID_TLS_INDEX (TLS_OUT_OF_INDEXES) | |
| 180 #elif defined(ANGLE_OS_POSIX) |
