Skip to content

A
angle
Commit 21f67ae0 by Jamie Madill Committed by Commit Bot
Options

Vulkan: Remove loader/layers from GYP build.

This simplifies the rolling process since the build configuration was fairly complex. It allows us to save on maintaining the two sets of build files. The back-end is also disabled in GYP. The back-end sources are kept in libGLES.gypi for now to keep all libANGLE sources in the same place. Bug: angleproject:2237, angleproject:1569 Change-Id: Ie73b40ef125cfc20da6f4ed3b33339256f1c5172 Reviewed-on: https://chromium-review.googlesource.com/805416 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarFrank Henigman <fjhenigman@chromium.org>
parent bef918cb
Showing with 0 additions and 42 deletions
src/angle.gyp
......@@ -32,13 +32,11 @@
'angle_enable_d3d9%': 1,
'angle_enable_d3d11%': 1,
'angle_enable_hlsl%': 1,
'angle_enable_vulkan%': 1,
}],
['OS=="linux" and use_x11==1 and chromeos==0',
{
'angle_enable_gl%': 1,
'angle_enable_gl_null%': 1,
'angle_enable_vulkan%': 1,
}],
['OS=="mac"',
{
......@@ -58,7 +56,6 @@
'compiler.gypi',
'libGLESv2.gypi',
'libEGL.gypi',
'vulkan_support/vulkan.gypi',
],
'targets':
......
src/libGLESv2.gypi
......@@ -926,13 +926,6 @@
'ANGLE_ENABLE_OPENGL_NULL',
],
}],
['angle_enable_vulkan==1',
{
'defines':
[
'ANGLE_ENABLE_VULKAN',
],
}],
['angle_enable_null==1',
{
'defines':
......@@ -1188,38 +1181,6 @@
}],
],
}],
['angle_enable_vulkan==1',
{
'sources':
[
'<@(libangle_vulkan_sources)',
],
'conditions':
[
['OS=="win"',
{
'sources':
[
'<@(libangle_vulkan_win32_sources)',
],
}],
['OS=="linux"',
{
'sources':
[
'<@(libangle_vulkan_xcb_sources)',
],
}],
],
'dependencies':
[
'angle_vulkan',
],
'export_dependent_settings':
[
'angle_vulkan',
],
}],
['angle_enable_null==1',
{
'sources':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment