mirror of
https://github.com/electron/electron.git
synced 2026-05-02 03:00:22 -04:00
110 lines
5.6 KiB
Diff
110 lines
5.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shahbaz Youssefi <syoussefi@chromium.org>
|
|
Date: Mon, 7 Feb 2022 13:46:46 -0500
|
|
Subject: M98: Vulkan: Fix vkCmdResolveImage offsets
|
|
|
|
glBlitFramebuffer takes identical regions for src and dst when
|
|
resolving. vkCmdResolveImage should use the clipped area instead of
|
|
using the actual offsets passed to this function.
|
|
|
|
Bug: chromium:1292537
|
|
Change-Id: If283a8acbca3249b771facbc30bd9f8080a03656
|
|
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3457023
|
|
Reviewed-by: Tim Van Patten <timvp@google.com>
|
|
|
|
diff --git a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
|
|
index 892983bd1ad52c6e0080c977022689c1d6a20ac5..7fc8e785af2c9c50f624790eccf5f57ce4af2c87 100644
|
|
--- a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
|
|
+++ b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
|
|
@@ -1451,13 +1451,13 @@ angle::Result FramebufferVk::resolveColorWithCommand(ContextVk *contextVk,
|
|
resolveRegion.srcSubresource.mipLevel = 0;
|
|
resolveRegion.srcSubresource.baseArrayLayer = params.srcLayer;
|
|
resolveRegion.srcSubresource.layerCount = 1;
|
|
- resolveRegion.srcOffset.x = params.srcOffset[0];
|
|
- resolveRegion.srcOffset.y = params.srcOffset[1];
|
|
+ resolveRegion.srcOffset.x = params.blitArea.x;
|
|
+ resolveRegion.srcOffset.y = params.blitArea.y;
|
|
resolveRegion.srcOffset.z = 0;
|
|
resolveRegion.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
|
|
resolveRegion.dstSubresource.layerCount = 1;
|
|
- resolveRegion.dstOffset.x = params.destOffset[0];
|
|
- resolveRegion.dstOffset.y = params.destOffset[1];
|
|
+ resolveRegion.dstOffset.x = params.blitArea.x;
|
|
+ resolveRegion.dstOffset.y = params.blitArea.y;
|
|
resolveRegion.dstOffset.z = 0;
|
|
resolveRegion.extent.width = params.blitArea.width;
|
|
resolveRegion.extent.height = params.blitArea.height;
|
|
diff --git a/src/tests/angle_end2end_tests_expectations.txt b/src/tests/angle_end2end_tests_expectations.txt
|
|
index 72e32c27efabe8393ae840a9fef4ce37b3c5088c..87041f3b43a9ab50a0ec87ea4c338b498024b1b5 100644
|
|
--- a/src/tests/angle_end2end_tests_expectations.txt
|
|
+++ b/src/tests/angle_end2end_tests_expectations.txt
|
|
@@ -15,6 +15,8 @@
|
|
6142 VULKAN : BlitFramebufferTest.BlitDepthStencilPixelByPixel/* = SKIP
|
|
6153 VULKAN WIN INTEL : GLSLTest_ES31.StructAndArrayEqualOperator/ES3_1_Vulkan_DirectSPIRVGen = SKIP
|
|
6153 VULKAN PIXEL4ORXL : GLSLTest_ES31.StructAndArrayEqualOperator/ES3_1_Vulkan_DirectSPIRVGen = SKIP
|
|
+6989 OPENGL : BlitFramebufferTestES31.OOBResolve/* = SKIP
|
|
+6989 GLES : BlitFramebufferTestES31.OOBResolve/* = SKIP
|
|
|
|
// SPIR-V generation doesn't yet support bools in interface blocks
|
|
4889 VULKAN : GLSLTest.NestedSequenceOperatorWithTernaryInside/ES2_Vulkan_DirectSPIRVGen = SKIP
|
|
diff --git a/src/tests/gl_tests/BlitFramebufferANGLETest.cpp b/src/tests/gl_tests/BlitFramebufferANGLETest.cpp
|
|
index 02f7d025d52f50fd067aea1b8ef1057afdfd4657..ae2844d072ee5ab4c584bfa663b955994c011b0c 100644
|
|
--- a/src/tests/gl_tests/BlitFramebufferANGLETest.cpp
|
|
+++ b/src/tests/gl_tests/BlitFramebufferANGLETest.cpp
|
|
@@ -2632,6 +2632,55 @@ TEST_P(BlitFramebufferTest, BlitDepthStencilPixelByPixel)
|
|
EXPECT_PIXEL_RECT_EQ(64, 0, 128, 1, GLColor::blue);
|
|
}
|
|
|
|
+// Regression test for a bug in the Vulkan backend where vkCmdResolveImage was used with
|
|
+// out-of-bounds regions.
|
|
+TEST_P(BlitFramebufferTestES31, OOBResolve)
|
|
+{
|
|
+ constexpr GLint kWidth = 16;
|
|
+ constexpr GLint kHeight = 32;
|
|
+
|
|
+ // Read framebuffer is multisampled.
|
|
+ GLTexture readTexture;
|
|
+ glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, readTexture);
|
|
+ glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, 4, GL_RGBA8, kWidth, kHeight, GL_TRUE);
|
|
+
|
|
+ GLFramebuffer readFbo;
|
|
+ glBindFramebuffer(GL_FRAMEBUFFER, readFbo);
|
|
+ glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_MULTISAMPLE,
|
|
+ readTexture, 0);
|
|
+ ASSERT_GL_NO_ERROR();
|
|
+ ASSERT_GL_FRAMEBUFFER_COMPLETE(GL_FRAMEBUFFER);
|
|
+
|
|
+ glClearColor(1, 0, 0, 1);
|
|
+ glClear(GL_COLOR_BUFFER_BIT);
|
|
+
|
|
+ // Draw framebuffer is single sampled.
|
|
+ GLTexture drawTexture;
|
|
+ glBindTexture(GL_TEXTURE_2D, drawTexture);
|
|
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, kWidth, kHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE,
|
|
+ nullptr);
|
|
+ glGenerateMipmap(GL_TEXTURE_2D);
|
|
+
|
|
+ GLFramebuffer drawFbo;
|
|
+ glBindFramebuffer(GL_FRAMEBUFFER, drawFbo);
|
|
+ glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, drawTexture, 0);
|
|
+ ASSERT_GL_NO_ERROR();
|
|
+ ASSERT_GL_FRAMEBUFFER_COMPLETE(GL_FRAMEBUFFER);
|
|
+
|
|
+ glClearColor(0, 1, 0, 1);
|
|
+ glClear(GL_COLOR_BUFFER_BIT);
|
|
+ EXPECT_PIXEL_RECT_EQ(0, 0, kWidth, kHeight, GLColor::green);
|
|
+
|
|
+ // Resolve the read framebuffer, using bounds that are outside the size of the image.
|
|
+ glBindFramebuffer(GL_READ_FRAMEBUFFER, readFbo);
|
|
+ glBlitFramebuffer(-kWidth * 2, -kHeight * 3, kWidth * 11, kHeight * 8, -kWidth * 2,
|
|
+ -kHeight * 3, kWidth * 11, kHeight * 8, GL_COLOR_BUFFER_BIT, GL_NEAREST);
|
|
+ ASSERT_GL_NO_ERROR();
|
|
+
|
|
+ glBindFramebuffer(GL_READ_FRAMEBUFFER, drawFbo);
|
|
+ EXPECT_PIXEL_RECT_EQ(0, 0, kWidth, kHeight, GLColor::red);
|
|
+}
|
|
+
|
|
// Regression test for a bug in the Vulkan backend where vkCmdResolveImage was using the src extents
|
|
// as the resolve area instead of the area passed to glBlitFramebuffer.
|
|
TEST_P(BlitFramebufferTestES31, PartialResolve)
|