IGL: Remove helper functions from TextureFormat.h

Summary:
This diff removes two helper functions from TextureFormat.h. Each is only used in one place.

isTextureFormatBGR is inaccurately named as it only checks for two of the five supported BGR formats. It is be replaced with its implementation.

isTextureFormatsRGB is also a less functional version of checking isSRGB() on the format's properties so this call is replaced with using the texture format properties.

Reviewed By: KyleFung

Differential Revision: D49699222

fbshipit-source-id: af8811b765b999059621df3b5bccf7c1cf6c746e

shell/mac/ViewController.mm

@@ -252,10 +252,15 @@ - (void)loadView {
     // vulkanView.wantsLayer =
     // YES; // Back the view with a layer created by the makeBackingLayer method.
 
-    igl::vulkan::VulkanContextConfig vulkanContextConfig{
-        true, // terminateOnValidationError
-        false // enhancedShaderDebugging
-    };
+    const auto properties =
+        igl::TextureFormatProperties::fromTextureFormat(shellParams_.defaultColorFramebufferFormat);
+
+    igl::vulkan::VulkanContextConfig vulkanContextConfig;
+    vulkanContextConfig.terminateOnValidationError = true;
+    vulkanContextConfig.enhancedShaderDebugging = false;
+    vulkanContextConfig.swapChainColorSpace = properties.isSRGB() ? igl::ColorSpace::SRGB_NONLINEAR
+                                                                  : igl::ColorSpace::SRGB_LINEAR;
+
     auto context =
         igl::vulkan::HWDevice::createContext(vulkanContextConfig, (__bridge void*)vulkanView);
     auto devices = igl::vulkan::HWDevice::queryDevices(
@@ -264,12 +269,7 @@ - (void)loadView {
       devices = igl::vulkan::HWDevice::queryDevices(
           *context.get(), igl::HWDeviceQueryDesc(igl::HWDeviceType::IntegratedGpu), nullptr);
     }
-    auto device = igl::vulkan::HWDevice::create(
-        std::move(context),
-        devices[0],
-        0,
-        0,
-        !igl::isTextureFormatsRGB(shellParams_.defaultColorFramebufferFormat));
+    auto device = igl::vulkan::HWDevice::create(std::move(context), devices[0], 0, 0);
 
     shellPlatform_ = std::make_shared<igl::shell::PlatformMac>(std::move(device));
     [vulkanView prepareVulkan:shellPlatform_];

src/igl/TextureFormat.h

@@ -205,12 +205,4 @@ enum class TextureFormat : uint8_t {
                      // account for this!
   S_UInt8
 };
-
-constexpr bool isTextureFormatsRGB(TextureFormat textureFormat) {
-  return textureFormat == TextureFormat::RGBA_SRGB || textureFormat == TextureFormat::BGRA_SRGB;
-}
-
-constexpr bool isTextureFormatBGR(TextureFormat textureFormat) {
-  return textureFormat == TextureFormat::BGRA_SRGB || textureFormat == TextureFormat::BGRA_UNorm8;
-}
 } // namespace igl

src/igl/metal/Texture.mm

@@ -149,7 +149,7 @@ void bgrToRgb(unsigned char* dstImg, size_t width, size_t height, size_t bytesPe
   igl::TextureFormat f = getFormat();
   TextureFormatProperties props = TextureFormatProperties::fromTextureFormat(f);
   auto bytesPerPixel = props.bytesPerBlock;
-  if (isTextureFormatBGR(f)) {
+  if (f == TextureFormat::BGRA_SRGB || f == TextureFormat::BGRA_UNorm8) {
     bgrToRgb(static_cast<unsigned char*>(outData), range.width, range.height, bytesPerPixel);
   }
   return Result(Result::Code::Ok);