commit 110ac03afd99feb2b438d6bd496667f28590279c
author Jamie Madill <jmadill@chromium.org> Tue Nov 23 09:36:08 2021 -0500
committer Angle LUCI CQ <angle-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Nov 24 23:23:32 2021 +0000
tree f278a25187863deb722bc1ed1a6ad21a9df0c450
parent 2fa1adf000f65f87242a547cc03fd5aaeaba57bf

Vulkan: Revert change to sRGB override support.

An accidental testing change slipped into a fix for base/max level
updates. This reverts the unintended change.

Bug: angleproject:6728
Change-Id: I61e371149be590ce506cfc88165c4391538e54b3
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3298428
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/vulkan/vk_caps_utils.cpp

diff --git a/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp b/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
index 32f68de..f1b5fc8 100644
--- a/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
@@ -102,8 +102,8 @@
     return true;
 }
 
-ANGLE_MAYBE_UNUSED bool GetTextureSRGBOverrideSupport(const RendererVk *rendererVk,
-                                                      const gl::Extensions &supportedExtensions)
+bool GetTextureSRGBOverrideSupport(const RendererVk *rendererVk,
+                                   const gl::Extensions &supportedExtensions)
 {
     static constexpr bool kNonLinearColorspace = false;
 
@@ -487,8 +487,8 @@
 
     // Vulkan natively supports format reinterpretation, but we still require support for all
     // formats we may reinterpret to
-    mNativeExtensions.textureFormatSRGBOverrideEXT = true;
-    //    vk::GetTextureSRGBOverrideSupport(this, mNativeExtensions);
+    mNativeExtensions.textureFormatSRGBOverrideEXT =
+        vk::GetTextureSRGBOverrideSupport(this, mNativeExtensions);
     mNativeExtensions.textureSRGBDecodeEXT = vk::GetTextureSRGBDecodeSupport(this);
 
     // EXT_srgb_write_control requires image_format_list