diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp | 1 | ||||
| -rw-r--r-- | libs/surfaceflinger/LayerBitmap.h | 4 | ||||
| -rw-r--r-- | libs/ui/BufferMapper.cpp | 2 | ||||
| -rw-r--r-- | libs/ui/FramebufferNativeWindow.cpp | 19 | ||||
| -rw-r--r-- | libs/ui/ISurface.cpp | 1 | ||||
| -rw-r--r-- | libs/ui/Surface.cpp | 5 |
6 files changed, 23 insertions, 9 deletions
diff --git a/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp b/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp index ca96e14..374f2e2 100644 --- a/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp +++ b/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp @@ -30,7 +30,6 @@ #include <GLES/gl.h> #include <EGL/egl.h> #include <EGL/eglext.h> -#include <EGL/android_natives.h> #include <pixelflinger/pixelflinger.h> diff --git a/libs/surfaceflinger/LayerBitmap.h b/libs/surfaceflinger/LayerBitmap.h index 6e136a2..824e0f2 100644 --- a/libs/surfaceflinger/LayerBitmap.h +++ b/libs/surfaceflinger/LayerBitmap.h @@ -28,12 +28,10 @@ #include <ui/Rect.h> #include <ui/Surface.h> -#include <EGL/android_natives.h> - #include <pixelflinger/pixelflinger.h> #include <private/ui/SharedState.h> - +#include <private/ui/SurfaceBuffer.h> class copybit_image_t; struct android_native_buffer_t; diff --git a/libs/ui/BufferMapper.cpp b/libs/ui/BufferMapper.cpp index 1a75c5d..92a9a86 100644 --- a/libs/ui/BufferMapper.cpp +++ b/libs/ui/BufferMapper.cpp @@ -25,8 +25,6 @@ #include <ui/BufferMapper.h> #include <ui/Rect.h> -#include <EGL/android_natives.h> - #include <hardware/gralloc.h> diff --git a/libs/ui/FramebufferNativeWindow.cpp b/libs/ui/FramebufferNativeWindow.cpp index f235cb4..5e69cff 100644 --- a/libs/ui/FramebufferNativeWindow.cpp +++ b/libs/ui/FramebufferNativeWindow.cpp @@ -42,6 +42,25 @@ namespace android { // ---------------------------------------------------------------------------- +class NativeBuffer + : public EGLNativeBase< + android_native_buffer_t, + NativeBuffer, + LightRefBase<NativeBuffer> > +{ +public: + NativeBuffer(int w, int h, int f, int u) : BASE() { + android_native_buffer_t::width = w; + android_native_buffer_t::height = h; + android_native_buffer_t::format = f; + android_native_buffer_t::usage = u; + } +private: + friend class LightRefBase<NativeBuffer>; + ~NativeBuffer() { }; // this class cannot be overloaded +}; + + /* * This implements the (main) framebuffer management. This class is used * mostly by SurfaceFlinger, but also by command line GL application. diff --git a/libs/ui/ISurface.cpp b/libs/ui/ISurface.cpp index fcea8ec..ec922d0 100644 --- a/libs/ui/ISurface.cpp +++ b/libs/ui/ISurface.cpp @@ -27,6 +27,7 @@ #include <ui/Overlay.h> #include <ui/Surface.h> +#include <private/ui/SurfaceBuffer.h> namespace android { diff --git a/libs/ui/Surface.cpp b/libs/ui/Surface.cpp index 782eac4..6437619 100644 --- a/libs/ui/Surface.cpp +++ b/libs/ui/Surface.cpp @@ -36,12 +36,11 @@ #include <ui/SurfaceComposerClient.h> #include <ui/Rect.h> -#include <EGL/android_natives.h> +#include <pixelflinger/pixelflinger.h> #include <private/ui/SharedState.h> #include <private/ui/LayerState.h> - -#include <pixelflinger/pixelflinger.h> +#include <private/ui/SurfaceBuffer.h> namespace android { |