Vulkan: Enable glBlitFramebuffer for EXT_sRGB_write_control

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

@@ -1125,6 +1125,9 @@ angle::Result FramebufferVk::blit(const gl::Context *context,
                                   (noFlip || !disableFlippingBlitWithCommand) &&
                                   HasSrcBlitFeature(renderer, readRenderTarget) &&
                                   (rotation == SurfaceRotation::Identity);
+        // If we need to reinterpret the colorspace then the blit must be done through a shader
+        bool reinterpretsColorspace =
+            mCurrentFramebufferDesc.getWriteControlMode() != gl::SrgbWriteControlMode::Default;
         bool areChannelsBlitCompatible = true;
         bool areFormatsIdentical       = true;
         for (size_t colorIndexGL : mState.getEnabledDrawBuffers())
@@ -1145,7 +1148,7 @@ angle::Result FramebufferVk::blit(const gl::Context *context,
         }
         AdjustBlitResolveParametersForPreRotation(rotation, srcFramebufferRotation, &params);
 
-        if (canBlitWithCommand && areChannelsBlitCompatible)
+        if (canBlitWithCommand && areChannelsBlitCompatible && !reinterpretsColorspace)
         {
             for (size_t colorIndexGL : mState.getEnabledDrawBuffers())
             {
@@ -1157,7 +1160,8 @@ angle::Result FramebufferVk::blit(const gl::Context *context,
         }
         // If we're not flipping or rotating, use Vulkan's builtin resolve.
         else if (isColorResolve && !flipX && !flipY && areChannelsBlitCompatible &&
-                 areFormatsIdentical && rotation == SurfaceRotation::Identity)
+                 areFormatsIdentical && rotation == SurfaceRotation::Identity &&
+                 !reinterpretsColorspace)
         {
             // Resolving with a subpass resolve attachment has a few restrictions:
             // 1.) glBlitFramebuffer() needs to copy the read color attachment to all enabled

src/libANGLE/renderer/vulkan/vk_caps_utils.cpp

@@ -453,11 +453,8 @@ void RendererVk::ensureCapsInitialized() const
         vk::GetTextureSRGBOverrideSupport(this, mNativeExtensions);
     mNativeExtensions.textureSRGBDecode = vk::GetTextureSRGBDecodeSupport(this);
 
-    // Doesn't yet support glBlitFramebuffer
-    // http://anglebug.com/5075
-    // Will be fully enabled in a follow up change when issues with glBlitFramebuffer have been
-    // resolved
-    mNativeExtensions.sRGBWriteControl = false;
+    // EXT_srgb_write_control requires image_format_list
+    mNativeExtensions.sRGBWriteControl = getFeatures().supportsImageFormatList.enabled;
 
     // Vulkan natively supports io interface block.
     mNativeExtensions.shaderIoBlocksOES = true;

src/tests/gl_tests/SRGBFramebufferTest.cpp

@@ -46,6 +46,9 @@ class SRGBFramebufferTest : public ANGLETest
     GLint mColorLocation = -1;
 };
 
+class SRGBFramebufferTestES3 : public SRGBFramebufferTest
+{};
+
 // Test basic validation of GL_EXT_sRGB_write_control
 TEST_P(SRGBFramebufferTest, Validation)
 {
@@ -237,8 +240,70 @@ TEST_P(SRGBFramebufferTest, NegativeLifetimeTracking)
     EXPECT_GL_ERROR(GL_INVALID_FRAMEBUFFER_OPERATION);
 }
 
+// Test that glBlitFramebuffer correctly converts colorspaces
+TEST_P(SRGBFramebufferTestES3, BlitFramebuffer)
+{
+    // http://anglebug.com/5790
+    ANGLE_SKIP_TEST_IF(!IsVulkan());
+
+    if (!IsGLExtensionEnabled("GL_EXT_sRGB_write_control") ||
+        (!IsGLExtensionEnabled("GL_EXT_sRGB") && getClientMajorVersion() < 3))
+    {
+        std::cout
+            << "Test skipped because GL_EXT_sRGB_write_control and GL_EXT_sRGB are not available."
+            << std::endl;
+        return;
+    }
+
+    GLTexture dstTexture;
+    glBindTexture(GL_TEXTURE_2D, dstTexture.get());
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB_ALPHA_EXT, 1, 1, 0, GL_SRGB_ALPHA_EXT, GL_UNSIGNED_BYTE,
+                 nullptr);
+    GLFramebuffer dstFramebuffer;
+    glBindFramebuffer(GL_FRAMEBUFFER, dstFramebuffer.get());
+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, dstTexture.get(),
+                           0);
+
+    GLTexture srcTexture;
+    glBindTexture(GL_TEXTURE_2D, srcTexture.get());
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB_ALPHA_EXT, 1, 1, 0, GL_SRGB_ALPHA_EXT, GL_UNSIGNED_BYTE,
+                 nullptr);
+
+    GLFramebuffer srcFramebuffer;
+    glBindFramebuffer(GL_FRAMEBUFFER, srcFramebuffer.get());
+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, srcTexture.get(),
+                           0);
+
+    glUseProgram(mProgram);
+    glUniform4fv(mColorLocation, 1, srgbColor.toNormalizedVector().data());
+
+    // Draw onto the framebuffer normally
+    glEnable(GL_FRAMEBUFFER_SRGB_EXT);
+    drawQuad(mProgram, essl1_shaders::PositionAttrib(), 0.5f);
+    EXPECT_PIXEL_COLOR_NEAR(0, 0, linearColor, 1.0);
+
+    // Blit the framebuffer normally
+    glEnable(GL_FRAMEBUFFER_SRGB_EXT);
+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, dstFramebuffer);
+    glBindFramebuffer(GL_READ_FRAMEBUFFER, srcFramebuffer);
+    glBlitFramebuffer(0, 0, 1, 1, 0, 0, 1, 1, GL_COLOR_BUFFER_BIT, GL_NEAREST);
+
+    glBindFramebuffer(GL_FRAMEBUFFER, dstFramebuffer);
+    EXPECT_PIXEL_COLOR_NEAR(0, 0, linearColor, 1.0);
+
+    // Blit the framebuffer with forced linear colorspace
+    glDisable(GL_FRAMEBUFFER_SRGB_EXT);
+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, dstFramebuffer);
+    glBindFramebuffer(GL_READ_FRAMEBUFFER, srcFramebuffer);
+    glBlitFramebuffer(0, 0, 1, 1, 0, 0, 1, 1, GL_COLOR_BUFFER_BIT, GL_NEAREST);
+
+    glBindFramebuffer(GL_FRAMEBUFFER, dstFramebuffer);
+    EXPECT_PIXEL_COLOR_NEAR(0, 0, srgbColor, 1.0);
+}
+
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these
 // tests should be run against.
 ANGLE_INSTANTIATE_TEST_ES2_AND_ES3(SRGBFramebufferTest);
+ANGLE_INSTANTIATE_TEST_ES3(SRGBFramebufferTestES3);
 
 }  // namespace angle