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

Commit 66ebf74e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ib64227a0,I8bfcf23c,I037e4021 

* changes:
  SF: Update static sequence counter when injecting a sequence number
  SF: Fix transaction trace merging
  SF: Add new fields to transactions proto
parents a0579e73 a84a2200

services/surfaceflinger/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -227,7 +227,6 @@ cc_defaults { 
        "libcutils",

        "libdisplayservicehidl",

        "libhidlbase",

        "liblayers_proto",

        "liblog",

        "libprocessgroup",

        "libsync",

services/surfaceflinger/BufferLayer.cpp

+4 −0
Original line number Diff line number Diff line
@@ -820,6 +820,10 @@ bool BufferLayer::bufferNeedsFiltering() const { 
    return isFixedSize();

}



const std::shared_ptr<renderengine::ExternalTexture>& BufferLayer::getExternalTexture() const {

    return mBufferInfo.mBuffer;

}



} // namespace android



#if defined(__gl_h_)

services/surfaceflinger/BufferLayer.h

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ public: 
    ui::Dataspace getDataSpace() const override;



    sp<GraphicBuffer> getBuffer() const override;

    const std::shared_ptr<renderengine::ExternalTexture>& getExternalTexture() const override;



    ui::Transform::RotationFlags getTransformHint() const override { return mTransformHint; }

services/surfaceflinger/Layer.cpp

+5 −3
Original line number Diff line number Diff line
@@ -101,7 +101,9 @@ Layer::Layer(const LayerCreationArgs& args) 
    if (args.flags & ISurfaceComposerClient::eSecure) layerFlags |= layer_state_t::eLayerSecure;

    if (args.flags & ISurfaceComposerClient::eSkipScreenshot)

        layerFlags |= layer_state_t::eLayerSkipScreenshot;



    if (args.sequence) {

        sSequence = *args.sequence + 1;

    }

    mDrawingState.flags = layerFlags;

    mDrawingState.active_legacy.transform.set(0, 0);

    mDrawingState.crop.makeInvalid();
@@ -2022,9 +2024,9 @@ LayerProto* Layer::writeToProto(LayersProto& layersProto, uint32_t traceFlags, 
void Layer::writeToProtoDrawingState(LayerProto* layerInfo, uint32_t traceFlags,

                                     const DisplayDevice* display) {

    const ui::Transform transform = getTransform();

    auto buffer = getBuffer();

    auto buffer = getExternalTexture();

    if (buffer != nullptr) {

        LayerProtoHelper::writeToProto(buffer,

        LayerProtoHelper::writeToProto(*buffer,

                                       [&]() { return layerInfo->mutable_active_buffer(); });

        LayerProtoHelper::writeToProtoDeprecated(ui::Transform(getBufferTransform()),

                                                 layerInfo->mutable_buffer_transform());

services/surfaceflinger/Layer.h

+3 −0
Original line number Diff line number Diff line
@@ -565,6 +565,9 @@ public: 
    virtual uint32_t getBufferTransform() const { return 0; }



    virtual sp<GraphicBuffer> getBuffer() const { return nullptr; }

    virtual const std::shared_ptr<renderengine::ExternalTexture>& getExternalTexture() const {

        return mDrawingState.buffer;

    };



    virtual ui::Transform::RotationFlags getTransformHint() const { return ui::Transform::ROT_0; }