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

76
include/private/ui/SurfaceBuffer.h Normal file
View File

@@ -0,0 +1,76 @@
/*
* Copyright (C) 2007 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef ANDROID_UI_PRIVATE_SURFACE_BUFFER_H
#define ANDROID_UI_PRIVATE_SURFACE_BUFFER_H
#include <stdint.h>
#include <sys/types.h>
#include <utils/RefBase.h>
#include <ui/egl/android_natives.h>
namespace android {
// ---------------------------------------------------------------------------
class BufferMapper;
class Rect;
class Surface;
class SurfaceBuffer;
// ---------------------------------------------------------------------------
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;
};
}; // namespace android
#endif // ANDROID_UI_PRIVATE_SURFACE_BUFFER_H

23
include/ui/FramebufferNativeWindow.h
View File

@@ -21,13 +21,14 @@
#include <sys/types.h>
#include <EGL/egl.h>
#include <EGL/android_natives.h>
#include <utils/threads.h>
#include <ui/Rect.h>
#include <pixelflinger/pixelflinger.h>
#include <ui/egl/android_natives.h>
extern "C" EGLNativeWindowType android_createDisplaySurface(void);
@@ -36,25 +37,7 @@ namespace android {
// ---------------------------------------------------------------------------
class Surface;
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
};
class NativeBuffer;
// ---------------------------------------------------------------------------

2
include/ui/ISurface.h
View File

@@ -20,8 +20,6 @@
#include <stdint.h>
#include <sys/types.h>
#include <EGL/android_natives.h>
#include <utils/Errors.h>
#include <utils/IInterface.h>
#include <utils/RefBase.h>

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:

1
opengl/include/EGL/android_natives.h → include/ui/egl/android_natives.h
View File

@@ -47,7 +47,6 @@ enum {
SURFACE_FLAG_MAPPED = FRAMEBUFFER_FLAG_MAPPED,
};
// ---------------------------------------------------------------------------
struct android_native_base_t

1
libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp
View File

@@ -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>

4
libs/surfaceflinger/LayerBitmap.h
View File

@@ -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;

2
libs/ui/BufferMapper.cpp
View File

@@ -25,8 +25,6 @@
#include <ui/BufferMapper.h>
#include <ui/Rect.h>
#include <EGL/android_natives.h>
#include <hardware/gralloc.h>

19
libs/ui/FramebufferNativeWindow.cpp
View File

@@ -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.

1
libs/ui/ISurface.cpp
View File

@@ -27,6 +27,7 @@
#include <ui/Overlay.h>
#include <ui/Surface.h>
#include <private/ui/SurfaceBuffer.h>
namespace android {

5
libs/ui/Surface.cpp
View File

@@ -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 {

4
opengl/include/EGL/eglplatform.h
View File

@@ -89,7 +89,8 @@ typedef Window EGLNativeWindowType;
#elif defined(ANDROID)
#include <EGL/android_natives.h>
struct android_native_window_t;
struct egl_native_pixmap_t;
typedef struct android_native_window_t* EGLNativeWindowType;
typedef struct egl_native_pixmap_t* EGLNativePixmapType;
@@ -97,6 +98,7 @@ typedef void* EGLNativeDisplayType;
#ifndef EGL_ANDROID_image_native_buffer
#define EGL_ANDROID_image_native_buffer 1
struct android_native_buffer_t;
#define EGL_NATIVE_BUFFER_ANDROID 0x6000 /* eglCreateImageKHR target */
#endif

2
opengl/libagl/TextureObjectManager.cpp
View File

@@ -19,6 +19,8 @@
#include "context.h"
#include "TextureObjectManager.h"
#include <ui/egl/android_natives.h>
namespace android {
// ----------------------------------------------------------------------------

2
opengl/libagl/TextureObjectManager.h
View File

@@ -30,7 +30,7 @@
#include <private/pixelflinger/ggl_context.h>
#include <GLES/gl.h>
#include <EGL/android_natives.h>
#include <EGL/egl.h>
#include "Tokenizer.h"
#include "TokenManager.h"

3
opengl/libagl/egl.cpp
View File

@@ -33,13 +33,14 @@
#include <EGL/egl.h>
#include <EGL/eglext.h>
#include <EGL/android_natives.h>
#include <GLES/gl.h>
#include <GLES/glext.h>
#include <pixelflinger/format.h>
#include <pixelflinger/pixelflinger.h>
#include <ui/egl/android_natives.h>
#include "context.h"
#include "state.h"
#include "texture.h"

2
opengl/libagl/texture.cpp
View File

@@ -23,7 +23,7 @@
#include "texture.h"
#include "TextureObjectManager.h"
#include <EGL/android_natives.h>
#include <ui/egl/android_natives.h>
#ifdef LIBAGL_USE_GRALLOC_COPYBITS
#include "copybit.h"