move opengl/include/EGL/android_natives.h to include/ui/egl/android_natives.h and don't include it from egl.h
the android_native_ types are just forward declared in egl.h
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 {