The Tor Browser / file comparison
comparison: gfx/angle/angle-fix-vc12.patch
gfx/angle/angle-fix-vc12.patch
- changeset 0
- 6474c204b198
equal
deleted
inserted
replaced
| -1:000000000000 | 0:3fd05d9fd0de |
|---|---|
| 1 # HG changeset patch | |
| 2 # Parent 4947d86b1f7b860e9c958a8a5eae03075c539f78 | |
| 3 # User Xavier Fung <xavier114fch@gmail.com> | |
| 4 Fix Angle to build on Visual Studio 2013. r=? | |
| 5 | |
| 6 diff --git a/gfx/angle/src/compiler/Types.h b/gfx/angle/src/compiler/Types.h | |
| 7 --- a/gfx/angle/src/compiler/Types.h | |
| 8 +++ b/gfx/angle/src/compiler/Types.h | |
| 9 @@ -8,16 +8,18 @@ | |
| 10 #define _TYPES_INCLUDED | |
| 11 | |
| 12 #include "common/angleutils.h" | |
| 13 | |
| 14 #include "compiler/BaseTypes.h" | |
| 15 #include "compiler/Common.h" | |
| 16 #include "compiler/compiler_debug.h" | |
| 17 | |
| 18 +#include <algorithm> | |
| 19 + | |
| 20 struct TPublicType; | |
| 21 class TType; | |
| 22 | |
| 23 class TField | |
| 24 { | |
| 25 public: | |
| 26 POOL_ALLOCATOR_NEW_DELETE(); | |
| 27 TField(TType* type, TString* name) : mType(type), mName(name) {} | |
| 28 diff --git a/gfx/angle/src/libEGL/Surface.cpp b/gfx/angle/src/libEGL/Surface.cpp | |
| 29 --- a/gfx/angle/src/libEGL/Surface.cpp | |
| 30 +++ b/gfx/angle/src/libEGL/Surface.cpp | |
| 31 @@ -15,16 +15,18 @@ | |
| 32 #include "common/debug.h" | |
| 33 #include "libGLESv2/Texture.h" | |
| 34 #include "libGLESv2/renderer/SwapChain.h" | |
| 35 #include "libGLESv2/main.h" | |
| 36 | |
| 37 #include "libEGL/main.h" | |
| 38 #include "libEGL/Display.h" | |
| 39 | |
| 40 +#include <algorithm> | |
| 41 + | |
| 42 namespace egl | |
| 43 { | |
| 44 | |
| 45 Surface::Surface(Display *display, const Config *config, HWND window, EGLint postSubBufferSupported) | |
| 46 : mDisplay(display), mConfig(config), mWindow(window), mPostSubBufferSupported(postSubBufferSupported) | |
| 47 { | |
| 48 mRenderer = mDisplay->getRenderer(); | |
| 49 mSwapChain = NULL; | |
| 50 diff --git a/gfx/angle/src/libGLESv2/Program.cpp b/gfx/angle/src/libGLESv2/Program.cpp | |
| 51 --- a/gfx/angle/src/libGLESv2/Program.cpp | |
| 52 +++ b/gfx/angle/src/libGLESv2/Program.cpp | |
| 53 @@ -7,16 +7,18 @@ | |
| 54 | |
| 55 // Program.cpp: Implements the gl::Program class. Implements GL program objects | |
| 56 // and related functionality. [OpenGL ES 2.0.24] section 2.10.3 page 28. | |
| 57 | |
| 58 #include "libGLESv2/Program.h" | |
| 59 #include "libGLESv2/ProgramBinary.h" | |
| 60 #include "libGLESv2/ResourceManager.h" | |
| 61 | |
| 62 +#include <algorithm> | |
| 63 + | |
| 64 namespace gl | |
| 65 { | |
| 66 const char * const g_fakepath = "C:\\fakepath"; | |
| 67 | |
| 68 AttributeBindings::AttributeBindings() | |
| 69 { | |
| 70 } | |
| 71 | |
| 72 diff --git a/gfx/angle/src/libGLESv2/ProgramBinary.cpp b/gfx/angle/src/libGLESv2/ProgramBinary.cpp | |
| 73 --- a/gfx/angle/src/libGLESv2/ProgramBinary.cpp | |
| 74 +++ b/gfx/angle/src/libGLESv2/ProgramBinary.cpp | |
| 75 @@ -17,16 +17,18 @@ | |
| 76 #include "utilities.h" | |
| 77 | |
| 78 #include "libGLESv2/main.h" | |
| 79 #include "libGLESv2/Shader.h" | |
| 80 #include "libGLESv2/Program.h" | |
| 81 #include "libGLESv2/renderer/Renderer.h" | |
| 82 #include "libGLESv2/renderer/VertexDataManager.h" | |
| 83 | |
| 84 +#include <algorithm> | |
| 85 + | |
| 86 #undef near | |
| 87 #undef far | |
| 88 | |
| 89 namespace gl | |
| 90 { | |
| 91 std::string str(int i) | |
| 92 { | |
| 93 char buffer[20]; | |
| 94 diff --git a/gfx/angle/src/libGLESv2/Shader.cpp b/gfx/angle/src/libGLESv2/Shader.cpp | |
| 95 --- a/gfx/angle/src/libGLESv2/Shader.cpp | |
| 96 +++ b/gfx/angle/src/libGLESv2/Shader.cpp | |
| 97 @@ -6,16 +6,18 @@ | |
| 98 // | |
| 99 | |
| 100 // Shader.cpp: Implements the gl::Shader class and its derived classes | |
| 101 // VertexShader and FragmentShader. Implements GL shader objects and related | |
| 102 // functionality. [OpenGL ES 2.0.24] section 2.10 page 24 and section 3.8 page 84. | |
| 103 | |
| 104 #include "libGLESv2/Shader.h" | |
| 105 | |
| 106 +#include <algorithm> | |
| 107 + | |
| 108 #include "GLSLANG/ShaderLang.h" | |
| 109 #include "libGLESv2/utilities.h" | |
| 110 #include "libGLESv2/renderer/Renderer.h" | |
| 111 #include "libGLESv2/Constants.h" | |
| 112 #include "libGLESv2/ResourceManager.h" | |
| 113 | |
| 114 namespace gl | |
| 115 { | |
| 116 diff --git a/gfx/angle/src/libGLESv2/libGLESv2.cpp b/gfx/angle/src/libGLESv2/libGLESv2.cpp | |
| 117 --- a/gfx/angle/src/libGLESv2/libGLESv2.cpp | |
| 118 +++ b/gfx/angle/src/libGLESv2/libGLESv2.cpp | |
| 119 @@ -4,16 +4,18 @@ | |
| 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 // libGLESv2.cpp: Implements the exported OpenGL ES 2.0 functions. | |
| 125 | |
| 126 #include "common/version.h" | |
| 127 | |
| 128 +#include <algorithm> | |
| 129 + | |
| 130 #include "libGLESv2/main.h" | |
| 131 #include "libGLESv2/utilities.h" | |
| 132 #include "libGLESv2/Buffer.h" | |
| 133 #include "libGLESv2/Fence.h" | |
| 134 #include "libGLESv2/Framebuffer.h" | |
| 135 #include "libGLESv2/Renderbuffer.h" | |
| 136 #include "libGLESv2/Program.h" | |
| 137 #include "libGLESv2/ProgramBinary.h" |
