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

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

am 770492cb: more clean-up in preparation of bigger changes

parents 3ea7965f 7e27f057

include/private/surfaceflinger/SharedBufferStack.h

+1 −2
Original line number Diff line number Diff line
@@ -136,9 +136,7 @@ class SharedClient 
public:

    SharedClient();

    ~SharedClient();



    status_t validate(size_t token) const;

    uint32_t getIdentity(size_t token) const;



private:

    friend class SharedBufferBase;
@@ -160,6 +158,7 @@ public: 
            int32_t identity);

    ~SharedBufferBase();

    status_t getStatus() const;

    int32_t getIdentity() const;

    size_t getFrontBuffer() const;

    String8 dump(char const* prefix) const;

include/surfaceflinger/ISurface.h

+14 −0
Original line number Diff line number Diff line
@@ -53,10 +53,24 @@ protected: 
public: 

    DECLARE_META_INTERFACE(Surface);



    /*

     * requests a new buffer for the given index. If w, h, or format are

     * null the buffer is created with the parameters assigned to the

     * surface it is bound to. Otherwise the buffer's parameters are

     * set to those specified.

     */

    virtual sp<GraphicBuffer> requestBuffer(int bufferIdx,

            uint32_t w, uint32_t h, uint32_t format, uint32_t usage) = 0;



    /*

     * sets the number of buffers dequeuable for this surface.

     */

    virtual status_t setBufferCount(int bufferCount) = 0;

    

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

    // Deprecated...

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



    class BufferHeap {

    public:

        enum {

include/surfaceflinger/ISurfaceComposer.h

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


#include <ui/PixelFormat.h>



#include <surfaceflinger/ISurfaceFlingerClient.h>

#include <surfaceflinger/ISurfaceComposerClient.h>



namespace android {

// ----------------------------------------------------------------------------
@@ -86,7 +86,7 @@ public: 
     * ACCESS_SURFACE_FLINGER permission

     */



    virtual sp<ISurfaceFlingerClient> createConnection() = 0;

    virtual sp<ISurfaceComposerClient> createConnection() = 0;



    /* retrieve the control block */

    virtual sp<IMemoryHeap> getCblk() const = 0;

include/surfaceflinger/ISurfaceFlingerClient.h→include/surfaceflinger/ISurfaceComposerClient.h

+11 −11
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
 * limitations under the License.

 */



#ifndef ANDROID_SF_ISURFACE_FLINGER_CLIENT_H

#define ANDROID_SF_ISURFACE_FLINGER_CLIENT_H

#ifndef ANDROID_SF_ISURFACE_COMPOSER_CLIENT_H

#define ANDROID_SF_ISURFACE_COMPOSER_CLIENT_H



#include <stdint.h>

#include <sys/types.h>
@@ -42,10 +42,10 @@ typedef int32_t DisplayID; 


class layer_state_t;



class ISurfaceFlingerClient : public IInterface

class ISurfaceComposerClient : public IInterface

{

public:

    DECLARE_META_INTERFACE(SurfaceFlingerClient);

    DECLARE_META_INTERFACE(SurfaceComposerClient);



    struct surface_data_t {

        int32_t             token;
@@ -84,7 +84,7 @@ public: 


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



class BnSurfaceFlingerClient : public BnInterface<ISurfaceFlingerClient>

class BnSurfaceComposerClient : public BnInterface<ISurfaceComposerClient>

{

public:

    virtual status_t    onTransact( uint32_t code,
@@ -97,4 +97,4 @@ public: 


}; // namespace android



#endif // ANDROID_SF_ISURFACE_FLINGER_CLIENT_H
 
#endif // ANDROID_SF_ISURFACE_COMPOSER_CLIENT_H

include/surfaceflinger/Surface.h

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <ui/egl/android_natives.h>



#include <surfaceflinger/ISurface.h>

#include <surfaceflinger/ISurfaceFlingerClient.h>

#include <surfaceflinger/ISurfaceComposerClient.h>



#define ANDROID_VIEW_SURFACE_JNI_ID    "mNativeSurface"
@@ -108,7 +108,7 @@ private: 
    SurfaceControl(

            const sp<SurfaceComposerClient>& client,

            const sp<ISurface>& surface,

            const ISurfaceFlingerClient::surface_data_t& data,

            const ISurfaceComposerClient::surface_data_t& data,

            uint32_t w, uint32_t h, PixelFormat format, uint32_t flags);



    ~SurfaceControl();