Skip to content

A
angle
Commit e2995cce by Jamie Madill Committed by Commit Bot
Options

Vulkan: Fix layers not being enabled on the bots.

We were missing the data definition for the standard validation layer. This file was missing from the isolate, and the entire layer system was not working. Found this as a side-effect of working on depth stencil support. Also fixes a missing definition in the white_box_tests BUILD.gn. Also temporarily disables the ClearTest support for Vulkan because of an implementation bug on AMD. Unfortunately because of the failure mode it didn't work to just skip the test in the preamble. Bug: angleproject:2357 Change-Id: I4d06c54191b09e09a4ba68c24613db6f148b17e3 Reviewed-on: https://chromium-review.googlesource.com/956759 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent a36483fc
Showing with 12 additions and 5 deletions
src/tests/BUILD.gn
...@@ -225,6 +225,11 @@ if (is_win || is_linux || is_mac || is_android) { ...@@ -225,6 +225,11 @@ if (is_win || is_linux || is_mac || is_android) {
angle_root + ":libANGLE_config", angle_root + ":libANGLE_config",
] ]
if (is_linux && !is_component_build) {
# Set rpath to find libEGL.so and libGLESv2.so even in a non-component build.
configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
}
deps = googletest_deps + [ deps = googletest_deps + [
angle_root + ":angle_util_static", angle_root + ":angle_util_static",
angle_root + ":libANGLE", angle_root + ":libANGLE",
......
src/tests/gl_tests/ClearTest.cpp
...@@ -133,9 +133,6 @@ TEST_P(ClearTest, RGBA8Framebuffer) ...@@ -133,9 +133,6 @@ TEST_P(ClearTest, RGBA8Framebuffer)
TEST_P(ClearTest, ClearIssue) TEST_P(ClearTest, ClearIssue)
{ {
// TODO(jmadill): Depth/Stencil clears on Vulkan. http://anglebug.com/2357
ANGLE_SKIP_TEST_IF(IsVulkan());
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
glDepthFunc(GL_LEQUAL); glDepthFunc(GL_LEQUAL);
...@@ -460,6 +457,8 @@ TEST_P(ScissoredClearTest, BasicScissoredColorClear) ...@@ -460,6 +457,8 @@ TEST_P(ScissoredClearTest, BasicScissoredColorClear)
} }
// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against. // Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
// Vulkan support disabled because of incomplete implementation.
// TODO(jmadill): Fix depth/stencil support on Vulkan. http://anglebug.com/2357
ANGLE_INSTANTIATE_TEST(ClearTest, ANGLE_INSTANTIATE_TEST(ClearTest,
ES2_D3D9(), ES2_D3D9(),
ES2_D3D11(), ES2_D3D11(),
...@@ -467,8 +466,8 @@ ANGLE_INSTANTIATE_TEST(ClearTest, ...@@ -467,8 +466,8 @@ ANGLE_INSTANTIATE_TEST(ClearTest,
ES2_OPENGL(), ES2_OPENGL(),
ES3_OPENGL(), ES3_OPENGL(),
ES2_OPENGLES(), ES2_OPENGLES(),
ES3_OPENGLES(), ES3_OPENGLES()/*,
ES2_VULKAN()); ES2_VULKAN()*/);
ANGLE_INSTANTIATE_TEST(ClearTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES()); ANGLE_INSTANTIATE_TEST(ClearTestES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
ANGLE_INSTANTIATE_TEST(ScissoredClearTest, ES2_D3D11(), ES2_OPENGL(), ES2_VULKAN()); ANGLE_INSTANTIATE_TEST(ScissoredClearTest, ES2_D3D11(), ES2_OPENGL(), ES2_VULKAN());
......
third_party/vulkan-validation-layers/BUILD.gn
...@@ -437,6 +437,7 @@ if (!is_android) { ...@@ -437,6 +437,7 @@ if (!is_android) {
"$root_out_dir/$data_dir/VkLayer_core_validation.json", "$root_out_dir/$data_dir/VkLayer_core_validation.json",
"$root_out_dir/$data_dir/VkLayer_object_tracker.json", "$root_out_dir/$data_dir/VkLayer_object_tracker.json",
"$root_out_dir/$data_dir/VkLayer_parameter_validation.json", "$root_out_dir/$data_dir/VkLayer_parameter_validation.json",
"$root_out_dir/$data_dir/VkLayer_standard_validation.json",
"$root_out_dir/$data_dir/VkLayer_threading.json", "$root_out_dir/$data_dir/VkLayer_threading.json",
"$root_out_dir/$data_dir/VkLayer_unique_objects.json", "$root_out_dir/$data_dir/VkLayer_unique_objects.json",
] ]
...@@ -448,6 +449,7 @@ if (!is_android) { ...@@ -448,6 +449,7 @@ if (!is_android) {
"src/layers/windows/VkLayer_core_validation.json", "src/layers/windows/VkLayer_core_validation.json",
"src/layers/windows/VkLayer_object_tracker.json", "src/layers/windows/VkLayer_object_tracker.json",
"src/layers/windows/VkLayer_parameter_validation.json", "src/layers/windows/VkLayer_parameter_validation.json",
"src/layers/windows/VkLayer_standard_validation.json",
"src/layers/windows/VkLayer_threading.json", "src/layers/windows/VkLayer_threading.json",
"src/layers/windows/VkLayer_unique_objects.json", "src/layers/windows/VkLayer_unique_objects.json",
] ]
...@@ -458,6 +460,7 @@ if (!is_android) { ...@@ -458,6 +460,7 @@ if (!is_android) {
"src/layers/linux/VkLayer_core_validation.json", "src/layers/linux/VkLayer_core_validation.json",
"src/layers/linux/VkLayer_object_tracker.json", "src/layers/linux/VkLayer_object_tracker.json",
"src/layers/linux/VkLayer_parameter_validation.json", "src/layers/linux/VkLayer_parameter_validation.json",
"src/layers/linux/VkLayer_standard_validation.json",
"src/layers/linux/VkLayer_threading.json", "src/layers/linux/VkLayer_threading.json",
"src/layers/linux/VkLayer_unique_objects.json", "src/layers/linux/VkLayer_unique_objects.json",
] ]
......
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