1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/gfx/angle/angle-fix-vc12.patch Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,137 @@
1.4 +# HG changeset patch
1.5 +# Parent 4947d86b1f7b860e9c958a8a5eae03075c539f78
1.6 +# User Xavier Fung <xavier114fch@gmail.com>
1.7 +Fix Angle to build on Visual Studio 2013. r=?
1.8 +
1.9 +diff --git a/gfx/angle/src/compiler/Types.h b/gfx/angle/src/compiler/Types.h
1.10 +--- a/gfx/angle/src/compiler/Types.h
1.11 ++++ b/gfx/angle/src/compiler/Types.h
1.12 +@@ -8,16 +8,18 @@
1.13 + #define _TYPES_INCLUDED
1.14 +
1.15 + #include "common/angleutils.h"
1.16 +
1.17 + #include "compiler/BaseTypes.h"
1.18 + #include "compiler/Common.h"
1.19 + #include "compiler/compiler_debug.h"
1.20 +
1.21 ++#include <algorithm>
1.22 ++
1.23 + struct TPublicType;
1.24 + class TType;
1.25 +
1.26 + class TField
1.27 + {
1.28 + public:
1.29 + POOL_ALLOCATOR_NEW_DELETE();
1.30 + TField(TType* type, TString* name) : mType(type), mName(name) {}
1.31 +diff --git a/gfx/angle/src/libEGL/Surface.cpp b/gfx/angle/src/libEGL/Surface.cpp
1.32 +--- a/gfx/angle/src/libEGL/Surface.cpp
1.33 ++++ b/gfx/angle/src/libEGL/Surface.cpp
1.34 +@@ -15,16 +15,18 @@
1.35 + #include "common/debug.h"
1.36 + #include "libGLESv2/Texture.h"
1.37 + #include "libGLESv2/renderer/SwapChain.h"
1.38 + #include "libGLESv2/main.h"
1.39 +
1.40 + #include "libEGL/main.h"
1.41 + #include "libEGL/Display.h"
1.42 +
1.43 ++#include <algorithm>
1.44 ++
1.45 + namespace egl
1.46 + {
1.47 +
1.48 + Surface::Surface(Display *display, const Config *config, HWND window, EGLint postSubBufferSupported)
1.49 + : mDisplay(display), mConfig(config), mWindow(window), mPostSubBufferSupported(postSubBufferSupported)
1.50 + {
1.51 + mRenderer = mDisplay->getRenderer();
1.52 + mSwapChain = NULL;
1.53 +diff --git a/gfx/angle/src/libGLESv2/Program.cpp b/gfx/angle/src/libGLESv2/Program.cpp
1.54 +--- a/gfx/angle/src/libGLESv2/Program.cpp
1.55 ++++ b/gfx/angle/src/libGLESv2/Program.cpp
1.56 +@@ -7,16 +7,18 @@
1.57 +
1.58 + // Program.cpp: Implements the gl::Program class. Implements GL program objects
1.59 + // and related functionality. [OpenGL ES 2.0.24] section 2.10.3 page 28.
1.60 +
1.61 + #include "libGLESv2/Program.h"
1.62 + #include "libGLESv2/ProgramBinary.h"
1.63 + #include "libGLESv2/ResourceManager.h"
1.64 +
1.65 ++#include <algorithm>
1.66 ++
1.67 + namespace gl
1.68 + {
1.69 + const char * const g_fakepath = "C:\\fakepath";
1.70 +
1.71 + AttributeBindings::AttributeBindings()
1.72 + {
1.73 + }
1.74 +
1.75 +diff --git a/gfx/angle/src/libGLESv2/ProgramBinary.cpp b/gfx/angle/src/libGLESv2/ProgramBinary.cpp
1.76 +--- a/gfx/angle/src/libGLESv2/ProgramBinary.cpp
1.77 ++++ b/gfx/angle/src/libGLESv2/ProgramBinary.cpp
1.78 +@@ -17,16 +17,18 @@
1.79 + #include "utilities.h"
1.80 +
1.81 + #include "libGLESv2/main.h"
1.82 + #include "libGLESv2/Shader.h"
1.83 + #include "libGLESv2/Program.h"
1.84 + #include "libGLESv2/renderer/Renderer.h"
1.85 + #include "libGLESv2/renderer/VertexDataManager.h"
1.86 +
1.87 ++#include <algorithm>
1.88 ++
1.89 + #undef near
1.90 + #undef far
1.91 +
1.92 + namespace gl
1.93 + {
1.94 + std::string str(int i)
1.95 + {
1.96 + char buffer[20];
1.97 +diff --git a/gfx/angle/src/libGLESv2/Shader.cpp b/gfx/angle/src/libGLESv2/Shader.cpp
1.98 +--- a/gfx/angle/src/libGLESv2/Shader.cpp
1.99 ++++ b/gfx/angle/src/libGLESv2/Shader.cpp
1.100 +@@ -6,16 +6,18 @@
1.101 + //
1.102 +
1.103 + // Shader.cpp: Implements the gl::Shader class and its derived classes
1.104 + // VertexShader and FragmentShader. Implements GL shader objects and related
1.105 + // functionality. [OpenGL ES 2.0.24] section 2.10 page 24 and section 3.8 page 84.
1.106 +
1.107 + #include "libGLESv2/Shader.h"
1.108 +
1.109 ++#include <algorithm>
1.110 ++
1.111 + #include "GLSLANG/ShaderLang.h"
1.112 + #include "libGLESv2/utilities.h"
1.113 + #include "libGLESv2/renderer/Renderer.h"
1.114 + #include "libGLESv2/Constants.h"
1.115 + #include "libGLESv2/ResourceManager.h"
1.116 +
1.117 + namespace gl
1.118 + {
1.119 +diff --git a/gfx/angle/src/libGLESv2/libGLESv2.cpp b/gfx/angle/src/libGLESv2/libGLESv2.cpp
1.120 +--- a/gfx/angle/src/libGLESv2/libGLESv2.cpp
1.121 ++++ b/gfx/angle/src/libGLESv2/libGLESv2.cpp
1.122 +@@ -4,16 +4,18 @@
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 + // libGLESv2.cpp: Implements the exported OpenGL ES 2.0 functions.
1.128 +
1.129 + #include "common/version.h"
1.130 +
1.131 ++#include <algorithm>
1.132 ++
1.133 + #include "libGLESv2/main.h"
1.134 + #include "libGLESv2/utilities.h"
1.135 + #include "libGLESv2/Buffer.h"
1.136 + #include "libGLESv2/Fence.h"
1.137 + #include "libGLESv2/Framebuffer.h"
1.138 + #include "libGLESv2/Renderbuffer.h"
1.139 + #include "libGLESv2/Program.h"
1.140 + #include "libGLESv2/ProgramBinary.h"
