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
diff --git a/libs/renderengine/skia/SkiaGLRenderEngine.cpp b/libs/renderengine/skia/SkiaGLRenderEngine.cpp
index cb80ef4..c7356ea 100644
--- a/libs/renderengine/skia/SkiaGLRenderEngine.cpp
+++ b/libs/renderengine/skia/SkiaGLRenderEngine.cpp
@@ -618,9 +618,9 @@
if (requiresLinearEffect) {
const ui::Dataspace inputDataspace =
- mUseColorManagement ? layer->sourceDataspace : ui::Dataspace::UNKNOWN;
+ mUseColorManagement ? layer->sourceDataspace : ui::Dataspace::V0_SRGB_LINEAR;
const ui::Dataspace outputDataspace =
- mUseColorManagement ? display.outputDataspace : ui::Dataspace::UNKNOWN;
+ mUseColorManagement ? display.outputDataspace : ui::Dataspace::V0_SRGB_LINEAR;
LinearEffect effect = LinearEffect{.inputDataspace = inputDataspace,
.outputDataspace = outputDataspace,
@@ -762,7 +762,7 @@
}
const ui::Dataspace dstDataspace =
- mUseColorManagement ? display.outputDataspace : ui::Dataspace::UNKNOWN;
+ mUseColorManagement ? display.outputDataspace : ui::Dataspace::V0_SRGB_LINEAR;
sk_sp<SkSurface> dstSurface = surfaceTextureRef->getOrCreateSurface(dstDataspace, grContext);
SkCanvas* dstCanvas = mCapture->tryCapture(dstSurface.get());