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

Commit 88790f34 authored by Alec Mouri's avatar Alec Mouri
Browse files

Remove the concept of target dataspace 

This is only needed for configuring colorspace agnostic dataspaces, but
no device does that. For colorspace agnostic layers, it's sufficient to
just use the colormode dataspace, with the possible exception of HDR
where we can preserve some bespoke logic, so we can just get rid of
target dataspaces and any associated plumbing.

Bug: 292162273
Test: builds
Test: libsurfaceflinger_unittest
Test: libcompositionengine_test
Change-Id: I319bb354e80e3ad1eaaacd896b897e6696f96588
parent 227a7f8f

services/surfaceflinger/CompositionEngine/include/compositionengine/CompositionRefreshArgs.h

+0 −3
Original line number Diff line number Diff line
@@ -67,9 +67,6 @@ struct CompositionRefreshArgs { 
    // Controls how the color mode is chosen for an output

    OutputColorSetting outputColorSetting{OutputColorSetting::kEnhanced};



    // If not Dataspace::UNKNOWN, overrides the dataspace on each output

    ui::Dataspace colorSpaceAgnosticDataspace{ui::Dataspace::UNKNOWN};



    // Forces a color mode on the outputs being refreshed

    ui::ColorMode forceOutputColorMode{ui::ColorMode::NATIVE};

services/surfaceflinger/CompositionEngine/include/compositionengine/DisplayColorProfile.h

+0 −4
Original line number Diff line number Diff line
@@ -87,10 +87,6 @@ public: 
    // Returns true if HWC for this profile supports the dataspace

    virtual bool isDataspaceSupported(ui::Dataspace) const = 0;



    // Returns the target dataspace for picked color mode and dataspace

    virtual ui::Dataspace getTargetDataspace(ui::ColorMode, ui::Dataspace,

                                             ui::Dataspace colorSpaceAgnosticDataspace) const = 0;



    // Debugging

    virtual void dump(std::string&) const = 0;

};

services/surfaceflinger/CompositionEngine/include/compositionengine/Output.h

+0 −1
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ public: 
        ui::ColorMode mode{ui::ColorMode::NATIVE};

        ui::Dataspace dataspace{ui::Dataspace::UNKNOWN};

        ui::RenderIntent renderIntent{ui::RenderIntent::COLORIMETRIC};

        ui::Dataspace colorSpaceAgnosticDataspace{ui::Dataspace::UNKNOWN};

    };



    // Use internally to incrementally compute visibility/coverage

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/DisplayColorProfile.h

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ public: 


    const HdrCapabilities& getHdrCapabilities() const override;

    bool isDataspaceSupported(ui::Dataspace) const override;

    ui::Dataspace getTargetDataspace(ui::ColorMode, ui::Dataspace, ui::Dataspace) const override;



    void dump(std::string&) const override;

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/OutputCompositionState.h

+0 −3
Original line number Diff line number Diff line
@@ -116,9 +116,6 @@ struct OutputCompositionState { 
    // Current active dataspace

    ui::Dataspace dataspace{ui::Dataspace::UNKNOWN};



    // Current target dataspace

    ui::Dataspace targetDataspace{ui::Dataspace::UNKNOWN};



    std::optional<android::HWComposer::DeviceRequestedChanges> previousDeviceRequestedChanges{};



    bool previousDeviceRequestedSuccess = false;