Commit 17217c6e by Jamie Madill Committed by Commit Bot

Vulkan: Fix layers being disabled in tests.

The ANGLE_ENABLE_VULKAN_VALIDATION_LAYERS_BY_DEFAULT define shouldn't be being checked in tests. Enable the debug layers by default. Bug: angleproject:4227 Bug: angleproject:4229 Change-Id: I9717cb1c611ebd585a5c03ba2057036e1b086001 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1972497 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCourtney Goeltzenleuchter <courtneygo@google.com>
parent d205ee3a
...@@ -126,8 +126,8 @@ TEST_P(VulkanExternalImageTest, ShouldImportSemaphoreOpaqueFd) ...@@ -126,8 +126,8 @@ TEST_P(VulkanExternalImageTest, ShouldImportSemaphoreOpaqueFd)
// Test creating and clearing a simple RGBA8 texture in a opaque fd. // Test creating and clearing a simple RGBA8 texture in a opaque fd.
TEST_P(VulkanExternalImageTest, ShouldClearOpaqueFdRGBA8) TEST_P(VulkanExternalImageTest, ShouldClearOpaqueFdRGBA8)
{ {
// http://anglebug.com/4092 // http://anglebug.com/4229
ANGLE_SKIP_TEST_IF(isSwiftshader()); ANGLE_SKIP_TEST_IF(IsVulkan());
ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_memory_object_fd")); ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_memory_object_fd"));
VulkanExternalHelper helper; VulkanExternalHelper helper;
......
...@@ -46,12 +46,8 @@ EGLint PlatformParameters::getDeviceType() const ...@@ -46,12 +46,8 @@ EGLint PlatformParameters::getDeviceType() const
void PlatformParameters::initDefaultParameters() void PlatformParameters::initDefaultParameters()
{ {
#if defined(ANGLE_ENABLE_VULKAN_VALIDATION_LAYERS_BY_DEFAULT)
// Default debug layers to enabled in tests. // Default debug layers to enabled in tests.
eglParameters.debugLayersEnabled = EGL_TRUE; eglParameters.debugLayersEnabled = EGL_TRUE;
#else
eglParameters.debugLayersEnabled = EGL_FALSE;
#endif // defined(ANGLE_ENABLE_VULKAN_VALIDATION_LAYERS_BY_DEFAULT)
} }
bool operator<(const PlatformParameters &a, const PlatformParameters &b) bool operator<(const PlatformParameters &a, const PlatformParameters &b)
......
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