gfx/angle/angle-build-unified.patch@97036ab72558
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.
1 From: Ehsan Akhagri <ehsan@mozilla.com>
2 Subject: Bug 939588 - Fixes required to make angle compile in unified mode
4 diff --git a/gfx/angle/src/compiler/ForLoopUnroll.h b/gfx/angle/src/compiler/ForLoopUnroll.h
5 index e800e25..7e10d82 100644
6 --- a/gfx/angle/src/compiler/ForLoopUnroll.h
7 +++ b/gfx/angle/src/compiler/ForLoopUnroll.h
8 @@ -1,14 +1,17 @@
9 //
10 // Copyright (c) 2011 The ANGLE Project Authors. All rights reserved.
11 // Use of this source code is governed by a BSD-style license that can be
12 // found in the LICENSE file.
13 //
15 +#ifndef ForLoopUnroll_h
16 +#define ForLoopUnroll_h
17 +
18 #include "compiler/intermediate.h"
20 struct TLoopIndexInfo {
21 int id;
22 int initValue;
23 int stopValue;
24 int incrementValue;
25 TOperator op;
26 @@ -41,8 +44,9 @@ public:
27 private:
28 int getLoopIncrement(TIntermLoop* node);
30 int evaluateIntConstant(TIntermConstantUnion* node);
32 TVector<TLoopIndexInfo> mLoopIndexStack;
33 };
35 +#endif
36 diff --git a/gfx/angle/src/compiler/preprocessor/DiagnosticsBase.h b/gfx/angle/src/compiler/preprocessor/DiagnosticsBase.h
37 index 07bc411..e1829b0 100644
38 --- a/gfx/angle/src/compiler/preprocessor/DiagnosticsBase.h
39 +++ b/gfx/angle/src/compiler/preprocessor/DiagnosticsBase.h
40 @@ -4,16 +4,21 @@
41 // found in the LICENSE file.
42 //
44 #ifndef COMPILER_PREPROCESSOR_DIAGNOSTICS_H_
45 #define COMPILER_PREPROCESSOR_DIAGNOSTICS_H_
47 #include <string>
49 +// Windows.h #defines ERROR.
50 +#ifdef ERROR
51 +#undef ERROR
52 +#endif
53 +
54 namespace pp
55 {
57 struct SourceLocation;
59 // Base class for reporting diagnostic messages.
60 // Derived classes are responsible for formatting and printing the messages.
61 class Diagnostics
