Commit 41c43ce7 by Tobin Ehlis Committed by Jamie Madill

Roll (2/2) to latest LVL as of 4/16/18

Moving to HEAD of LVL master on morning of 4/16/18. Made some updates to BUILD.gn to add use debug_utils files now instead of debug_report. Re-enable ANGLE Vulkan build. Bug: angleproject:2482 Change-Id: Ic2ab2a1cd7ecdba3152d433efcdbf427864e7e2b Reviewed-on: https://chromium-review.googlesource.com/1014258Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent aa8b3982
......@@ -40,10 +40,8 @@ declare_args() {
angle_enable_d3d11 = is_win
angle_enable_gl = ozone_platform_gbm || !is_linux || (use_x11 && !is_chromeos)
# TODO(tobine): Re-enable after roll
# angle_enable_vulkan = is_win || (is_linux && use_x11 && !is_chromeos) ||
# (is_android && ndk_supports_vulkan)
angle_enable_vulkan = false
angle_enable_vulkan = is_win || (is_linux && use_x11 && !is_chromeos) ||
(is_android && ndk_supports_vulkan)
angle_enable_null = true
angle_enable_essl = true
angle_enable_glsl = true
......
......@@ -344,4 +344,13 @@
2161 VULKAN : dEQP-GLES2.functional.draw.random.* = SKIP
2161 VULKAN : dEQP-GLES2.functional.default_vertex_attrib.* = SKIP
2161 VULKAN : dEQP-GLES2.functional.lifetime.* = SKIP
2161 VULKAN : dEQP-GLES2.functional.debug_marker.* = SKIP
\ No newline at end of file
2161 VULKAN : dEQP-GLES2.functional.debug_marker.* = SKIP
// TODO(lucferron) This is a regression tracked in http://anglebug.com/2484
2484 VULKAN WIN LINUX ANDROID : dEQP-GLES2.functional.color_clear.short_scissored_rgb = SKIP
2484 VULKAN WIN LINUX ANDROID : dEQP-GLES2.functional.color_clear.scissored_rgb = SKIP
2484 VULKAN WIN LINUX ANDROID : dEQP-GLES2.functional.color_clear.scissored_rgba = SKIP
2484 VULKAN : dEQP-GLES2.functional.depth_stencil_clear.depth_scissored = SKIP
2484 VULKAN : dEQP-GLES2.functional.depth_stencil_clear.stencil_scissored = SKIP
2484 VULKAN : dEQP-GLES2.functional.depth_stencil_clear.depth_stencil_scissored = SKIP
2484 VULKAN : dEQP-GLES2.functional.fragment_ops.scissor.clear_color = SKIP
......@@ -435,6 +435,9 @@ class ScissoredClearTest : public ANGLETest
// Simple scissored clear.
TEST_P(ScissoredClearTest, BasicScissoredColorClear)
{
// TODO(lucferron) This is a regression tracked in http://anglebug.com/2484
ANGLE_SKIP_TEST_IF(IsVulkan());
const int w = getWindowWidth();
const int h = getWindowHeight();
const int whalf = w >> 1;
......
......@@ -284,8 +284,8 @@ if (!is_android) {
sources = [
"src/loader/cJSON.c",
"src/loader/cJSON.h",
"src/loader/debug_report.c",
"src/loader/debug_report.h",
"src/loader/debug_utils.c",
"src/loader/debug_utils.h",
"src/loader/dev_ext_trampoline.c",
"src/loader/extension_manual.c",
"src/loader/extension_manual.h",
......
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