michael@0: # HG changeset patch
michael@0: # Parent 4947d86b1f7b860e9c958a8a5eae03075c539f78
michael@0: # User Xavier Fung <xavier114fch@gmail.com>
michael@0: Fix Angle to build on Visual Studio 2013. r=?
michael@0: 
michael@0: diff --git a/gfx/angle/src/compiler/Types.h b/gfx/angle/src/compiler/Types.h
michael@0: --- a/gfx/angle/src/compiler/Types.h
michael@0: +++ b/gfx/angle/src/compiler/Types.h
michael@0: @@ -8,16 +8,18 @@
michael@0:  #define _TYPES_INCLUDED
michael@0:  
michael@0:  #include "common/angleutils.h"
michael@0:  
michael@0:  #include "compiler/BaseTypes.h"
michael@0:  #include "compiler/Common.h"
michael@0:  #include "compiler/compiler_debug.h"
michael@0:  
michael@0: +#include <algorithm>
michael@0: +
michael@0:  struct TPublicType;
michael@0:  class TType;
michael@0:  
michael@0:  class TField
michael@0:  {
michael@0:  public:
michael@0:      POOL_ALLOCATOR_NEW_DELETE();
michael@0:      TField(TType* type, TString* name) : mType(type), mName(name) {}
michael@0: diff --git a/gfx/angle/src/libEGL/Surface.cpp b/gfx/angle/src/libEGL/Surface.cpp
michael@0: --- a/gfx/angle/src/libEGL/Surface.cpp
michael@0: +++ b/gfx/angle/src/libEGL/Surface.cpp
michael@0: @@ -15,16 +15,18 @@
michael@0:  #include "common/debug.h"
michael@0:  #include "libGLESv2/Texture.h"
michael@0:  #include "libGLESv2/renderer/SwapChain.h"
michael@0:  #include "libGLESv2/main.h"
michael@0:  
michael@0:  #include "libEGL/main.h"
michael@0:  #include "libEGL/Display.h"
michael@0:  
michael@0: +#include <algorithm>
michael@0: +
michael@0:  namespace egl
michael@0:  {
michael@0:  
michael@0:  Surface::Surface(Display *display, const Config *config, HWND window, EGLint postSubBufferSupported) 
michael@0:      : mDisplay(display), mConfig(config), mWindow(window), mPostSubBufferSupported(postSubBufferSupported)
michael@0:  {
michael@0:      mRenderer = mDisplay->getRenderer();
michael@0:      mSwapChain = NULL;
michael@0: diff --git a/gfx/angle/src/libGLESv2/Program.cpp b/gfx/angle/src/libGLESv2/Program.cpp
michael@0: --- a/gfx/angle/src/libGLESv2/Program.cpp
michael@0: +++ b/gfx/angle/src/libGLESv2/Program.cpp
michael@0: @@ -7,16 +7,18 @@
michael@0:  
michael@0:  // Program.cpp: Implements the gl::Program class. Implements GL program objects
michael@0:  // and related functionality. [OpenGL ES 2.0.24] section 2.10.3 page 28.
michael@0:  
michael@0:  #include "libGLESv2/Program.h"
michael@0:  #include "libGLESv2/ProgramBinary.h"
michael@0:  #include "libGLESv2/ResourceManager.h"
michael@0:  
michael@0: +#include <algorithm>
michael@0: +
michael@0:  namespace gl
michael@0:  {
michael@0:  const char * const g_fakepath = "C:\\fakepath";
michael@0:  
michael@0:  AttributeBindings::AttributeBindings()
michael@0:  {
michael@0:  }
michael@0:  
michael@0: diff --git a/gfx/angle/src/libGLESv2/ProgramBinary.cpp b/gfx/angle/src/libGLESv2/ProgramBinary.cpp
michael@0: --- a/gfx/angle/src/libGLESv2/ProgramBinary.cpp
michael@0: +++ b/gfx/angle/src/libGLESv2/ProgramBinary.cpp
michael@0: @@ -17,16 +17,18 @@
michael@0:  #include "utilities.h"
michael@0:  
michael@0:  #include "libGLESv2/main.h"
michael@0:  #include "libGLESv2/Shader.h"
michael@0:  #include "libGLESv2/Program.h"
michael@0:  #include "libGLESv2/renderer/Renderer.h"
michael@0:  #include "libGLESv2/renderer/VertexDataManager.h"
michael@0:  
michael@0: +#include <algorithm>
michael@0: +
michael@0:  #undef near
michael@0:  #undef far
michael@0:  
michael@0:  namespace gl
michael@0:  {
michael@0:  std::string str(int i)
michael@0:  {
michael@0:      char buffer[20];
michael@0: diff --git a/gfx/angle/src/libGLESv2/Shader.cpp b/gfx/angle/src/libGLESv2/Shader.cpp
michael@0: --- a/gfx/angle/src/libGLESv2/Shader.cpp
michael@0: +++ b/gfx/angle/src/libGLESv2/Shader.cpp
michael@0: @@ -6,16 +6,18 @@
michael@0:  //
michael@0:  
michael@0:  // Shader.cpp: Implements the gl::Shader class and its  derived classes
michael@0:  // VertexShader and FragmentShader. Implements GL shader objects and related
michael@0:  // functionality. [OpenGL ES 2.0.24] section 2.10 page 24 and section 3.8 page 84.
michael@0:  
michael@0:  #include "libGLESv2/Shader.h"
michael@0:  
michael@0: +#include <algorithm>
michael@0: +
michael@0:  #include "GLSLANG/ShaderLang.h"
michael@0:  #include "libGLESv2/utilities.h"
michael@0:  #include "libGLESv2/renderer/Renderer.h"
michael@0:  #include "libGLESv2/Constants.h"
michael@0:  #include "libGLESv2/ResourceManager.h"
michael@0:  
michael@0:  namespace gl
michael@0:  {
michael@0: diff --git a/gfx/angle/src/libGLESv2/libGLESv2.cpp b/gfx/angle/src/libGLESv2/libGLESv2.cpp
michael@0: --- a/gfx/angle/src/libGLESv2/libGLESv2.cpp
michael@0: +++ b/gfx/angle/src/libGLESv2/libGLESv2.cpp
michael@0: @@ -4,16 +4,18 @@
michael@0:  // Use of this source code is governed by a BSD-style license that can be
michael@0:  // found in the LICENSE file.
michael@0:  //
michael@0:  
michael@0:  // libGLESv2.cpp: Implements the exported OpenGL ES 2.0 functions.
michael@0:  
michael@0:  #include "common/version.h"
michael@0:  
michael@0: +#include <algorithm>
michael@0: +
michael@0:  #include "libGLESv2/main.h"
michael@0:  #include "libGLESv2/utilities.h"
michael@0:  #include "libGLESv2/Buffer.h"
michael@0:  #include "libGLESv2/Fence.h"
michael@0:  #include "libGLESv2/Framebuffer.h"
michael@0:  #include "libGLESv2/Renderbuffer.h"
michael@0:  #include "libGLESv2/Program.h"
michael@0:  #include "libGLESv2/ProgramBinary.h"