1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/gfx/angle/angle-build-unified.patch Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,61 @@
1.4 +From: Ehsan Akhagri <ehsan@mozilla.com>
1.5 +Subject: Bug 939588 - Fixes required to make angle compile in unified mode
1.6 +
1.7 +diff --git a/gfx/angle/src/compiler/ForLoopUnroll.h b/gfx/angle/src/compiler/ForLoopUnroll.h
1.8 +index e800e25..7e10d82 100644
1.9 +--- a/gfx/angle/src/compiler/ForLoopUnroll.h
1.10 ++++ b/gfx/angle/src/compiler/ForLoopUnroll.h
1.11 +@@ -1,14 +1,17 @@
1.12 + //
1.13 + // Copyright (c) 2011 The ANGLE Project Authors. All rights reserved.
1.14 + // Use of this source code is governed by a BSD-style license that can be
1.15 + // found in the LICENSE file.
1.16 + //
1.17 +
1.18 ++#ifndef ForLoopUnroll_h
1.19 ++#define ForLoopUnroll_h
1.20 ++
1.21 + #include "compiler/intermediate.h"
1.22 +
1.23 + struct TLoopIndexInfo {
1.24 + int id;
1.25 + int initValue;
1.26 + int stopValue;
1.27 + int incrementValue;
1.28 + TOperator op;
1.29 +@@ -41,8 +44,9 @@ public:
1.30 + private:
1.31 + int getLoopIncrement(TIntermLoop* node);
1.32 +
1.33 + int evaluateIntConstant(TIntermConstantUnion* node);
1.34 +
1.35 + TVector<TLoopIndexInfo> mLoopIndexStack;
1.36 + };
1.37 +
1.38 ++#endif
1.39 +diff --git a/gfx/angle/src/compiler/preprocessor/DiagnosticsBase.h b/gfx/angle/src/compiler/preprocessor/DiagnosticsBase.h
1.40 +index 07bc411..e1829b0 100644
1.41 +--- a/gfx/angle/src/compiler/preprocessor/DiagnosticsBase.h
1.42 ++++ b/gfx/angle/src/compiler/preprocessor/DiagnosticsBase.h
1.43 +@@ -4,16 +4,21 @@
1.44 + // found in the LICENSE file.
1.45 + //
1.46 +
1.47 + #ifndef COMPILER_PREPROCESSOR_DIAGNOSTICS_H_
1.48 + #define COMPILER_PREPROCESSOR_DIAGNOSTICS_H_
1.49 +
1.50 + #include <string>
1.51 +
1.52 ++// Windows.h #defines ERROR.
1.53 ++#ifdef ERROR
1.54 ++#undef ERROR
1.55 ++#endif
1.56 ++
1.57 + namespace pp
1.58 + {
1.59 +
1.60 + struct SourceLocation;
1.61 +
1.62 + // Base class for reporting diagnostic messages.
1.63 + // Derived classes are responsible for formatting and printing the messages.
1.64 + class Diagnostics
