commit be30c4fb96dd5a1896698036fdd18fac43e61fab
author Luc Ferron <lucferron@chromium.org> Thu Jun 21 09:43:08 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Jun 28 16:43:15 2018 +0000
tree ab07e1285fd08580847dd9c72088898d623aaa25
parent a0adaf985ebdd81d45afbae813b647add337c73e

Vulkan: Framebuffer blit support for depth/stencil cases

Bug: angleproject:2643
Change-Id: Ib50e4051f5b3965c2a752cf2cd45d3470312cdcf
Reviewed-on: https://chromium-review.googlesource.com/1115370
Commit-Queue: Luc Ferron <lucferron@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/tests/gl_tests/BlitFramebufferANGLETest.cpp

diff --git a/src/tests/gl_tests/BlitFramebufferANGLETest.cpp b/src/tests/gl_tests/BlitFramebufferANGLETest.cpp
index c338207..ae14b29 100644
--- a/src/tests/gl_tests/BlitFramebufferANGLETest.cpp
+++ b/src/tests/gl_tests/BlitFramebufferANGLETest.cpp
@@ -570,11 +570,6 @@
 // blit from user-created FBO to system framebuffer, with depth buffer.
 TEST_P(BlitFramebufferANGLETest, BlitWithDepth)
 {
-    // TODO(lucferron): The format used is not supported for vkCmdBlitImage so we'll need to
-    // implement a slow path.
-    // http://anglebug.com/2643
-    ANGLE_SKIP_TEST_IF(IsVulkan());
-
     ANGLE_SKIP_TEST_IF(!extensionEnabled("GL_ANGLE_framebuffer_blit"));
 
     glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
@@ -614,11 +609,6 @@
 // blit from system FBO to user-created framebuffer, with depth buffer.
 TEST_P(BlitFramebufferANGLETest, ReverseBlitWithDepth)
 {
-    // TODO(lucferron): The format used is not supported for vkCmdBlitImage so we'll need to
-    // implement a slow path.
-    // http://anglebug.com/2643
-    ANGLE_SKIP_TEST_IF(IsVulkan());
-
     ANGLE_SKIP_TEST_IF(!extensionEnabled("GL_ANGLE_framebuffer_blit"));
 
     glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO);
@@ -791,17 +781,15 @@
 
 TEST_P(BlitFramebufferANGLETest, BlitStencil)
 {
-    // TODO(lucferron): The format used is not supported for vkCmdBlitImage so we'll need to
-    // implement a slow path.
-    // http://anglebug.com/2643
-    ANGLE_SKIP_TEST_IF(IsVulkan());
-
     ANGLE_SKIP_TEST_IF(!extensionEnabled("GL_ANGLE_framebuffer_blit"));
 
     // TODO(jmadill): Figure out if we can fix this on D3D9.
     // https://code.google.com/p/angleproject/issues/detail?id=2205
     ANGLE_SKIP_TEST_IF(IsIntel() && IsD3D9());
 
+    // TODO(lucferron): Diagnose and fix http://anglebug.com/2693
+    ANGLE_SKIP_TEST_IF(IsIntel() && IsLinux() && IsVulkan());
+
     glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
 
     glClear(GL_COLOR_BUFFER_BIT);