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

Commit 8717ff58 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 20892 

* changes:
  Revert "SurfaceFlinger will now allocate buffers based on the usage specified by the clients. This allows to allocate the right kind of buffer automatically, without having the user to specify anything."
parents 511449b5 b2fd4665

include/ui/FramebufferNativeWindow.h

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ private: 
    static int lockBuffer(android_native_window_t* window, android_native_buffer_t* buffer);

    static int queueBuffer(android_native_window_t* window, android_native_buffer_t* buffer);

    static int query(android_native_window_t* window, int what, int* value);

    static int perform(android_native_window_t* window, int operation, ...);

    

    framebuffer_device_t* fbDev;

    alloc_device_t* grDev;

include/ui/ISurface.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ protected: 
public: 

    DECLARE_META_INTERFACE(Surface);



    virtual sp<SurfaceBuffer> getBuffer(int usage) = 0; 

    virtual sp<SurfaceBuffer> getBuffer() = 0; 

    

    class BufferHeap {

    public:

include/ui/Surface.h

+1 −4
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ private: 
    friend class IOMX;

    const sp<ISurface>& getISurface() const { return mSurface; }



    status_t getBufferLocked(int index, int usage);

    status_t getBufferLocked(int index);

   

           status_t validate(per_client_cblk_t const* cblk) const;

    static void _send_dirty_region(layer_cblk_t* lcblk, const Region& dirty);
@@ -197,13 +197,11 @@ private: 
    static int lockBuffer(android_native_window_t* window, android_native_buffer_t* buffer);

    static int queueBuffer(android_native_window_t* window, android_native_buffer_t* buffer);

    static int query(android_native_window_t* window, int what, int* value);

    static int perform(android_native_window_t* window, int operation, ...);



    int dequeueBuffer(android_native_buffer_t** buffer);

    int lockBuffer(android_native_buffer_t* buffer);

    int queueBuffer(android_native_buffer_t* buffer);

    int query(int what, int* value);

    int perform(int operation, va_list args);



    status_t dequeueBuffer(sp<SurfaceBuffer>* buffer);

    status_t lockBuffer(const sp<SurfaceBuffer>& buffer);
@@ -219,7 +217,6 @@ private: 
    uint32_t                    mIdentity;

    uint32_t                    mWidth;

    uint32_t                    mHeight;

    uint32_t                    mUsage;

    PixelFormat                 mFormat;

    uint32_t                    mFlags;

    mutable Region              mDirtyRegion;

include/ui/egl/android_natives.h

+2 −41
Original line number Diff line number Diff line
@@ -67,11 +67,6 @@ enum { 
    NATIVE_WINDOW_FORMAT    = 2,

};



/* valid operations for the (*perform)() hook */

enum {

    NATIVE_WINDOW_SET_USAGE = 0

};



struct android_native_window_t 

{

#ifdef __cplusplus
@@ -149,43 +144,9 @@ struct android_native_window_t 
    int     (*query)(struct android_native_window_t* window,

            int what, int* value);

    

    /*

     * hook used to perform various operations on the surface.

     * (*perform)() is a generic mechanism to add functionality to

     * android_native_window_t while keeping backward binary compatibility.

     * 

     * This hook should not be called directly, instead use the helper functions

     * defined below.

     * 

     * The valid operations are:

     *     NATIVE_WINDOW_SET_USAGE

     *  

     */

    

    int     (*perform)(struct android_native_window_t* window,

                int operation, ... );

    

    void* reserved_proc[3];

    void* reserved_proc[4];

};





/*

 *  native_window_set_usage() sets the intended usage flags for the next

 *  buffers acquired with (*lockBuffer)() and on.

 *  By default (if this function is never called), a usage of

 *      GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_TEXTURE

 *  is assumed.

 *  Calling this function will usually cause following buffers to be

 *  reallocated.

 */



inline int native_window_set_usage(

        struct android_native_window_t* window, int usage)

{

    return window->perform(window, NATIVE_WINDOW_SET_USAGE, usage);

}





// ---------------------------------------------------------------------------



/* FIXME: this is legacy for pixmaps */

libs/surfaceflinger/Layer.cpp

+4 −4
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ void Layer::onDraw(const Region& clip) const 
    drawWithOpenGL(clip, mTextures[index]);

}



sp<SurfaceBuffer> Layer::peekBuffer(int usage)

sp<SurfaceBuffer> Layer::peekBuffer()

{

    /*

     * This is called from the client's Surface::lock(), after it locked
@@ -250,7 +250,7 @@ sp<SurfaceBuffer> Layer::peekBuffer(int usage) 
    }

    

    LayerBitmap& layerBitmap(mBuffers[backBufferIndex]);

    sp<SurfaceBuffer> buffer = layerBitmap.allocate(usage);

    sp<SurfaceBuffer> buffer = layerBitmap.allocate();

    

    LOGD_IF(DEBUG_RESIZE,

            "Layer::getBuffer(this=%p), index=%d, (%d,%d), (%d,%d)",
@@ -649,12 +649,12 @@ Layer::SurfaceLayer::~SurfaceLayer() 
{

}



sp<SurfaceBuffer> Layer::SurfaceLayer::getBuffer(int usage)

sp<SurfaceBuffer> Layer::SurfaceLayer::getBuffer()

{

    sp<SurfaceBuffer> buffer = 0;

    sp<Layer> owner(getOwner());

    if (owner != 0) {

        buffer = owner->peekBuffer(usage);

        buffer = owner->peekBuffer();

    }

    return buffer;

}