diff options
| author | 2021-06-29 16:57:32 +0000 | |
|---|---|---|
| committer | 2021-06-29 16:57:32 +0000 | |
| commit | 4019c52f68e694278e1f5833a45a04137af3780c (patch) | |
| tree | 0fda396c0be3dec033a7474a32abf10557605bbc | |
| parent | caf9f1b67e899ffc89740d173c4bf2fe50203f63 (diff) | |
| parent | d2bcbaeba454a9f7c7fc9162c3ed04078c1e566f (diff) | |
Merge "Fix color shift between gles and skiagl without color management" into sc-dev
| -rw-r--r-- | libs/renderengine/skia/SkiaGLRenderEngine.cpp | 6 | ||||
| -rw-r--r-- | libs/renderengine/tests/RenderEngineTest.cpp | 13 |
2 files changed, 8 insertions, 11 deletions
diff --git a/libs/renderengine/skia/SkiaGLRenderEngine.cpp b/libs/renderengine/skia/SkiaGLRenderEngine.cpp index cb80ef4ada..c7356ea728 100644 --- a/libs/renderengine/skia/SkiaGLRenderEngine.cpp +++ b/libs/renderengine/skia/SkiaGLRenderEngine.cpp @@ -618,9 +618,9 @@ sk_sp<SkShader> SkiaGLRenderEngine::createRuntimeEffectShader( 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 @@ status_t SkiaGLRenderEngine::drawLayers(const DisplaySettings& display, } 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()); diff --git a/libs/renderengine/tests/RenderEngineTest.cpp b/libs/renderengine/tests/RenderEngineTest.cpp index e2587419d2..33e3773d50 100644 --- a/libs/renderengine/tests/RenderEngineTest.cpp +++ b/libs/renderengine/tests/RenderEngineTest.cpp @@ -81,6 +81,7 @@ public: .setSupportsBackgroundBlur(true) .setContextPriority(renderengine::RenderEngine::ContextPriority::MEDIUM) .setRenderEngineType(type()) + .setUseColorManagerment(useColorManagement()) .build(); return renderengine::gl::GLESRenderEngine::create(reCreationArgs); } @@ -110,7 +111,7 @@ public: .setSupportsBackgroundBlur(true) .setContextPriority(renderengine::RenderEngine::ContextPriority::MEDIUM) .setRenderEngineType(type()) - .setUseColorManagerment(true) + .setUseColorManagerment(useColorManagement()) .build(); return renderengine::gl::GLESRenderEngine::create(reCreationArgs); } @@ -136,16 +137,12 @@ public: .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 @@ public: .setSupportsBackgroundBlur(true) .setContextPriority(renderengine::RenderEngine::ContextPriority::MEDIUM) .setRenderEngineType(type()) - .setUseColorManagerment(true) + .setUseColorManagerment(useColorManagement()) .build(); return renderengine::skia::SkiaGLRenderEngine::create(reCreationArgs); } |