Vulkan: Skip sample coverage for single sample rendering
A new test sets sample coverage to zero and checks
that it is applied only to multisampled rendering.
Bug: angleproject:8102
Change-Id: I1a5649869e9b7ecf0543108fb99095bfaf6fd858
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4379839
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Alexey Knyazev <lexa.knyazev@gmail.com>
diff --git a/src/libANGLE/renderer/vulkan/ContextVk.cpp b/src/libANGLE/renderer/vulkan/ContextVk.cpp
index 9bc2258..236d07a 100644
--- a/src/libANGLE/renderer/vulkan/ContextVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ContextVk.cpp
@@ -4680,12 +4680,19 @@
ASSERT(mState.getMaxSampleMaskWords() == 1);
uint32_t mask = std::numeric_limits<uint16_t>::max();
- if (mState.isSampleMaskEnabled() && rasterizationSamples > 1)
- {
- mask = mState.getSampleMaskWord(0) & angle::BitMask<uint32_t>(rasterizationSamples);
- }
- ApplySampleCoverage(mState, coverageSampleCount, &mask);
+ // The following assumes that supported sample counts for multisampled
+ // rendering does not include 1. This is true in the Vulkan backend,
+ // where 1x multisampling is disallowed.
+ if (rasterizationSamples > 1)
+ {
+ if (mState.isSampleMaskEnabled())
+ {
+ mask = mState.getSampleMaskWord(0) & angle::BitMask<uint32_t>(rasterizationSamples);
+ }
+
+ ApplySampleCoverage(mState, coverageSampleCount, &mask);
+ }
mGraphicsPipelineDesc->updateSampleMask(&mGraphicsPipelineTransition, 0, mask);
}
diff --git a/src/tests/angle_end2end_tests_expectations.txt b/src/tests/angle_end2end_tests_expectations.txt
index 0618d6a..7b651c5 100644
--- a/src/tests/angle_end2end_tests_expectations.txt
+++ b/src/tests/angle_end2end_tests_expectations.txt
@@ -1157,7 +1157,10 @@
// Sample coverage must not affect single sample render targets
8102 D3D11 : SimpleOperationTest.DrawSingleSampleWithCoverage/* = SKIP
-8102 VULKAN : SimpleOperationTest.DrawSingleSampleWithCoverage/* = SKIP
+8102 D3D11 : StateChangeTestES3.SampleCoverageFramebufferAttachmentSwitch/* = SKIP
+
+// Sample coverage is ignored when replacing a single-sample attachment with a multi-sample one
+8114 MAC INTEL OPENGL : StateChangeTestES3.SampleCoverageFramebufferAttachmentSwitch/* = SKIP
// bits 24..31 from glClearValueuiv value don't work on Intel Metal.
7794 MAC INTEL METAL : PixelLocalStorageTest.ClearValues_r32/* = SKIP
diff --git a/src/tests/capture_replay_tests/capture_replay_expectations.txt b/src/tests/capture_replay_tests/capture_replay_expectations.txt
index d40dc6a..1133c4b 100644
--- a/src/tests/capture_replay_tests/capture_replay_expectations.txt
+++ b/src/tests/capture_replay_tests/capture_replay_expectations.txt
@@ -201,6 +201,3 @@
# Fails if run after DifferentStencilMasksTest.DrawWithSameEffectiveMask
8079 : DiscardFramebufferEXTTest.ClearDepthThenDrawWithoutDepthTestThenDiscard/* = SKIP_FOR_CAPTURE
-
-# Sample coverage must not affect single sample render targets
-8102 : SimpleOperationTest.DrawSingleSampleWithCoverage/* = SKIP_FOR_CAPTURE
diff --git a/src/tests/gl_tests/StateChangeTest.cpp b/src/tests/gl_tests/StateChangeTest.cpp
index dac352a..cf07b0b 100644
--- a/src/tests/gl_tests/StateChangeTest.cpp
+++ b/src/tests/gl_tests/StateChangeTest.cpp
@@ -10241,6 +10241,82 @@
ASSERT_GL_NO_ERROR();
}
+// Test that switching FBO attachments affects sample coverage
+TEST_P(StateChangeTestES3, SampleCoverageFramebufferAttachmentSwitch)
+{
+ // Keep this state unchanged during the test
+ glEnable(GL_SAMPLE_COVERAGE);
+ glSampleCoverage(0.0f, false);
+
+ ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Simple(), essl1_shaders::fs::Green());
+
+ GLFramebuffer fbo;
+ glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+
+ GLRenderbuffer rbo;
+ glBindRenderbuffer(GL_RENDERBUFFER, rbo);
+ glRenderbufferStorageMultisample(GL_RENDERBUFFER, 0, GL_RGBA8, 1, 1);
+
+ glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, rbo);
+ ASSERT_GL_FRAMEBUFFER_COMPLETE(GL_FRAMEBUFFER);
+
+ drawQuad(program, essl1_shaders::PositionAttrib(), 0.0);
+ ASSERT_GL_NO_ERROR();
+
+ // Sample coverage must have no effect
+ EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
+
+ GLRenderbuffer rboMS;
+ glBindRenderbuffer(GL_RENDERBUFFER, rboMS);
+ glRenderbufferStorageMultisample(GL_RENDERBUFFER, 4, GL_RGBA8, 1, 1);
+
+ glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, rboMS);
+ ASSERT_GL_FRAMEBUFFER_COMPLETE(GL_FRAMEBUFFER);
+
+ glClearColor(1, 0, 0, 1);
+ glClear(GL_COLOR_BUFFER_BIT);
+ drawQuad(program, essl1_shaders::PositionAttrib(), 0.0);
+ ASSERT_GL_NO_ERROR();
+
+ // Use a temporary FBO to resolve
+ {
+ GLFramebuffer fboResolve;
+ glBindFramebuffer(GL_FRAMEBUFFER, fboResolve);
+
+ GLRenderbuffer rboResolve;
+ glBindRenderbuffer(GL_RENDERBUFFER, rboResolve);
+ glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, 1, 1);
+
+ glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
+ rboResolve);
+ ASSERT_GL_FRAMEBUFFER_COMPLETE(GL_FRAMEBUFFER);
+
+ glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo);
+ glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fboResolve);
+ glBlitFramebuffer(0, 0, 1, 1, 0, 0, 1, 1, GL_COLOR_BUFFER_BIT, GL_NEAREST);
+ ASSERT_GL_NO_ERROR();
+
+ // Nothing was drawn because of zero coverage
+ glBindFramebuffer(GL_READ_FRAMEBUFFER, fboResolve);
+ EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
+ }
+
+ glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+
+ glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, rbo);
+ ASSERT_GL_FRAMEBUFFER_COMPLETE(GL_FRAMEBUFFER);
+
+ glClearColor(0, 0, 1, 1);
+ glClear(GL_COLOR_BUFFER_BIT);
+ EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::blue);
+
+ drawQuad(program, essl1_shaders::PositionAttrib(), 0.0);
+ ASSERT_GL_NO_ERROR();
+
+ // Sample coverage must have no effect
+ EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
+}
+
} // anonymous namespace
ANGLE_INSTANTIATE_TEST_ES2(StateChangeTest);
