diff options
Diffstat (limited to 'include/surfaceflinger')
| -rw-r--r-- | include/surfaceflinger/IGraphicBufferAlloc.h | 10 | ||||
| -rw-r--r-- | include/surfaceflinger/ISurfaceComposerClient.h | 1 | ||||
| -rw-r--r-- | include/surfaceflinger/Surface.h | 10 | ||||
| -rw-r--r-- | include/surfaceflinger/SurfaceComposerClient.h | 2 |
4 files changed, 5 insertions, 18 deletions
diff --git a/include/surfaceflinger/IGraphicBufferAlloc.h b/include/surfaceflinger/IGraphicBufferAlloc.h index d996af7..01e4bd9 100644 --- a/include/surfaceflinger/IGraphicBufferAlloc.h +++ b/include/surfaceflinger/IGraphicBufferAlloc.h @@ -32,18 +32,10 @@ class IGraphicBufferAlloc : public IInterface public: DECLARE_META_INTERFACE(GraphicBufferAlloc); - /* Create a new GraphicBuffer for the client to use. The server will - * maintain a reference to the newly created GraphicBuffer until - * freeAllGraphicBuffers is called. + /* Create a new GraphicBuffer for the client to use. */ virtual sp<GraphicBuffer> createGraphicBuffer(uint32_t w, uint32_t h, PixelFormat format, uint32_t usage) = 0; - - /* Free all but one of the GraphicBuffer objects that the server is - * currently referencing. If bufIndex is not a valid index of the buffers - * the server is referencing, then all buffers are freed. - */ - virtual void freeAllGraphicBuffersExcept(int bufIndex) = 0; }; // ---------------------------------------------------------------------------- diff --git a/include/surfaceflinger/ISurfaceComposerClient.h b/include/surfaceflinger/ISurfaceComposerClient.h index a1e9e04..46b1bb7 100644 --- a/include/surfaceflinger/ISurfaceComposerClient.h +++ b/include/surfaceflinger/ISurfaceComposerClient.h @@ -64,7 +64,6 @@ public: * Requires ACCESS_SURFACE_FLINGER permission */ virtual sp<ISurface> createSurface( surface_data_t* data, - int pid, const String8& name, DisplayID display, uint32_t w, diff --git a/include/surfaceflinger/Surface.h b/include/surfaceflinger/Surface.h index 9e0b5bb..3923e61 100644 --- a/include/surfaceflinger/Surface.h +++ b/include/surfaceflinger/Surface.h @@ -102,10 +102,6 @@ private: friend class Test; // videoEditor preview classes friend class VideoEditorPreviewController; - - const sp<ISurface>& getISurface() const { return mSurface; } - - friend class Surface; SurfaceControl( @@ -169,6 +165,7 @@ public: // setSwapRectangle() is intended to be used by GL ES clients void setSwapRectangle(const Rect& r); + sp<IBinder> asBinder() const; private: /* @@ -226,7 +223,8 @@ private: int dispatch_set_buffer_count(va_list args); int dispatch_set_buffers_geometry(va_list args); int dispatch_set_buffers_transform(va_list args); - + int dispatch_set_buffers_timestamp(va_list args); + void setUsage(uint32_t reqUsage); int connect(int api); int disconnect(int api); @@ -234,13 +232,13 @@ private: int setBufferCount(int bufferCount); int setBuffersGeometry(int w, int h, int format); int setBuffersTransform(int transform); + int setBuffersTimestamp(int64_t timestamp); /* * private stuff... */ void init(); status_t validate(bool inCancelBuffer = false) const; - sp<ISurface> getISurface() const; // When the buffer pool is a fixed size we want to make sure SurfaceFlinger // won't stall clients, so we require an extra buffer. diff --git a/include/surfaceflinger/SurfaceComposerClient.h b/include/surfaceflinger/SurfaceComposerClient.h index 25b2ebf..c61a5bf 100644 --- a/include/surfaceflinger/SurfaceComposerClient.h +++ b/include/surfaceflinger/SurfaceComposerClient.h @@ -79,7 +79,6 @@ public: //! Create a surface sp<SurfaceControl> createSurface( - int pid, // pid of the process the surface is for const String8& name,// name of the surface DisplayID display, // Display to create this surface on uint32_t w, // width in pixel @@ -89,7 +88,6 @@ public: ); sp<SurfaceControl> createSurface( - int pid, // pid of the process the surface is for DisplayID display, // Display to create this surface on uint32_t w, // width in pixel uint32_t h, // height in pixel |