Vulkan: enable the rest of dEQP tests in fbo.render.*

src/libANGLE/Framebuffer.cpp

@@ -516,6 +516,14 @@ bool FramebufferState::attachmentsHaveSameDimensions() const
     return !hasMismatchedSize(mStencilAttachment);
 }
 
+bool FramebufferState::hasSeparateDepthAndStencilAttachments() const
+{
+    // if we have both a depth and stencil buffer, they must refer to the same object
+    // since we only support packed_depth_stencil and not separate depth and stencil
+    return (getDepthAttachment() != nullptr && getStencilAttachment() != nullptr &&
+            getDepthStencilAttachment() == nullptr);
+}
+
 const FramebufferAttachment *FramebufferState::getDrawBuffer(size_t drawBufferIdx) const
 {
     ASSERT(drawBufferIdx < mDrawBufferStates.size());

src/libANGLE/Framebuffer.h

@@ -79,6 +79,7 @@ class FramebufferState final : angle::NonCopyable
     }
 
     bool attachmentsHaveSameDimensions() const;
+    bool hasSeparateDepthAndStencilAttachments() const;
     bool colorAttachmentsAreUniqueImages() const;
     Box getDimensions() const;
 

src/libANGLE/renderer/d3d/FramebufferD3D.cpp

@@ -293,8 +293,7 @@ bool FramebufferD3D::checkStatus(const gl::Context *context) const
 {
     // if we have both a depth and stencil buffer, they must refer to the same object
     // since we only support packed_depth_stencil and not separate depth and stencil
-    if (mState.getDepthAttachment() != nullptr && mState.getStencilAttachment() != nullptr &&
-        mState.getDepthStencilAttachment() == nullptr)
+    if (mState.hasSeparateDepthAndStencilAttachments())
     {
         return false;
     }

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

@@ -176,11 +176,10 @@ gl::Error FramebufferVk::clear(const gl::Context *context, GLbitfield mask)
         const VkClearDepthStencilValue &clearDepthStencilValue =
             contextVk->getClearDepthStencilValue().depthStencil;
 
-        const VkImageAspectFlags aspectFlags =
-            (depthAttachment ? VK_IMAGE_ASPECT_DEPTH_BIT : 0) |
-            (stencilAttachment ? VK_IMAGE_ASPECT_STENCIL_BIT : 0);
-
         RenderTargetVk *renderTarget = mRenderTargetCache.getDepthStencil();
+        const angle::Format &format          = renderTarget->getImageFormat().textureFormat();
+        const VkImageAspectFlags aspectFlags = vk::GetDepthStencilAspectFlags(format);
+
         vk::ImageHelper *image       = renderTarget->getImageForWrite(currentSerial, this);
         image->clearDepthStencil(aspectFlags, clearDepthStencilValue, commandBuffer);
     }
@@ -342,6 +341,13 @@ gl::Error FramebufferVk::blit(const gl::Context *context,
 
 bool FramebufferVk::checkStatus(const gl::Context *context) const
 {
+    // if we have both a depth and stencil buffer, they must refer to the same object
+    // since we only support packed_depth_stencil and not separate depth and stencil
+    if (mState.hasSeparateDepthAndStencilAttachments())
+    {
+        return false;
+    }
+
     return true;
 }
 

src/libANGLE/renderer/vulkan/RenderTargetVk.cpp

@@ -58,8 +58,7 @@ void RenderTargetVk::onDepthStencilDraw(vk::CommandGraphResource *framebufferVk,
 
     // TODO(jmadill): Use automatic layout transition. http://anglebug.com/2361
     const angle::Format &format    = mImage->getFormat().textureFormat();
-    VkImageAspectFlags aspectFlags = (format.depthBits > 0 ? VK_IMAGE_ASPECT_DEPTH_BIT : 0) |
-                                     (format.stencilBits > 0 ? VK_IMAGE_ASPECT_STENCIL_BIT : 0);
+    VkImageAspectFlags aspectFlags = vk::GetDepthStencilAspectFlags(format);
 
     mImage->changeLayoutWithStages(aspectFlags, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
                                    VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,

src/libANGLE/renderer/vulkan/SurfaceVk.cpp

@@ -425,10 +425,7 @@ vk::Error WindowSurfaceVk::initializeImpl(RendererVk *renderer)
         ANGLE_TRY(mDepthStencilImage.initMemory(device, renderer->getMemoryProperties(),
                                                 VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT));
 
-        const VkImageAspectFlags aspect =
-            (dsFormat.textureFormat().depthBits > 0 ? VK_IMAGE_ASPECT_DEPTH_BIT : 0) |
-            (dsFormat.textureFormat().stencilBits > 0 ? VK_IMAGE_ASPECT_STENCIL_BIT : 0);
-
+        const VkImageAspectFlags aspect = vk::GetDepthStencilAspectFlags(dsFormat.textureFormat());
         VkClearDepthStencilValue depthStencilClearValue = {1.0f, 0};
 
         // Set transfer dest layout, and clear the image.

src/libANGLE/renderer/vulkan/vk_utils.cpp

@@ -262,6 +262,11 @@ bool GetAvailableValidationLayers(const std::vector<VkLayerProperties> &layerPro
 
 namespace vk
 {
+VkImageAspectFlags GetDepthStencilAspectFlags(const angle::Format &format)
+{
+    return (format.depthBits > 0 ? VK_IMAGE_ASPECT_DEPTH_BIT : 0) |
+           (format.stencilBits > 0 ? VK_IMAGE_ASPECT_STENCIL_BIT : 0);
+}
 
 Error::Error(VkResult result) : mResult(result), mFile(nullptr), mLine(0)
 {

src/libANGLE/renderer/vulkan/vk_utils.h

@@ -86,6 +86,8 @@ namespace vk
 {
 struct Format;
 
+VkImageAspectFlags GetDepthStencilAspectFlags(const angle::Format &format);
+
 template <typename T>
 struct ImplTypeHelper;
 

src/tests/deqp_support/deqp_gles2_test_expectations.txt

@@ -230,7 +230,6 @@
 2494 VULKAN : dEQP-GLES2.functional.shaders.struct.uniform.sampler_* = SKIP
 2592 VULKAN : dEQP-GLES2.functional.shaders.builtin_variable.depth_range* = SKIP
 2595 VULKAN : dEQP-GLES2.functional.shaders.random.all_features.fragment* = SKIP
-2597 VULKAN : dEQP-GLES2.functional.fbo.render.recreate_stencilbuffer.no_rebind_rbo_rgb* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.vertex_arrays.* = SKIP
 2598 VULKAN : dEQP-GLES2.functional.rasterization.primitives.line* = SKIP
 2599 VULKAN : dEQP-GLES2.functional.rasterization.limits.points = SKIP