Vulkan: 3 Final bugfixes to enable all dEQP depth_stencil tests

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -340,6 +340,22 @@ void ContextVk::popDebugGroup()
     UNIMPLEMENTED();
 }
 
+void ContextVk::updateScissor(const gl::State &glState)
+{
+    if (glState.isScissorTestEnabled())
+    {
+        mPipelineDesc->updateScissor(glState.getScissor(),
+                                     glState.getDrawFramebuffer()->getDimensions());
+    }
+    else
+    {
+        // If the scissor test isn't enabled, we have to also update the scissor to
+        // be equal to the framebuffer dimensions to make sure we keep rendering everything.
+        mPipelineDesc->updateScissor(glState.getViewport(),
+                                     glState.getDrawFramebuffer()->getDimensions());
+    }
+}
+
 void ContextVk::syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits)
 {
     if (dirtyBits.any())
@@ -357,34 +373,20 @@ void ContextVk::syncState(const gl::Context *context, const gl::State::DirtyBits
         switch (dirtyBit)
         {
             case gl::State::DIRTY_BIT_SCISSOR_TEST_ENABLED:
-                if (glState.isScissorTestEnabled())
-                {
-                    mPipelineDesc->updateScissor(glState.getScissor());
-                }
-                else
-                {
-                    mPipelineDesc->updateScissor(glState.getViewport());
-                }
+                updateScissor(glState);
                 break;
             case gl::State::DIRTY_BIT_SCISSOR:
                 // Only modify the scissor region if the test is enabled, otherwise we want to keep
                 // the viewport size as the scissor region.
                 if (glState.isScissorTestEnabled())
                 {
-                    mPipelineDesc->updateScissor(glState.getScissor());
+                    mPipelineDesc->updateScissor(glState.getScissor(),
+                                                 glState.getDrawFramebuffer()->getDimensions());
                 }
                 break;
             case gl::State::DIRTY_BIT_VIEWPORT:
                 mPipelineDesc->updateViewport(glState.getViewport(), glState.getNearPlane(),
                                               glState.getFarPlane());
-
-                // If the scissor test isn't enabled, we have to also update the scissor to
-                // be equal to the viewport to make sure we keep rendering everything in the
-                // viewport.
-                if (!glState.isScissorTestEnabled())
-                {
-                    mPipelineDesc->updateScissor(glState.getViewport());
-                }
                 break;
             case gl::State::DIRTY_BIT_DEPTH_RANGE:
                 WARN() << "DIRTY_BIT_DEPTH_RANGE unimplemented";

src/libANGLE/renderer/vulkan/ContextVk.h

@@ -167,6 +167,8 @@ class ContextVk : public ContextImpl
                         vk::CommandGraphNode **drawNodeOut,
                         bool *newCommandBufferOut);
 
+    void updateScissor(const gl::State &glState);
+
     RendererVk *mRenderer;
     vk::PipelineAndSerial *mCurrentPipeline;
     GLenum mCurrentDrawMode;

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

@@ -579,10 +579,11 @@ gl::Error FramebufferVk::getCommandGraphNodeForDraw(const gl::Context *context,
         attachmentClearValues.emplace_back(contextVk->getClearDepthStencilValue());
     }
 
+    gl::Rectangle renderArea =
+        gl::Rectangle(0, 0, mState.getDimensions().width, mState.getDimensions().height);
     // Hard-code RenderPass to clear the first render target to the current clear value.
     // TODO(jmadill): Proper clear value implementation. http://anglebug.com/2361
-    const gl::State &glState = context->getGLState();
-    (*nodeOut)->storeRenderPassInfo(*framebuffer, glState.getViewport(), attachmentClearValues);
+    (*nodeOut)->storeRenderPassInfo(*framebuffer, renderArea, attachmentClearValues);
 
     return gl::NoError();
 }

src/libANGLE/renderer/vulkan/vk_cache_utils.cpp

@@ -808,21 +808,21 @@ void PipelineDesc::updateRenderPassDesc(const RenderPassDesc &renderPassDesc)
     mRenderPassDesc = renderPassDesc;
 }
 
-void PipelineDesc::updateScissor(const gl::Rectangle &rect)
+void PipelineDesc::updateScissor(const gl::Rectangle &rect, gl::Box framebufferDimensions)
 {
     gl::Rectangle intersection;
-    gl::Rectangle clipRect(static_cast<GLuint>(mViewport.x), static_cast<GLuint>(mViewport.y),
-                           static_cast<GLuint>(mViewport.width),
-                           static_cast<GLuint>(mViewport.height));
-    // Coordinates outside surface aren't valid in Vulkan but not error is returned, the scissor is
-    // just ignored.
+    gl::Rectangle clipRect(static_cast<GLuint>(0), static_cast<GLuint>(0),
+                           static_cast<GLuint>(framebufferDimensions.width),
+                           static_cast<GLuint>(framebufferDimensions.height));
+    // Coordinates outside the framebuffer aren't valid in Vulkan but not error is returned, the
+    // scissor is just ignored.
     if (ClipRectangle(rect, clipRect, &intersection))
     {
-        mScissor = ConvertGlRectToVkRect(intersection);
+        mScissor = gl_vk::GetRect(intersection);
     }
     else
     {
-        mScissor = ConvertGlRectToVkRect(rect);
+        mScissor = gl_vk::GetRect(rect);
     }
 }
 

src/libANGLE/renderer/vulkan/vk_cache_utils.h

@@ -292,7 +292,7 @@ class PipelineDesc final
 
     // Scissor support
     const VkRect2D &getScissor() const { return mScissor; }
-    void updateScissor(const gl::Rectangle &rect);
+    void updateScissor(const gl::Rectangle &rect, gl::Box surfaceDimensions);
 
     // Blend states
     void updateBlendEnabled(bool isBlendEnabled);

src/libANGLE/renderer/vulkan/vk_utils.cpp

@@ -251,12 +251,6 @@ bool GetAvailableValidationLayers(const std::vector<VkLayerProperties> &layerPro
 namespace vk
 {
 
-VkRect2D ConvertGlRectToVkRect(const gl::Rectangle &source)
-{
-    return {{source.x, source.y},
-            {static_cast<uint32_t>(source.width), static_cast<uint32_t>(source.height)}};
-}
-
 Error::Error(VkResult result) : mResult(result), mFile(nullptr), mLine(0)
 {
     ASSERT(result == VK_SUCCESS);
@@ -1145,6 +1139,12 @@ void GarbageObject::destroy(VkDevice device)
 
 namespace gl_vk
 {
+VkRect2D GetRect(const gl::Rectangle &source)
+{
+    return {{source.x, source.y},
+            {static_cast<uint32_t>(source.width), static_cast<uint32_t>(source.height)}};
+}
+
 VkPrimitiveTopology GetPrimitiveTopology(GLenum mode)
 {
     switch (mode)

src/libANGLE/renderer/vulkan/vk_utils.h

@@ -87,8 +87,6 @@ struct Format;
 template <typename T>
 struct ImplTypeHelper;
 
-VkRect2D ConvertGlRectToVkRect(const gl::Rectangle &source);
-
 // clang-format off
 #define ANGLE_IMPL_TYPE_HELPER_GL(OBJ) \
 template<>                             \
@@ -651,6 +649,7 @@ Error AllocateImageMemory(VkDevice device,
 
 namespace gl_vk
 {
+VkRect2D GetRect(const gl::Rectangle &source);
 VkPrimitiveTopology GetPrimitiveTopology(GLenum mode);
 VkCullModeFlags GetCullMode(const gl::RasterizerState &rasterState);
 VkFrontFace GetFrontFace(GLenum frontFace);

src/tests/deqp_support/deqp_gles2_test_expectations.txt

@@ -229,7 +229,6 @@
 2161 VULKAN : dEQP-GLES2.functional.texture.vertex.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.fragment_ops.random.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.fragment_ops.interaction.* = SKIP
-2161 VULKAN : dEQP-GLES2.functional.fragment_ops.depth_stencil.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.fbo.* = SKIP
 // Conflicts with Android expectation, specify the OSs
 2161 VULKAN WIN LINUX MAC : dEQP-GLES2.functional.vertex_arrays.* = SKIP