From 32a41abac3d28363398f873e6d6720908cce6508 Mon Sep 17 00:00:00 2001 From: Alec Mouri Date: Tue, 15 Aug 2023 02:07:52 +0000 Subject: [PATCH] Remove color management configuration in VTS Color management is now turned on by default, so there's no reason to explicitly enable it in renderengine. Bug: 295966830 Test: builds Change-Id: I42c8afb30950081cd57072680da06895dcc02f2c --- .../VtsHalGraphicsComposerV2_2ReadbackTest.cpp | 14 +++++++------- .../vts/VtsHalGraphicsComposer3_ReadbackTest.cpp | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2ReadbackTest.cpp b/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2ReadbackTest.cpp index fa1d58897c..74d2f03ba3 100644 --- a/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2ReadbackTest.cpp +++ b/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2ReadbackTest.cpp @@ -82,13 +82,13 @@ class GraphicsCompositionTestBase : public ::testing::Test { ASSERT_NO_FATAL_FAILURE( mTestRenderEngine = std::unique_ptr(new TestRenderEngine( renderengine::RenderEngineCreationArgs::Builder() - .setPixelFormat(static_cast(ui::PixelFormat::RGBA_8888)) - .setImageCacheSize(TestRenderEngine::sMaxFrameBufferAcquireBuffers) - .setUseColorManagerment(true) - .setEnableProtectedContext(false) - .setPrecacheToneMapperShaderOnly(false) - .setContextPriority(renderengine::RenderEngine::ContextPriority::HIGH) - .build()))); + .setPixelFormat(static_cast(ui::PixelFormat::RGBA_8888)) + .setImageCacheSize(TestRenderEngine::sMaxFrameBufferAcquireBuffers) + .setEnableProtectedContext(false) + .setPrecacheToneMapperShaderOnly(false) + .setContextPriority( + renderengine::RenderEngine::ContextPriority::HIGH) + .build()))); renderengine::DisplaySettings clientCompositionDisplay; clientCompositionDisplay.physicalDisplay = Rect(mDisplayWidth, mDisplayHeight); diff --git a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp index 269abd150d..a83b833eeb 100644 --- a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp +++ b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp @@ -70,7 +70,6 @@ class GraphicsCompositionTestBase : public ::testing::Test { ::android::renderengine::RenderEngineCreationArgs::Builder() .setPixelFormat(static_cast(common::PixelFormat::RGBA_8888)) .setImageCacheSize(TestRenderEngine::sMaxFrameBufferAcquireBuffers) - .setUseColorManagerment(true) .setEnableProtectedContext(false) .setPrecacheToneMapperShaderOnly(false) .setContextPriority(::android::renderengine::RenderEngine::