Skip to content

A
angle
Commit fb8e1b25 by Shahbaz Youssefi Committed by Commit Bot
Options

Vulkan: Fix multisampled clear

UtilsVk::clearFramebuffer was not setting the sample count. Bug: angleproject:3204 Change-Id: Iab7d385ec58b12f21d888c5dfc9e94b7846ac40c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1616858Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarTim Van Patten <timvp@google.com> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
parent 01f98cbf
Showing with 20 additions and 2 deletions
src/libANGLE/renderer/vulkan/UtilsVk.cpp
...@@ -668,6 +668,7 @@ angle::Result UtilsVk::clearFramebuffer(ContextVk *contextVk, ...@@ -668,6 +668,7 @@ angle::Result UtilsVk::clearFramebuffer(ContextVk *contextVk,
pipelineDesc.initDefaults(); pipelineDesc.initDefaults();
pipelineDesc.setColorWriteMask(0, gl::DrawBufferMask()); pipelineDesc.setColorWriteMask(0, gl::DrawBufferMask());
pipelineDesc.setSingleColorWriteMask(params.colorAttachmentIndexGL, params.colorMaskFlags); pipelineDesc.setSingleColorWriteMask(params.colorAttachmentIndexGL, params.colorMaskFlags);
pipelineDesc.setRasterizationSamples(framebuffer->getSamples());
pipelineDesc.setRenderPassDesc(*params.renderPassDesc); pipelineDesc.setRenderPassDesc(*params.renderPassDesc);
// Note: depth test is disabled by default so this should be unnecessary, but works around an // Note: depth test is disabled by default so this should be unnecessary, but works around an
// Intel bug on windows. http://anglebug.com/3348 // Intel bug on windows. http://anglebug.com/3348
...@@ -776,6 +777,9 @@ angle::Result UtilsVk::copyImage(ContextVk *contextVk, ...@@ -776,6 +777,9 @@ angle::Result UtilsVk::copyImage(ContextVk *contextVk,
renderPassDesc.setSamples(dest->getSamples()); renderPassDesc.setSamples(dest->getSamples());
renderPassDesc.packColorAttachment(0, destFormat.angleFormatID); renderPassDesc.packColorAttachment(0, destFormat.angleFormatID);
// Multisampled copy is not yet supported.
ASSERT(src->getSamples() == 1 && dest->getSamples() == 1);
vk::GraphicsPipelineDesc pipelineDesc; vk::GraphicsPipelineDesc pipelineDesc;
pipelineDesc.initDefaults(); pipelineDesc.initDefaults();
pipelineDesc.setRenderPassDesc(renderPassDesc); pipelineDesc.setRenderPassDesc(renderPassDesc);
......
src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
...@@ -850,10 +850,15 @@ void GraphicsPipelineDesc::updateLineWidth(GraphicsPipelineTransitionBits *trans ...@@ -850,10 +850,15 @@ void GraphicsPipelineDesc::updateLineWidth(GraphicsPipelineTransitionBits *trans
transition->set(ANGLE_GET_TRANSITION_BIT(mRasterizationAndMultisampleStateInfo, lineWidth)); transition->set(ANGLE_GET_TRANSITION_BIT(mRasterizationAndMultisampleStateInfo, lineWidth));
} }
void GraphicsPipelineDesc::setRasterizationSamples(uint32_t rasterizationSamples)
{
mRasterizationAndMultisampleStateInfo.bits.rasterizationSamples = rasterizationSamples;
}
void GraphicsPipelineDesc::updateRasterizationSamples(GraphicsPipelineTransitionBits *transition, void GraphicsPipelineDesc::updateRasterizationSamples(GraphicsPipelineTransitionBits *transition,
uint32_t rasterizationSamples) uint32_t rasterizationSamples)
{ {
mRasterizationAndMultisampleStateInfo.bits.rasterizationSamples = rasterizationSamples; setRasterizationSamples(rasterizationSamples);
transition->set(ANGLE_GET_TRANSITION_BIT(mRasterizationAndMultisampleStateInfo, bits)); transition->set(ANGLE_GET_TRANSITION_BIT(mRasterizationAndMultisampleStateInfo, bits));
} }
......
src/libANGLE/renderer/vulkan/vk_cache_utils.h
...@@ -385,6 +385,7 @@ class GraphicsPipelineDesc final ...@@ -385,6 +385,7 @@ class GraphicsPipelineDesc final
void updateLineWidth(GraphicsPipelineTransitionBits *transition, float lineWidth); void updateLineWidth(GraphicsPipelineTransitionBits *transition, float lineWidth);
// Multisample states // Multisample states
void setRasterizationSamples(uint32_t rasterizationSamples);
void updateRasterizationSamples(GraphicsPipelineTransitionBits *transition, void updateRasterizationSamples(GraphicsPipelineTransitionBits *transition,
uint32_t rasterizationSamples); uint32_t rasterizationSamples);
void updateAlphaToCoverageEnable(GraphicsPipelineTransitionBits *transition, bool enable); void updateAlphaToCoverageEnable(GraphicsPipelineTransitionBits *transition, bool enable);
......
src/tests/deqp_support/deqp_gles2_test_expectations.txt
...@@ -321,6 +321,11 @@ ...@@ -321,6 +321,11 @@
3240 D3D11 : dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_repeat = FAIL 3240 D3D11 : dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_repeat = FAIL
3240 D3D11 : dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_mirror = FAIL 3240 D3D11 : dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_mirror = FAIL
// Vulkan multisampling bugs
3204 VULKAN : dEQP-GLES2.functional.multisample.sample_coverage_invert = FAIL
3204 VULKAN : dEQP-GLES2.functional.multisample.proportionality_sample_coverage = FAIL
3204 VULKAN : dEQP-GLES2.functional.multisample.proportionality_sample_coverage_inverted = FAIL
// Android Vulkan backend only failures // Android Vulkan backend only failures
2549 VULKAN ANDROID : dEQP-GLES2.functional.fragment_ops.depth_stencil.stencil* = SKIP 2549 VULKAN ANDROID : dEQP-GLES2.functional.fragment_ops.depth_stencil.stencil* = SKIP
......
src/tests/deqp_support/deqp_gles3_test_expectations.txt
...@@ -549,7 +549,10 @@ ...@@ -549,7 +549,10 @@
3204 VULKAN : dEQP-GLES3.functional.fbo.msaa.* = SKIP 3204 VULKAN : dEQP-GLES3.functional.fbo.msaa.* = SKIP
3204 VULKAN : dEQP-GLES3.functional.negative_api.buffer.read_pixels_fbo_format_mismatch = SKIP 3204 VULKAN : dEQP-GLES3.functional.negative_api.buffer.read_pixels_fbo_format_mismatch = SKIP
3204 VULKAN : dEQP-GLES3.functional.negative_api.buffer.blit_framebuffer_multisample = SKIP 3204 VULKAN : dEQP-GLES3.functional.negative_api.buffer.blit_framebuffer_multisample = SKIP
3204 VULKAN : dEQP-GLES3.functional.multisample.* = SKIP 3204 VULKAN : dEQP-GLES3.functional.multisample.default_framebuffer.sample_coverage_invert = FAIL
3204 VULKAN : dEQP-GLES3.functional.multisample.default_framebuffer.proportionality_sample_coverage = FAIL
3204 VULKAN : dEQP-GLES3.functional.multisample.default_framebuffer.proportionality_sample_coverage_inverted = FAIL
3204 VULKAN : dEQP-GLES3.functional.multisample.fbo* = SKIP
3204 VULKAN : dEQP-GLES3.functional.state_query.rbo.renderbuffer_samples = SKIP 3204 VULKAN : dEQP-GLES3.functional.state_query.rbo.renderbuffer_samples = SKIP
3204 VULKAN : dEQP-GLES3.functional.fragment_out.* = SKIP 3204 VULKAN : dEQP-GLES3.functional.fragment_out.* = SKIP
3204 VULKAN : dEQP-GLES3.functional.rasterization.fbo.rbo_multisample* = SKIP 3204 VULKAN : dEQP-GLES3.functional.rasterization.fbo.rbo_multisample* = SKIP
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment