diff options
| author | Mathias Agopian <mathias@google.com> | 2012-02-24 18:25:41 -0800 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2012-02-24 18:26:01 -0800 |
| commit | af01feafc30152baf8e0a5cfddbf02bd14731fd2 (patch) | |
| tree | e19b244ff773d206d21ecccf29296f1848790dd6 /opengl | |
| parent | cc0eaa6582563f51c98db1b232200ac4d2a9a996 (diff) | |
| download | frameworks_base-af01feafc30152baf8e0a5cfddbf02bd14731fd2.zip frameworks_base-af01feafc30152baf8e0a5cfddbf02bd14731fd2.tar.gz frameworks_base-af01feafc30152baf8e0a5cfddbf02bd14731fd2.tar.bz2 | |
remove dependency on android_native{s_priv|buffer}.h
Change-Id: Ie4b95f7061c240f37c504414259f92d72c4ffc89
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/TextureObjectManager.cpp | 2 | ||||
| -rw-r--r-- | opengl/libagl/egl.cpp | 6 | ||||
| -rw-r--r-- | opengl/libagl/texture.cpp | 1 |
3 files changed, 3 insertions, 6 deletions
diff --git a/opengl/libagl/TextureObjectManager.cpp b/opengl/libagl/TextureObjectManager.cpp index 6a006aa..06d45cc 100644 --- a/opengl/libagl/TextureObjectManager.cpp +++ b/opengl/libagl/TextureObjectManager.cpp @@ -19,8 +19,6 @@ #include "context.h" #include "TextureObjectManager.h" -#include <private/ui/android_natives_priv.h> - namespace android { // ---------------------------------------------------------------------------- diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp index eb55bee..92d32a2 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -30,6 +30,7 @@ #include <cutils/atomic.h> #include <utils/threads.h> +#include <ui/ANativeObjectBase.h> #include <EGL/egl.h> #include <EGL/eglext.h> @@ -39,8 +40,6 @@ #include <pixelflinger/format.h> #include <pixelflinger/pixelflinger.h> -#include <private/ui/android_natives_priv.h> - #include "context.h" #include "state.h" #include "texture.h" @@ -49,13 +48,14 @@ #undef NELEM #define NELEM(x) (sizeof(x)/sizeof(*(x))) +// ---------------------------------------------------------------------------- EGLBoolean EGLAPI eglSetSwapRectangleANDROID(EGLDisplay dpy, EGLSurface draw, EGLint left, EGLint top, EGLint width, EGLint height); - // ---------------------------------------------------------------------------- namespace android { + // ---------------------------------------------------------------------------- const unsigned int NUM_DISPLAYS = 1; diff --git a/opengl/libagl/texture.cpp b/opengl/libagl/texture.cpp index 88e8651..08536df 100644 --- a/opengl/libagl/texture.cpp +++ b/opengl/libagl/texture.cpp @@ -23,7 +23,6 @@ #include "texture.h" #include "TextureObjectManager.h" -#include <private/ui/android_natives_priv.h> #include <ETC1/etc1.h> namespace android { |