diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2014-09-25 13:22:55 +0300 |
|---|---|---|
| committer | Andrew Knight <andrew.knight@digia.com> | 2014-09-29 16:09:29 +0200 |
| commit | 311157c3c6849e8efccd88f7594bb34c570a6780 (patch) | |
| tree | a50c252b638488326529c0e69aa05e42abce7462 /src/3rdparty/angle/src/libGLESv2/renderer/Renderer.cpp | |
| parent | 04d3a89e20d49a3b5015b071bfdedc81973b090c (diff) | |
ANGLE: Upgrade to 2.1~abce76206141
Upgrade to address issues discovered since the last upgrade.
Patch notes:
0000-General-fixes-for-ANGLE-2.1.patch
added removal of the unused third-party tracing functions
0003-Fix-compilation-with-MinGW-gcc-64-bit.patch
removed as it is no longer needed
0011-ANGLE-Fix-compilation-error-on-MinGW-caused-by-trace.patch
removed as it is no longer needed
0016-ANGLE-Fix-compilation-with-MinGW-D3D11.patch
now supports MinGW 64-bit
[ChangeLog][Third-party libraries] ANGLE updated to 2.1~f8602ad91e4f
Task-number: QTBUG-40649
Task-number: QTBUG-40658
Task-number: QTBUG-41031
Task-number: QTBUG-41081
Task-number: QTBUG-41308
Task-number: QTBUG-41563
Change-Id: I9f776c8d5cb94ddb12d608a8d5630bfc54437bea
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/3rdparty/angle/src/libGLESv2/renderer/Renderer.cpp')
| -rw-r--r-- | src/3rdparty/angle/src/libGLESv2/renderer/Renderer.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/Renderer.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/Renderer.cpp index 590004ac9b..910d0285f1 100644 --- a/src/3rdparty/angle/src/libGLESv2/renderer/Renderer.cpp +++ b/src/3rdparty/angle/src/libGLESv2/renderer/Renderer.cpp @@ -1,4 +1,3 @@ -#include "precompiled.h" // // Copyright (c) 2012-2014 The ANGLE Project Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be @@ -7,12 +6,10 @@ // Renderer.cpp: Implements EGL dependencies for creating and destroying Renderer instances. -#include <EGL/eglext.h> #include "libGLESv2/main.h" #include "libGLESv2/Program.h" #include "libGLESv2/renderer/Renderer.h" #include "common/utilities.h" -#include "third_party/trace_event/trace_event.h" #include "libGLESv2/Shader.h" #if defined (ANGLE_ENABLE_D3D9) @@ -23,11 +20,17 @@ #include "libGLESv2/renderer/d3d/d3d11/Renderer11.h" #endif // ANGLE_ENABLE_D3D11 +#if defined (ANGLE_TEST_CONFIG) +#define ANGLE_DEFAULT_D3D11 1 +#endif + #if !defined(ANGLE_DEFAULT_D3D11) // Enables use of the Direct3D 11 API for a default display, when available #define ANGLE_DEFAULT_D3D11 0 #endif +#include <EGL/eglext.h> + namespace rx { @@ -40,7 +43,6 @@ Renderer::Renderer(egl::Display *display) Renderer::~Renderer() { - gl::Shader::releaseCompiler(); } const gl::Caps &Renderer::getRendererCaps() const |