Vulkan: Support the single-sampled targets

src/compiler/translator/TranslatorVulkan.cpp

@@ -941,9 +941,13 @@ bool TranslatorVulkan::translateImpl(TIntermBlock *root,
             return false;
         }
 
-        if (hasGLSampleMask && !RewriteSampleMask(this, root, &getSymbolTable()))
+        if (hasGLSampleMask)
         {
-            return false;
+            TIntermBinary *numSamples = driverUniforms->getNumSamplesRef();
+            if (!RewriteSampleMask(this, root, &getSymbolTable(), numSamples))
+            {
+                return false;
+            }
         }
 
         {

src/compiler/translator/tree_util/RewriteSampleMaskVariable.cpp

@@ -24,6 +24,7 @@ namespace sh
 namespace
 {
 constexpr int kMaxIndexForSampleMaskVar = 0;
+constexpr int kFullSampleMask           = 0xFFFFFFFF;
 
 // Traverse the tree and collect the redeclaration and replace all non constant index references of
 // gl_SampleMask or gl_SampleMaskIn with constant index references
@@ -102,7 +103,8 @@ class GLSampleMaskRelatedReferenceTraverser : public TIntermTraverser
 
 ANGLE_NO_DISCARD bool RewriteSampleMask(TCompiler *compiler,
                                         TIntermBlock *root,
-                                        TSymbolTable *symbolTable)
+                                        TSymbolTable *symbolTable,
+                                        const TIntermTyped *numSamplesUniform)
 {
     const TIntermSymbol *redeclaredGLSampleMask = nullptr;
     GLSampleMaskRelatedReferenceTraverser indexTraverser(&redeclaredGLSampleMask,
@@ -137,7 +139,28 @@ ANGLE_NO_DISCARD bool RewriteSampleMask(TCompiler *compiler,
     const unsigned int arraySizeOfSampleMask = glSampleMaskVar->getType().getOutermostArraySize();
     ASSERT(arraySizeOfSampleMask == 1);
 
-    return true;
+    TIntermSymbol *glSampleMaskSymbol = new TIntermSymbol(glSampleMaskVar);
+
+    // if (ANGLEUniforms.numSamples == 1)
+    // {
+    //     gl_SampleMask[0] = int(0xFFFFFFFF);
+    // }
+    TIntermConstantUnion *singleSampleCount = CreateUIntNode(1);
+    TIntermBinary *equalTo =
+        new TIntermBinary(EOpEqual, numSamplesUniform->deepCopy(), singleSampleCount);
+
+    TIntermBlock *trueBlock = new TIntermBlock();
+
+    TIntermBinary *sampleMaskVar = new TIntermBinary(EOpIndexDirect, glSampleMaskSymbol->deepCopy(),
+                                                     CreateIndexNode(kMaxIndexForSampleMaskVar));
+    TIntermConstantUnion *fullSampleMask = CreateIndexNode(kFullSampleMask);
+    TIntermBinary *assignment = new TIntermBinary(EOpAssign, sampleMaskVar, fullSampleMask);
+
+    trueBlock->appendStatement(assignment);
+
+    TIntermIfElse *multiSampleOrNot = new TIntermIfElse(equalTo, trueBlock, nullptr);
+
+    return RunAtTheEndOfShader(compiler, root, multiSampleOrNot, symbolTable);
 }
 
 ANGLE_NO_DISCARD bool RewriteSampleMaskIn(TCompiler *compiler,

src/compiler/translator/tree_util/RewriteSampleMaskVariable.h

@@ -26,7 +26,8 @@ class TIntermTyped;
 // array problem.
 ANGLE_NO_DISCARD bool RewriteSampleMask(TCompiler *compiler,
                                         TIntermBlock *root,
-                                        TSymbolTable *symbolTable);
+                                        TSymbolTable *symbolTable,
+                                        const TIntermTyped *numSamplesUniform);
 
 ANGLE_NO_DISCARD bool RewriteSampleMaskIn(TCompiler *compiler,
                                           TIntermBlock *root,

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -2502,19 +2502,24 @@ void ContextVk::updateColorMasks(const gl::BlendStateExt &blendStateExt)
                                                  framebufferVk->getState().getEnabledDrawBuffers());
 }
 
-void ContextVk::updateSampleMask(const gl::State &glState)
+void ContextVk::updateSampleMaskWithRasterizationSamples(const uint32_t rasterizationSamples)
 {
+    // FramebufferVk::syncState could have been the origin for this call, at which point the
+    // draw FBO may have changed, retrieve the latest draw FBO.
+    FramebufferVk *drawFramebuffer = vk::GetImpl(mState.getDrawFramebuffer());
+
     // If sample coverage is enabled, emulate it by generating and applying a mask on top of the
     // sample mask.
-    uint32_t coverageSampleCount = GetCoverageSampleCount(glState, mDrawFramebuffer);
+    uint32_t coverageSampleCount = GetCoverageSampleCount(mState, drawFramebuffer);
 
     static_assert(sizeof(uint32_t) == sizeof(GLbitfield), "Vulkan assumes 32-bit sample masks");
-    for (uint32_t maskNumber = 0; maskNumber < glState.getMaxSampleMaskWords(); ++maskNumber)
+    for (uint32_t maskNumber = 0; maskNumber < mState.getMaxSampleMaskWords(); ++maskNumber)
     {
-        uint32_t mask = glState.isSampleMaskEnabled() ? glState.getSampleMaskWord(maskNumber)
-                                                      : std::numeric_limits<uint32_t>::max();
+        uint32_t mask = mState.isSampleMaskEnabled() && rasterizationSamples > 1
+                            ? mState.getSampleMaskWord(maskNumber)
+                            : std::numeric_limits<uint32_t>::max();
 
-        ApplySampleCoverage(glState, coverageSampleCount, maskNumber, &mask);
+        ApplySampleCoverage(mState, coverageSampleCount, maskNumber, &mask);
 
         mGraphicsPipelineDesc->updateSampleMask(&mGraphicsPipelineTransition, maskNumber, mask);
     }
@@ -2615,6 +2620,27 @@ void ContextVk::updateScissor(const gl::State &glState)
     }
 }
 
+// If the target is a single-sampled target, sampleShading should be disabled, to use Bresenham line
+// raterization feature.
+void ContextVk::updateSampleShadingWithRasterizationSamples(const uint32_t rasterizationSamples)
+{
+    bool sampleShadingEnable =
+        (rasterizationSamples <= 1 ? false : mState.isSampleShadingEnabled());
+
+    mGraphicsPipelineDesc->updateSampleShading(&mGraphicsPipelineTransition, sampleShadingEnable,
+                                               mState.getMinSampleShading());
+}
+
+// If the target is switched between a single-sampled and multisample, the dependency related to the
+// rasterization sample should be updated.
+void ContextVk::updateRasterizationSamples(const uint32_t rasterizationSamples)
+{
+    mGraphicsPipelineDesc->updateRasterizationSamples(&mGraphicsPipelineTransition,
+                                                      rasterizationSamples);
+    updateSampleShadingWithRasterizationSamples(rasterizationSamples);
+    updateSampleMaskWithRasterizationSamples(rasterizationSamples);
+}
+
 void ContextVk::invalidateProgramBindingHelper(const gl::State &glState)
 {
     mProgram         = nullptr;
@@ -2736,16 +2762,16 @@ angle::Result ContextVk::syncState(const gl::Context *context,
                 iter.setLaterBit(gl::State::DIRTY_BIT_PROGRAM_EXECUTABLE);
                 break;
             case gl::State::DIRTY_BIT_SAMPLE_COVERAGE_ENABLED:
-                updateSampleMask(glState);
+                updateSampleMaskWithRasterizationSamples(mDrawFramebuffer->getSamples());
                 break;
             case gl::State::DIRTY_BIT_SAMPLE_COVERAGE:
-                updateSampleMask(glState);
+                updateSampleMaskWithRasterizationSamples(mDrawFramebuffer->getSamples());
                 break;
             case gl::State::DIRTY_BIT_SAMPLE_MASK_ENABLED:
-                updateSampleMask(glState);
+                updateSampleMaskWithRasterizationSamples(mDrawFramebuffer->getSamples());
                 break;
             case gl::State::DIRTY_BIT_SAMPLE_MASK:
-                updateSampleMask(glState);
+                updateSampleMaskWithRasterizationSamples(mDrawFramebuffer->getSamples());
                 break;
             case gl::State::DIRTY_BIT_DEPTH_TEST_ENABLED:
             {
@@ -2884,9 +2910,7 @@ angle::Result ContextVk::syncState(const gl::Context *context,
                 updateViewport(mDrawFramebuffer, glState.getViewport(), glState.getNearPlane(),
                                glState.getFarPlane(), isViewportFlipEnabledForDrawFBO());
                 updateColorMasks(glState.getBlendStateExt());
-                updateSampleMask(glState);
-                mGraphicsPipelineDesc->updateRasterizationSamples(&mGraphicsPipelineTransition,
-                                                                  mDrawFramebuffer->getSamples());
+                updateRasterizationSamples(mDrawFramebuffer->getSamples());
                 mGraphicsPipelineDesc->updateFrontFace(&mGraphicsPipelineTransition,
                                                        glState.getRasterizerState(),
                                                        isViewportFlipEnabledForDrawFBO());
@@ -2972,9 +2996,7 @@ angle::Result ContextVk::syncState(const gl::Context *context,
                                                               glState.isSampleAlphaToOneEnabled());
                 break;
             case gl::State::DIRTY_BIT_SAMPLE_SHADING:
-                mGraphicsPipelineDesc->updateSampleShading(&mGraphicsPipelineTransition,
-                                                           glState.isSampleShadingEnabled(),
-                                                           glState.getMinSampleShading());
+                updateSampleShadingWithRasterizationSamples(mDrawFramebuffer->getSamples());
                 break;
             case gl::State::DIRTY_BIT_COVERAGE_MODULATION:
                 break;
@@ -3309,8 +3331,7 @@ void ContextVk::onFramebufferChange(FramebufferVk *framebufferVk)
     if (mGraphicsPipelineDesc->getRasterizationSamples() !=
         static_cast<uint32_t>(framebufferVk->getSamples()))
     {
-        mGraphicsPipelineDesc->updateRasterizationSamples(&mGraphicsPipelineTransition,
-                                                          framebufferVk->getSamples());
+        updateRasterizationSamples(framebufferVk->getSamples());
     }
 
     // Update scissor.

src/libANGLE/renderer/vulkan/ContextVk.h

@@ -338,7 +338,7 @@ class ContextVk : public ContextImpl, public vk::Context
                                        gl::TextureType type,
                                        gl::Texture **textureOut);
     void updateColorMasks(const gl::BlendStateExt &blendStateExt);
-    void updateSampleMask(const gl::State &glState);
+    void updateSampleMaskWithRasterizationSamples(const uint32_t rasterizationSamples);
 
     void handleError(VkResult errorCode,
                      const char *file,
@@ -858,6 +858,9 @@ class ContextVk : public ContextImpl, public vk::Context
 
     void outputCumulativePerfCounters();
 
+    void updateSampleShadingWithRasterizationSamples(const uint32_t rasterizationSamples);
+    void updateRasterizationSamples(const uint32_t rasterizationSamples);
+
     std::array<DirtyBitHandler, DIRTY_BIT_MAX> mGraphicsDirtyBitHandlers;
     std::array<DirtyBitHandler, DIRTY_BIT_MAX> mComputeDirtyBitHandlers;
 

src/tests/deqp_support/deqp_gles31_rotate_test_expectations.txt

@@ -11,11 +11,3 @@
 3589 VULKAN : dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_offset.centroid_qualifier.default_framebuffer = FAIL
 3589 VULKAN : dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_offset.sample_qualifier.default_framebuffer = FAIL
 3589 VULKAN : dEQP-GLES31.functional.shaders.multisample_interpolation.interpolate_at_offset.array_element.default_framebuffer = FAIL
-
-// Cannot ignore multisampling-related operations when the target is a single-sampled target:
-3588 VULKAN : dEQP-GLES31.functional.shaders.sample_variables.sample_mask.discard_half_per_*.default_framebuffer = FAIL
-3588 VULKAN : dEQP-GLES31.functional.shaders.sample_variables.sample_mask.inverse_per_*.default_framebuffer = FAIL
-
-// Cannot ignore SampleShadingEnable when the target is a single-sampled target:
-3588 VULKAN : dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bit_count_per_two_samples.default_framebuffer = FAIL
-3588 VULKAN : dEQP-GLES31.functional.shaders.sample_variables.sample_pos.correctness.default_framebuffer = FAIL
\ No newline at end of file

src/tests/deqp_support/deqp_gles31_test_expectations.txt

@@ -186,26 +186,6 @@
 // Cannot create 2D (array) view of 3D texture.
 3886 VULKAN : dEQP-GLES31.functional.image_load_store.3d.*layer = FAIL
 
-// Cannot ignore multisampling-related operations when the target is a single-sampled target:
-3588 VULKAN : dEQP-GLES31.functional.shaders.sample_variables.sample_mask.discard_half_per_*.default_framebuffer = FAIL
-3588 VULKAN : dEQP-GLES31.functional.shaders.sample_variables.sample_mask.discard_half_per_*.singlesample_texture = FAIL
-3588 VULKAN : dEQP-GLES31.functional.shaders.sample_variables.sample_mask.discard_half_per_*.singlesample_rbo = FAIL
-3588 VULKAN : dEQP-GLES31.functional.shaders.sample_variables.sample_mask.inverse_per_*.default_framebuffer = FAIL
-3588 VULKAN : dEQP-GLES31.functional.shaders.sample_variables.sample_mask.inverse_per_*.singlesample_texture = FAIL
-3588 VULKAN : dEQP-GLES31.functional.shaders.sample_variables.sample_mask.inverse_per_*.singlesample_rbo = FAIL
-
-// Cannot ignore SampleShadingEnable when the target is a single-sampled target:
-3588 VULKAN : dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bit_count_per_two_samples.default_framebuffer = FAIL
-3588 VULKAN : dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bit_count_per_two_samples.singlesample_texture = FAIL
-3588 VULKAN : dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bit_count_per_two_samples.singlesample_rbo = FAIL
-3588 VULKAN : dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bits_unique_per_two_samples.singlesample_texture = FAIL
-3588 VULKAN : dEQP-GLES31.functional.shaders.sample_variables.sample_mask.*_per_two_samples.default_framebuffer = FAIL
-3588 VULKAN : dEQP-GLES31.functional.shaders.sample_variables.sample_mask.*_per_two_samples.singlesample_texture = FAIL
-3588 VULKAN : dEQP-GLES31.functional.shaders.sample_variables.sample_mask.*_per_two_samples.singlesample_rbo = FAIL
-3588 VULKAN : dEQP-GLES31.functional.shaders.sample_variables.sample_pos.correctness.default_framebuffer = FAIL
-3588 VULKAN : dEQP-GLES31.functional.shaders.sample_variables.sample_pos.correctness.singlesample_texture = FAIL
-3588 VULKAN : dEQP-GLES31.functional.shaders.sample_variables.sample_pos.correctness.singlesample_rbo = FAIL
-
 ////
 //// AMD Vulkan expectations
 ////