gfx/angle/angle-build-unified.patch@97036ab72558 (annotated)
gfx/angle/angle-build-unified.patch
Tue, 06 Jan 2015 21:39:09 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 06 Jan 2015 21:39:09 +0100
- branch
- TOR_BUG_9701
- changeset 8
- 97036ab72558
- permissions
- -rw-r--r--
Conditionally force memory storage according to privacy.thirdparty.isolate;
This solves Tor bug #9701, complying with disk avoidance documented in
https://www.torproject.org/projects/torbrowser/design/#disk-avoidance.
| michael@0 | 1 | From: Ehsan Akhagri <ehsan@mozilla.com> |
| michael@0 | 2 | Subject: Bug 939588 - Fixes required to make angle compile in unified mode |
| michael@0 | 3 | |
| michael@0 | 4 | diff --git a/gfx/angle/src/compiler/ForLoopUnroll.h b/gfx/angle/src/compiler/ForLoopUnroll.h |
| michael@0 | 5 | index e800e25..7e10d82 100644 |
| michael@0 | 6 | --- a/gfx/angle/src/compiler/ForLoopUnroll.h |
| michael@0 | 7 | +++ b/gfx/angle/src/compiler/ForLoopUnroll.h |
| michael@0 | 8 | @@ -1,14 +1,17 @@ |
| michael@0 | 9 | // |
| michael@0 | 10 | // Copyright (c) 2011 The ANGLE Project Authors. All rights reserved. |
| michael@0 | 11 | // Use of this source code is governed by a BSD-style license that can be |
| michael@0 | 12 | // found in the LICENSE file. |
| michael@0 | 13 | // |
| michael@0 | 14 | |
| michael@0 | 15 | +#ifndef ForLoopUnroll_h |
| michael@0 | 16 | +#define ForLoopUnroll_h |
| michael@0 | 17 | + |
| michael@0 | 18 | #include "compiler/intermediate.h" |
| michael@0 | 19 | |
| michael@0 | 20 | struct TLoopIndexInfo { |
| michael@0 | 21 | int id; |
| michael@0 | 22 | int initValue; |
| michael@0 | 23 | int stopValue; |
| michael@0 | 24 | int incrementValue; |
| michael@0 | 25 | TOperator op; |
| michael@0 | 26 | @@ -41,8 +44,9 @@ public: |
| michael@0 | 27 | private: |
| michael@0 | 28 | int getLoopIncrement(TIntermLoop* node); |
| michael@0 | 29 | |
| michael@0 | 30 | int evaluateIntConstant(TIntermConstantUnion* node); |
| michael@0 | 31 | |
| michael@0 | 32 | TVector<TLoopIndexInfo> mLoopIndexStack; |
| michael@0 | 33 | }; |
| michael@0 | 34 | |
| michael@0 | 35 | +#endif |
| michael@0 | 36 | diff --git a/gfx/angle/src/compiler/preprocessor/DiagnosticsBase.h b/gfx/angle/src/compiler/preprocessor/DiagnosticsBase.h |
| michael@0 | 37 | index 07bc411..e1829b0 100644 |
| michael@0 | 38 | --- a/gfx/angle/src/compiler/preprocessor/DiagnosticsBase.h |
| michael@0 | 39 | +++ b/gfx/angle/src/compiler/preprocessor/DiagnosticsBase.h |
| michael@0 | 40 | @@ -4,16 +4,21 @@ |
| michael@0 | 41 | // found in the LICENSE file. |
| michael@0 | 42 | // |
| michael@0 | 43 | |
| michael@0 | 44 | #ifndef COMPILER_PREPROCESSOR_DIAGNOSTICS_H_ |
| michael@0 | 45 | #define COMPILER_PREPROCESSOR_DIAGNOSTICS_H_ |
| michael@0 | 46 | |
| michael@0 | 47 | #include <string> |
| michael@0 | 48 | |
| michael@0 | 49 | +// Windows.h #defines ERROR. |
| michael@0 | 50 | +#ifdef ERROR |
| michael@0 | 51 | +#undef ERROR |
| michael@0 | 52 | +#endif |
| michael@0 | 53 | + |
| michael@0 | 54 | namespace pp |
| michael@0 | 55 | { |
| michael@0 | 56 | |
| michael@0 | 57 | struct SourceLocation; |
| michael@0 | 58 | |
| michael@0 | 59 | // Base class for reporting diagnostic messages. |
| michael@0 | 60 | // Derived classes are responsible for formatting and printing the messages. |
| michael@0 | 61 | class Diagnostics |
