Vulkan: Fix scissor clears + enable dEQP tests

src/libANGLE/renderer/vulkan/vk_cache_utils.cpp

@@ -701,8 +701,20 @@ void PipelineDesc::updateRenderPassDesc(const RenderPassDesc &renderPassDesc)
 
 void PipelineDesc::updateScissor(const gl::Rectangle &rect)
 {
-    mScissor = {{rect.x, rect.y},
-                {static_cast<uint32_t>(rect.width), static_cast<uint32_t>(rect.height)}};
+    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.
+    if (ClipRectangle(rect, clipRect, &intersection))
+    {
+        mScissor = ConvertGlRectToVkRect(intersection);
+    }
+    else
+    {
+        mScissor = ConvertGlRectToVkRect(rect);
+    }
 }
 
 // AttachmentOpsArray implementation.

src/libANGLE/renderer/vulkan/vk_utils.cpp

@@ -298,6 +298,12 @@ 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);

src/libANGLE/renderer/vulkan/vk_utils.h

@@ -91,6 +91,8 @@ struct Format;
 template <typename T>
 struct ImplTypeHelper;
 
+VkRect2D ConvertGlRectToVkRect(const gl::Rectangle &source);
+
 // clang-format off
 #define ANGLE_IMPL_TYPE_HELPER_GL(OBJ) \
 template<>                             \

src/tests/deqp_support/deqp_gles2_test_expectations.txt

@@ -178,9 +178,11 @@
 1028 WIN LINUX MAC : dEQP-GLES2.functional.fbo.completeness.renderable.texture.depth.srgb8 = FAIL
 
 // Vulkan failures
+2161 VULKAN : dEQP-GLES2.functional.color_clear.masked_* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.color_clear.complex_* = SKIP
+2161 VULKAN : dEQP-GLES2.functional.color_clear.long_masked_* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.prerequisite.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.implementation_limits.* = SKIP
-2161 VULKAN : dEQP-GLES2.functional.color_clear.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.depth_stencil_clear.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.buffer.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.light_amount.* = SKIP