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

Commit b0ade8a6 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am f4619308: Merge "fix [2835280] Add support for cancelling buffers to... 

am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread

Merge commit 'f461930872beb4362998642c115691bdd2e94617' into gingerbread-plus-aosp

* commit 'f461930872beb4362998642c115691bdd2e94617':
  fix [2835280] Add support for cancelling buffers to ANativeWindow
parents 11e69dea 50817931

include/private/surfaceflinger/SharedBufferStack.h

+6 −4
Original line number Diff line number Diff line
@@ -114,8 +114,9 @@ public: 


    int32_t     identity;       // surface's identity (const)

    int32_t     token;          // surface's token (for debugging)

    int32_t     reserved32[1];

    Statistics  stats;

    int8_t      headBuf;        // last retired buffer

    uint8_t     reservedBytes[3];

    int32_t     reserved;

    BufferData  buffers[NUM_BUFFER_MAX];     // 1024 bytes

};
@@ -201,6 +202,7 @@ public: 
    status_t undoDequeue(int buf);

    

    status_t lock(int buf);

    status_t cancel(int buf);

    status_t queue(int buf);

    bool needNewBuffer(int buffer) const;

    status_t setDirtyRegion(int buffer, const Region& reg);
@@ -230,8 +232,9 @@ private: 
        inline ssize_t operator()();

    };



    struct UndoDequeueUpdate : public UpdateBase {

        inline UndoDequeueUpdate(SharedBufferBase* sbb);

    struct CancelUpdate : public UpdateBase {

        int tail, buf;

        inline CancelUpdate(SharedBufferBase* sbb, int tail, int buf);

        inline ssize_t operator()();

    };
@@ -256,7 +259,6 @@ private: 
    int mNumBuffers;



    int32_t tail;

    int32_t undoDequeueTail;

    int32_t queued_head;

    // statistics...

    nsecs_t mDequeueTime[SharedBufferStack::NUM_BUFFER_MAX];