summaryrefslogtreecommitdiffstats
path: root/gfx/angle/src/libGLESv2.gypi
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-07-11 18:11:13 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-07-11 18:11:13 +0200
commit4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0 (patch)
treef000dd831240707a03b8c806db292c2a15cde3ce /gfx/angle/src/libGLESv2.gypi
parent3b7ffb477eec078c7036c92c6a51bb5de6de4f28 (diff)
downloadUXP-4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0.tar
UXP-4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0.tar.gz
UXP-4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0.tar.lz
UXP-4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0.tar.xz
UXP-4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0.zip
Roll back to ANGLE/2845
Diffstat (limited to 'gfx/angle/src/libGLESv2.gypi')
-rwxr-xr-xgfx/angle/src/libGLESv2.gypi74
1 files changed, 5 insertions, 69 deletions
diff --git a/gfx/angle/src/libGLESv2.gypi b/gfx/angle/src/libGLESv2.gypi
index b28eecaf1..a22adeb4e 100755
--- a/gfx/angle/src/libGLESv2.gypi
+++ b/gfx/angle/src/libGLESv2.gypi
@@ -138,8 +138,6 @@
'libANGLE/Surface.h',
'libANGLE/Texture.cpp',
'libANGLE/Texture.h',
- 'libANGLE/Thread.cpp',
- 'libANGLE/Thread.h',
'libANGLE/TransformFeedback.cpp',
'libANGLE/TransformFeedback.h',
'libANGLE/Uniform.cpp',
@@ -154,22 +152,16 @@
'libANGLE/angletypes.cpp',
'libANGLE/angletypes.h',
'libANGLE/angletypes.inl',
- 'libANGLE/es3_copy_conversion_table_autogen.cpp',
'libANGLE/features.h',
- 'libANGLE/format_map_autogen.cpp',
'libANGLE/formatutils.cpp',
'libANGLE/formatutils.h',
'libANGLE/histogram_macros.h',
'libANGLE/queryconversions.cpp',
'libANGLE/queryconversions.h',
- 'libANGLE/queryutils.cpp',
- 'libANGLE/queryutils.h',
'libANGLE/renderer/BufferImpl.h',
'libANGLE/renderer/CompilerImpl.h',
'libANGLE/renderer/ContextImpl.cpp',
'libANGLE/renderer/ContextImpl.h',
- 'libANGLE/renderer/driver_utils.cpp',
- 'libANGLE/renderer/driver_utils.h',
'libANGLE/renderer/DeviceImpl.cpp',
'libANGLE/renderer/DeviceImpl.h',
'libANGLE/renderer/DisplayImpl.cpp',
@@ -178,7 +170,8 @@
'libANGLE/renderer/FenceNVImpl.h',
'libANGLE/renderer/FenceSyncImpl.h',
'libANGLE/renderer/Format_ID_autogen.inl',
- 'libANGLE/renderer/Format_table_autogen.cpp',
+ 'libANGLE/renderer/Format_autogen.cpp',
+ 'libANGLE/renderer/Format.cpp',
'libANGLE/renderer/Format.h',
'libANGLE/renderer/FramebufferAttachmentObjectImpl.h',
'libANGLE/renderer/FramebufferImpl.h',
@@ -257,7 +250,6 @@
'libANGLE/renderer/d3d/ShaderExecutableD3D.h',
'libANGLE/renderer/d3d/SurfaceD3D.cpp',
'libANGLE/renderer/d3d/SurfaceD3D.h',
- 'libANGLE/renderer/d3d/SwapChainD3D.cpp',
'libANGLE/renderer/d3d/SwapChainD3D.h',
'libANGLE/renderer/d3d/TextureD3D.cpp',
'libANGLE/renderer/d3d/TextureD3D.h',
@@ -335,7 +327,6 @@
'libANGLE/renderer/d3d/d3d11/copyvertex.inl',
'libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp',
'libANGLE/renderer/d3d/d3d11/DebugAnnotator11.h',
- 'libANGLE/renderer/d3d/d3d11/dxgi_format_map_autogen.cpp',
'libANGLE/renderer/d3d/d3d11/dxgi_support_table.cpp',
'libANGLE/renderer/d3d/d3d11/dxgi_support_table.h',
'libANGLE/renderer/d3d/d3d11/Fence11.cpp',
@@ -514,8 +505,6 @@
],
'libangle_gl_wgl_sources':
[
- 'libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.cpp',
- 'libANGLE/renderer/gl/wgl/D3DTextureSurfaceWGL.h',
'libANGLE/renderer/gl/wgl/DisplayWGL.cpp',
'libANGLE/renderer/gl/wgl/DisplayWGL.h',
'libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp',
@@ -626,47 +615,6 @@
'libANGLE/renderer/vulkan/VertexArrayVk.cpp',
'libANGLE/renderer/vulkan/VertexArrayVk.h',
],
- 'libangle_null_sources':
- [
- 'libANGLE/renderer/null/BufferNULL.cpp',
- 'libANGLE/renderer/null/BufferNULL.h',
- 'libANGLE/renderer/null/CompilerNULL.cpp',
- 'libANGLE/renderer/null/CompilerNULL.h',
- 'libANGLE/renderer/null/ContextNULL.cpp',
- 'libANGLE/renderer/null/ContextNULL.h',
- 'libANGLE/renderer/null/DeviceNULL.cpp',
- 'libANGLE/renderer/null/DeviceNULL.h',
- 'libANGLE/renderer/null/DisplayNULL.cpp',
- 'libANGLE/renderer/null/DisplayNULL.h',
- 'libANGLE/renderer/null/FenceNVNULL.cpp',
- 'libANGLE/renderer/null/FenceNVNULL.h',
- 'libANGLE/renderer/null/FenceSyncNULL.cpp',
- 'libANGLE/renderer/null/FenceSyncNULL.h',
- 'libANGLE/renderer/null/FramebufferNULL.cpp',
- 'libANGLE/renderer/null/FramebufferNULL.h',
- 'libANGLE/renderer/null/ImageNULL.cpp',
- 'libANGLE/renderer/null/ImageNULL.h',
- 'libANGLE/renderer/null/PathNULL.cpp',
- 'libANGLE/renderer/null/PathNULL.h',
- 'libANGLE/renderer/null/ProgramNULL.cpp',
- 'libANGLE/renderer/null/ProgramNULL.h',
- 'libANGLE/renderer/null/QueryNULL.cpp',
- 'libANGLE/renderer/null/QueryNULL.h',
- 'libANGLE/renderer/null/RenderbufferNULL.cpp',
- 'libANGLE/renderer/null/RenderbufferNULL.h',
- 'libANGLE/renderer/null/SamplerNULL.cpp',
- 'libANGLE/renderer/null/SamplerNULL.h',
- 'libANGLE/renderer/null/ShaderNULL.cpp',
- 'libANGLE/renderer/null/ShaderNULL.h',
- 'libANGLE/renderer/null/SurfaceNULL.cpp',
- 'libANGLE/renderer/null/SurfaceNULL.h',
- 'libANGLE/renderer/null/TextureNULL.cpp',
- 'libANGLE/renderer/null/TextureNULL.h',
- 'libANGLE/renderer/null/TransformFeedbackNULL.cpp',
- 'libANGLE/renderer/null/TransformFeedbackNULL.h',
- 'libANGLE/renderer/null/VertexArrayNULL.cpp',
- 'libANGLE/renderer/null/VertexArrayNULL.h',
- ],
'libglesv2_sources':
[
'common/angleutils.h',
@@ -707,12 +655,12 @@
'type': 'static_library',
'dependencies':
[
- 'translator',
+ 'translator_static',
'commit_id',
'angle_common',
'angle_image_util',
],
- 'includes': [ '../gyp/common_defines.gypi', ],
+ 'includes': [ '../build/common_defines.gypi', ],
'include_dirs':
[
'.',
@@ -741,7 +689,6 @@
],
'defines':
[
- 'LIBANGLE_IMPLEMENTATION',
'GL_GLEXT_PROTOTYPES',
'ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_47.dll", "d3dcompiler_46.dll", "d3dcompiler_43.dll" }',
],
@@ -1012,17 +959,6 @@
'ANGLE_ENABLE_VULKAN',
],
}],
- ['angle_enable_null==1',
- {
- 'sources':
- [
- '<@(libangle_null_sources)',
- ],
- 'defines':
- [
- 'ANGLE_ENABLE_NULL',
- ],
- }],
['angle_build_winrt==0 and OS=="win"',
{
'dependencies':
@@ -1040,7 +976,7 @@
'target_name': 'libGLESv2',
'type': '<(angle_gl_library_type)',
'dependencies': [ 'libANGLE', 'angle_common' ],
- 'includes': [ '../gyp/common_defines.gypi', ],
+ 'includes': [ '../build/common_defines.gypi', ],
'sources':
[
'<@(libglesv2_sources)',