Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6dd267ee authored by Alec Mouri's avatar Alec Mouri Committed by Android (Google) Code Review
Browse files

Merge "Remove color management configuration in VTS" into main

parents efa5df24 32a41aba

graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2ReadbackTest.cpp

+7 −7
Original line number Diff line number Diff line
@@ -84,10 +84,10 @@ class GraphicsCompositionTestBase : public ::testing::Test { 
                        renderengine::RenderEngineCreationArgs::Builder()

                                .setPixelFormat(static_cast<int>(ui::PixelFormat::RGBA_8888))

                                .setImageCacheSize(TestRenderEngine::sMaxFrameBufferAcquireBuffers)

                            .setUseColorManagerment(true)

                                .setEnableProtectedContext(false)

                                .setPrecacheToneMapperShaderOnly(false)

                            .setContextPriority(renderengine::RenderEngine::ContextPriority::HIGH)

                                .setContextPriority(

                                        renderengine::RenderEngine::ContextPriority::HIGH)

                                .build())));



        renderengine::DisplaySettings clientCompositionDisplay;

graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ class GraphicsCompositionTestBase : public ::testing::Test { 
                        ::android::renderengine::RenderEngineCreationArgs::Builder()

                                .setPixelFormat(static_cast<int>(common::PixelFormat::RGBA_8888))

                                .setImageCacheSize(TestRenderEngine::sMaxFrameBufferAcquireBuffers)

                                .setUseColorManagerment(true)

                                .setEnableProtectedContext(false)

                                .setPrecacheToneMapperShaderOnly(false)

                                .setContextPriority(::android::renderengine::RenderEngine::