drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move opengl/include/EGL/android_natives.h to include/ui/egl/android_natives.h and don't include it from egl.h

Browse Source 
the android_native_ types are just forward declared in egl.h
This commit is contained in:
Mathias Agopian
2009-05-05 18:11:11 -07:00
parent e633f9339a
commit ac2523b161
16 changed files with 112 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
include/ui/Surface.h
View File

@ -28,7 +28,7 @@
#include <ui/Region.h>
#include <ui/ISurfaceFlingerClient.h>
#include <EGL/android_natives.h>
#include <ui/egl/android_natives.h>
namespace android {
@ -43,44 +43,6 @@ struct layer_cblk_t;
// ---------------------------------------------------------------------------
class SurfaceBuffer
: public EGLNativeBase<
android_native_buffer_t,
SurfaceBuffer,
LightRefBase<SurfaceBuffer> >
{
public:
status_t lock(uint32_t usage, void** vaddr);
status_t lock(uint32_t usage, const Rect& rect, void** vaddr);
status_t unlock();
protected:
SurfaceBuffer();
SurfaceBuffer(const Parcel& reply);
virtual ~SurfaceBuffer();
bool mOwner;
inline const BufferMapper& getBufferMapper() const { return mBufferMapper; }
inline BufferMapper& getBufferMapper() { return mBufferMapper; }
private:
friend class Surface;
friend class BpSurface;
friend class BnSurface;
friend class LightRefBase<SurfaceBuffer>;
SurfaceBuffer& operator = (const SurfaceBuffer& rhs);
const SurfaceBuffer& operator = (const SurfaceBuffer& rhs) const;
static status_t writeToParcel(Parcel* reply,
android_native_buffer_t const* buffer);
BufferMapper& mBufferMapper;
};
// ---------------------------------------------------------------------------
class Surface;
class SurfaceControl : public RefBase
{
public: