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/angle/src/libGLESv2 | |
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/angle/src/libGLESv2')
-rw-r--r-- | src/angle/src/libGLESv2/libGLESv2.pro | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/angle/src/libGLESv2/libGLESv2.pro b/src/angle/src/libGLESv2/libGLESv2.pro index 2e84df0d39..c0f7982e6c 100644 --- a/src/angle/src/libGLESv2/libGLESv2.pro +++ b/src/angle/src/libGLESv2/libGLESv2.pro @@ -29,14 +29,14 @@ HEADERS += \ $$ANGLE_DIR/src/libGLESv2/Buffer.h \ $$ANGLE_DIR/src/libGLESv2/Caps.h \ $$ANGLE_DIR/src/libGLESv2/Context.h \ - $$ANGLE_DIR/src/libGLESv2/DynamicHLSL.h \ + $$ANGLE_DIR/src/libGLESv2/Error.h \ $$ANGLE_DIR/src/libGLESv2/Fence.h \ $$ANGLE_DIR/src/libGLESv2/formatutils.h \ $$ANGLE_DIR/src/libGLESv2/Framebuffer.h \ $$ANGLE_DIR/src/libGLESv2/FramebufferAttachment.h \ $$ANGLE_DIR/src/libGLESv2/HandleAllocator.h \ + $$ANGLE_DIR/src/libGLESv2/ImageIndex.h \ $$ANGLE_DIR/src/libGLESv2/main.h \ - $$ANGLE_DIR/src/libGLESv2/precompiled.h \ $$ANGLE_DIR/src/libGLESv2/Program.h \ $$ANGLE_DIR/src/libGLESv2/ProgramBinary.h \ $$ANGLE_DIR/src/libGLESv2/Query.h \ @@ -46,13 +46,17 @@ HEADERS += \ $$ANGLE_DIR/src/libGLESv2/renderer/copyimage.h \ $$ANGLE_DIR/src/libGLESv2/renderer/copyvertex.h \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/BufferD3D.h \ + $$ANGLE_DIR/src/libGLESv2/renderer/d3d/DynamicHLSL.h \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/HLSLCompiler.h \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/ImageD3D.h \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/IndexBuffer.h \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/IndexDataManager.h \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/MemoryBuffer.h \ + $$ANGLE_DIR/src/libGLESv2/renderer/d3d/ProgramD3D.h \ + $$ANGLE_DIR/src/libGLESv2/renderer/d3d/ShaderD3D.h \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/TextureD3D.h \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/TextureStorage.h \ + $$ANGLE_DIR/src/libGLESv2/renderer/d3d/TransformFeedbackD3D.h \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/VertexArrayImpl.h \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/VertexBuffer.h \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/vertexconversion.h \ @@ -63,12 +67,15 @@ HEADERS += \ $$ANGLE_DIR/src/libGLESv2/renderer/imageformats.h \ $$ANGLE_DIR/src/libGLESv2/renderer/IndexCacheRange.h \ $$ANGLE_DIR/src/libGLESv2/renderer/loadimage.h \ + $$ANGLE_DIR/src/libGLESv2/renderer/ProgramImpl.h \ $$ANGLE_DIR/src/libGLESv2/renderer/QueryImpl.h \ $$ANGLE_DIR/src/libGLESv2/renderer/Renderer.h \ $$ANGLE_DIR/src/libGLESv2/renderer/RenderTarget.h \ $$ANGLE_DIR/src/libGLESv2/renderer/ShaderExecutable.h \ + $$ANGLE_DIR/src/libGLESv2/renderer/ShaderImpl.h \ $$ANGLE_DIR/src/libGLESv2/renderer/SwapChain.h \ $$ANGLE_DIR/src/libGLESv2/renderer/TextureImpl.h \ + $$ANGLE_DIR/src/libGLESv2/renderer/TextureFeedbackImpl.h \ $$ANGLE_DIR/src/libGLESv2/renderer/VertexDeclarationCache.h \ $$ANGLE_DIR/src/libGLESv2/resource.h \ $$ANGLE_DIR/src/libGLESv2/ResourceManager.h \ @@ -95,13 +102,14 @@ SOURCES += \ $$ANGLE_DIR/src/libGLESv2/Buffer.cpp \ $$ANGLE_DIR/src/libGLESv2/Caps.cpp \ $$ANGLE_DIR/src/libGLESv2/Context.cpp \ - $$ANGLE_DIR/src/libGLESv2/DynamicHLSL.cpp \ + $$ANGLE_DIR/src/libGLESv2/Error.cpp \ $$ANGLE_DIR/src/libGLESv2/Fence.cpp \ $$ANGLE_DIR/src/libGLESv2/Float16ToFloat32.cpp \ $$ANGLE_DIR/src/libGLESv2/Framebuffer.cpp \ $$ANGLE_DIR/src/libGLESv2/FramebufferAttachment.cpp \ $$ANGLE_DIR/src/libGLESv2/formatutils.cpp \ $$ANGLE_DIR/src/libGLESv2/HandleAllocator.cpp \ + $$ANGLE_DIR/src/libGLESv2/ImageIndex.cpp \ $$ANGLE_DIR/src/libGLESv2/libGLESv2.cpp \ $$ANGLE_DIR/src/libGLESv2/main.cpp \ $$ANGLE_DIR/src/libGLESv2/Program.cpp \ @@ -121,7 +129,6 @@ SOURCES += \ $$ANGLE_DIR/src/libGLESv2/validationES3.cpp \ $$ANGLE_DIR/src/libGLESv2/VertexArray.cpp \ $$ANGLE_DIR/src/libGLESv2/VertexAttribute.cpp \ - $$ANGLE_DIR/src/libGLESv2/precompiled.cpp \ $$ANGLE_DIR/src/libGLESv2/renderer/copyimage.cpp \ $$ANGLE_DIR/src/libGLESv2/renderer/loadimage.cpp \ $$ANGLE_DIR/src/libGLESv2/renderer/loadimageSSE2.cpp \ @@ -129,13 +136,17 @@ SOURCES += \ $$ANGLE_DIR/src/libGLESv2/renderer/IndexRangeCache.cpp \ $$ANGLE_DIR/src/libGLESv2/renderer/Renderer.cpp \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/BufferD3D.cpp \ + $$ANGLE_DIR/src/libGLESv2/renderer/d3d/DynamicHLSL.cpp \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/HLSLCompiler.cpp \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/ImageD3D.cpp \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/IndexBuffer.cpp \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/IndexDataManager.cpp \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/MemoryBuffer.cpp \ + $$ANGLE_DIR/src/libGLESv2/renderer/d3d/ProgramD3D.cpp \ + $$ANGLE_DIR/src/libGLESv2/renderer/d3d/ShaderD3D.cpp \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/TextureD3D.cpp \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/TextureStorage.cpp \ + $$ANGLE_DIR/src/libGLESv2/renderer/d3d/TransformFeedbackD3D.cpp \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/VertexBuffer.cpp \ $$ANGLE_DIR/src/libGLESv2/renderer/d3d/VertexDataManager.cpp |