Update glColorspace(EGL_KHR_gl_colorspace) enable logic

1. Enable glColorspace if VK_EXT_swapchain_colorspace is supported, remove dependency on VK_KHR_image_format_list. 2. Enable VK_KHR_image_format_list support on Mali GPU. 3. Fix PbufferTest.ClearAndBindTexImageSrgbSkipDecode test tolerance issue. Bug: angleproject:2514 Bug: angleproject:5281 Change-Id: I2ed54a14afc7c3aee5a5980bd300ab052ebab3d1 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2793852 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>

Update glColorspace(EGL_KHR_gl_colorspace) enable logic
96dd515a · Xiaoxuan Liu · Angle LUCI CQ · 9adf692c · 96dd515a · 96dd515a
Commit 96dd515a authored Mar 31, 2021 by Xiaoxuan Liu Committed by Angle LUCI CQ Jun 22, 2021
Showing with 6 additions and 7 deletions

DisplayVk.cpp src/libANGLE/renderer/vulkan/DisplayVk.cpp +1 -3

RendererVk.cpp src/libANGLE/renderer/vulkan/RendererVk.cpp +2 -1

PbufferTest.cpp src/tests/gl_tests/PbufferTest.cpp +3 -3

No files found.
--- a/src/libANGLE/renderer/vulkan/DisplayVk.cpp
+++ b/src/libANGLE/renderer/vulkan/DisplayVk.cpp
@@ -221,9 +221,7 @@ void DisplayVk::generateExtensions(egl::DisplayExtensions *outExtensions) const
    outExtensions->imageNativeBuffer =
        getRenderer()->getFeatures().supportsAndroidHardwareBuffer.enabled;
    outExtensions->surfacelessContext = true;
-    outExtensions->glColorspace =
-        getRenderer()->getFeatures().supportsSwapchainColorspace.enabled &&
-        getRenderer()->getFeatures().supportsImageFormatList.enabled;
+    outExtensions->glColorspace = getRenderer()->getFeatures().supportsSwapchainColorspace.enabled;
    outExtensions->imageGlColorspace =
        outExtensions->glColorspace && getRenderer()->getFeatures().supportsImageFormatList.enabled;


--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -2411,7 +2411,8 @@ void RendererVk::initFeatures(DisplayVk *displayVk,

    ANGLE_FEATURE_CONDITION(
        &mFeatures, supportsImageFormatList,
-        (ExtensionFound(VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME, deviceExtensionNames)) && isAMD);
+        (ExtensionFound(VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME, deviceExtensionNames)) &&
+            (isAMD || isARM));

    // Feature disabled due to driver bugs:
    //

--- a/src/tests/gl_tests/PbufferTest.cpp
+++ b/src/tests/gl_tests/PbufferTest.cpp
@@ -368,9 +368,9 @@ TEST_P(PbufferTest, ClearAndBindTexImageSrgbSkipDecode)
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT);
    drawQuad(mTextureProgram, "position", 0.5f);

-    // Texture is in skip decode mode, expect glReadPixels to be `kSrgbColor`
-    EXPECT_PIXEL_EQ(getWindowWidth() / 2, getWindowHeight() / 2, kSrgbColor[0], kSrgbColor[1],
-                    kSrgbColor[2], kSrgbColor[3]);
+    // Texture is in skip decode mode, expect glReadPixels to be `kSrgbColor` with tolerance of 1
+    EXPECT_PIXEL_NEAR(getWindowWidth() / 2, getWindowHeight() / 2, kSrgbColor[0], kSrgbColor[1],
+                      kSrgbColor[2], kSrgbColor[3], 1);

    // Unbind the texture
    eglReleaseTexImage(window->getDisplay(), mPbuffer, EGL_BACK_BUFFER);