commit d2bcbaeba454a9f7c7fc9162c3ed04078c1e566f
author Alec Mouri <alecmouri@google.com> Mon Jun 28 17:02:17 2021 -0700
committer Alec Mouri <alecmouri@google.com> Mon Jun 28 17:16:02 2021 -0700
tree 9090050f5b14844e144476227d9e7634db22e630
parent 076276f7b8b5e0501a9f96e564d655020128dc31

Fix color shift between gles and skiagl without color management

Legacy GLESRenderEngine treated all dataspaces as having BT.709
primaries with a linear transfer function when color management was not
supported. SkiaGLRenderEngine had a behavior change when color
management was not supported where if there needed to be a LinearEffect
applied due to applying a color transform in linear space, then transfer
function for the layer was tagged as UNKNOWN, which is treated as sRGB.

To solve this, when color management is not used then reinterpret all
dataspaces as V0_SRGB_LINEAR, which emulates the behavior for legacy
GLESRenderEngine so that devices that are not color managed will not
exhibit a behavior change when switching to the skia backend.

Bug: 189935602
Test: librenderengine_test
Change-Id: Ie64783391befc13b9aff804f799c3c3d1dbbff83

libs/renderengine/tests/RenderEngineTest.cpp

diff --git a/libs/renderengine/tests/RenderEngineTest.cpp b/libs/renderengine/tests/RenderEngineTest.cpp
index e258741..33e3773 100644
--- a/libs/renderengine/tests/RenderEngineTest.cpp
+++ b/libs/renderengine/tests/RenderEngineTest.cpp
@@ -81,6 +81,7 @@
                         .setSupportsBackgroundBlur(true)
                         .setContextPriority(renderengine::RenderEngine::ContextPriority::MEDIUM)
                         .setRenderEngineType(type())
+                        .setUseColorManagerment(useColorManagement())
                         .build();
         return renderengine::gl::GLESRenderEngine::create(reCreationArgs);
     }
@@ -110,7 +111,7 @@
                         .setSupportsBackgroundBlur(true)
                         .setContextPriority(renderengine::RenderEngine::ContextPriority::MEDIUM)
                         .setRenderEngineType(type())
-                        .setUseColorManagerment(true)
+                        .setUseColorManagerment(useColorManagement())
                         .build();
         return renderengine::gl::GLESRenderEngine::create(reCreationArgs);
     }
@@ -136,16 +137,12 @@
                         .setSupportsBackgroundBlur(true)
                         .setContextPriority(renderengine::RenderEngine::ContextPriority::MEDIUM)
                         .setRenderEngineType(type())
-                        // FIXME (b/189935602): This version is currently color managed.
-                        // We should change it and fix the tests that fail.
-                        //.setUseColorManagerment(false)
+                        .setUseColorManagerment(useColorManagement())
                         .build();
         return renderengine::skia::SkiaGLRenderEngine::create(reCreationArgs);
     }
 
-    // FIXME (b/189935602): This version is currently color managed.
-    // We should change it and fix the tests that fail.
-    bool useColorManagement() const override { return true; }
+    bool useColorManagement() const override { return false; }
 };
 
 class SkiaGLESCMRenderEngineFactory : public RenderEngineFactory {
@@ -166,7 +163,7 @@
                         .setSupportsBackgroundBlur(true)
                         .setContextPriority(renderengine::RenderEngine::ContextPriority::MEDIUM)
                         .setRenderEngineType(type())
-                        .setUseColorManagerment(true)
+                        .setUseColorManagerment(useColorManagement())
                         .build();
         return renderengine::skia::SkiaGLRenderEngine::create(reCreationArgs);
     }