From 5f2165f9455d4893b581b73a67c5431f4344b47e Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Fri, 24 Feb 2012 18:25:41 -0800 Subject: [PATCH] remove dependency on android_native{s_priv|buffer}.h Change-Id: Ie4b95f7061c240f37c504414259f92d72c4ffc89 --- include/gui/SurfaceTextureClient.h | 4 +- include/private/ui/android_natives_priv.h | 17 ------ include/surfaceflinger/Surface.h | 1 - .../android_natives.h => ANativeObjectBase.h} | 15 +++-- include/ui/EGLNativeSurface.h | 55 ------------------- include/ui/FramebufferNativeWindow.h | 8 +-- include/ui/GraphicBuffer.h | 7 +-- include/ui/android_native_buffer.h | 22 -------- libs/ui/FramebufferNativeWindow.cpp | 10 +--- libs/ui/GraphicBuffer.cpp | 17 ------ opengl/libagl/TextureObjectManager.cpp | 2 - opengl/libagl/egl.cpp | 6 +- opengl/libagl/texture.cpp | 1 - 13 files changed, 21 insertions(+), 144 deletions(-) delete mode 100644 include/private/ui/android_natives_priv.h rename include/ui/{egl/android_natives.h => ANativeObjectBase.h} (85%) delete mode 100644 include/ui/EGLNativeSurface.h delete mode 100644 include/ui/android_native_buffer.h diff --git a/include/gui/SurfaceTextureClient.h b/include/gui/SurfaceTextureClient.h index 971a1b80d..aa7fe48a5 100644 --- a/include/gui/SurfaceTextureClient.h +++ b/include/gui/SurfaceTextureClient.h @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include @@ -31,7 +31,7 @@ namespace android { class Surface; class SurfaceTextureClient - : public EGLNativeBase + : public ANativeObjectBase { public: SurfaceTextureClient(const sp& surfaceTexture); diff --git a/include/private/ui/android_natives_priv.h b/include/private/ui/android_natives_priv.h deleted file mode 100644 index 6b9f524dc..000000000 --- a/include/private/ui/android_natives_priv.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2009 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. - */ - -#include diff --git a/include/surfaceflinger/Surface.h b/include/surfaceflinger/Surface.h index 0460bbd35..06eff8a59 100644 --- a/include/surfaceflinger/Surface.h +++ b/include/surfaceflinger/Surface.h @@ -26,7 +26,6 @@ #include #include -#include #include diff --git a/include/ui/egl/android_natives.h b/include/ui/ANativeObjectBase.h similarity index 85% rename from include/ui/egl/android_natives.h rename to include/ui/ANativeObjectBase.h index 9ac50a5a3..76e850fa2 100644 --- a/include/ui/egl/android_natives.h +++ b/include/ui/ANativeObjectBase.h @@ -22,8 +22,7 @@ #include #include -// FIXME: remove this header, it's for legacy use. native_window is pulled from frameworks/base/native/include/android/ -#include + // --------------------------------------------------------------------------- /* FIXME: this is legacy for pixmaps */ @@ -52,11 +51,11 @@ typedef struct egl_native_pixmap_t namespace android { /* - * This helper class turns an EGL android_native_xxx type into a C++ + * This helper class turns a ANativeXXX object type into a C++ * reference-counted object; with proper type conversions. */ template -class EGLNativeBase : public NATIVE_TYPE, public REF +class ANativeObjectBase : public NATIVE_TYPE, public REF { public: // Disambiguate between the incStrong in REF and NATIVE_TYPE @@ -68,8 +67,8 @@ public: } protected: - typedef EGLNativeBase BASE; - EGLNativeBase() : NATIVE_TYPE(), REF() { + typedef ANativeObjectBase BASE; + ANativeObjectBase() : NATIVE_TYPE(), REF() { NATIVE_TYPE::common.incRef = incRef; NATIVE_TYPE::common.decRef = decRef; } @@ -86,11 +85,11 @@ protected: return getSelf(reinterpret_cast(base)); } static void incRef(android_native_base_t* base) { - EGLNativeBase* self = getSelf(base); + ANativeObjectBase* self = getSelf(base); self->incStrong(self); } static void decRef(android_native_base_t* base) { - EGLNativeBase* self = getSelf(base); + ANativeObjectBase* self = getSelf(base); self->decStrong(self); } }; diff --git a/include/ui/EGLNativeSurface.h b/include/ui/EGLNativeSurface.h deleted file mode 100644 index 7964e7c6b..000000000 --- a/include/ui/EGLNativeSurface.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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_EGL_NATIVE_SURFACE_H -#define ANDROID_EGL_NATIVE_SURFACE_H - -#include -#include - -#include -#include - -#include - -// --------------------------------------------------------------------------- -namespace android { -// --------------------------------------------------------------------------- - -template -class EGLNativeSurface : public egl_native_window_t, public LightRefBase -{ -public: - EGLNativeSurface() { - memset(egl_native_window_t::reserved, 0, - sizeof(egl_native_window_t::reserved)); - memset(egl_native_window_t::reserved_proc, 0, - sizeof(egl_native_window_t::reserved_proc)); - memset(egl_native_window_t::oem, 0, - sizeof(egl_native_window_t::oem)); - } -protected: - EGLNativeSurface& operator = (const EGLNativeSurface& rhs); - EGLNativeSurface(const EGLNativeSurface& rhs); - inline ~EGLNativeSurface() { }; -}; - -// --------------------------------------------------------------------------- -}; // namespace android -// --------------------------------------------------------------------------- - -#endif // ANDROID_EGL_SURFACE_H - diff --git a/include/ui/FramebufferNativeWindow.h b/include/ui/FramebufferNativeWindow.h index 302d01239..b202b95b1 100644 --- a/include/ui/FramebufferNativeWindow.h +++ b/include/ui/FramebufferNativeWindow.h @@ -24,12 +24,10 @@ #include #include + +#include #include -#include - -#include - #define NUM_FRAME_BUFFERS 2 extern "C" EGLNativeWindowType android_createDisplaySurface(void); @@ -44,7 +42,7 @@ class NativeBuffer; // --------------------------------------------------------------------------- class FramebufferNativeWindow - : public EGLNativeBase< + : public ANativeObjectBase< ANativeWindow, FramebufferNativeWindow, LightRefBase > diff --git a/include/ui/GraphicBuffer.h b/include/ui/GraphicBuffer.h index 6ab01f4c9..f318cd899 100644 --- a/include/ui/GraphicBuffer.h +++ b/include/ui/GraphicBuffer.h @@ -20,11 +20,11 @@ #include #include -#include +#include #include #include #include -#include + struct ANativeWindowBuffer; @@ -37,7 +37,7 @@ class GraphicBufferMapper; // =========================================================================== class GraphicBuffer - : public EGLNativeBase< + : public ANativeObjectBase< ANativeWindowBuffer, GraphicBuffer, LightRefBase >, public Flattenable @@ -93,7 +93,6 @@ public: status_t lock(uint32_t usage, void** vaddr); status_t lock(uint32_t usage, const Rect& rect, void** vaddr); - status_t lock(GGLSurface* surface, uint32_t usage); status_t unlock(); ANativeWindowBuffer* getNativeBuffer() const; diff --git a/include/ui/android_native_buffer.h b/include/ui/android_native_buffer.h deleted file mode 100644 index b6e1db460..000000000 --- a/include/ui/android_native_buffer.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2009 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_ANDROID_NATIVES_PRIV_H -#define ANDROID_ANDROID_NATIVES_PRIV_H - -#include - -#endif /* ANDROID_ANDROID_NATIVES_PRIV_H */ diff --git a/libs/ui/FramebufferNativeWindow.cpp b/libs/ui/FramebufferNativeWindow.cpp index 26d4823db..dec99b6c7 100644 --- a/libs/ui/FramebufferNativeWindow.cpp +++ b/libs/ui/FramebufferNativeWindow.cpp @@ -27,25 +27,21 @@ #include #include -#include +#include #include +#include #include -#include -#include - #include #include -#include - // ---------------------------------------------------------------------------- namespace android { // ---------------------------------------------------------------------------- class NativeBuffer - : public EGLNativeBase< + : public ANativeObjectBase< ANativeWindowBuffer, NativeBuffer, LightRefBase > diff --git a/libs/ui/GraphicBuffer.cpp b/libs/ui/GraphicBuffer.cpp index f549a3795..57063e524 100644 --- a/libs/ui/GraphicBuffer.cpp +++ b/libs/ui/GraphicBuffer.cpp @@ -28,8 +28,6 @@ #include #include -#include - namespace android { // =========================================================================== @@ -182,21 +180,6 @@ status_t GraphicBuffer::unlock() return res; } -status_t GraphicBuffer::lock(GGLSurface* sur, uint32_t usage) -{ - void* vaddr; - status_t res = GraphicBuffer::lock(usage, &vaddr); - if (res == NO_ERROR && sur) { - sur->version = sizeof(GGLSurface); - sur->width = width; - sur->height = height; - sur->stride = stride; - sur->format = format; - sur->data = static_cast(vaddr); - } - return res; -} - size_t GraphicBuffer::getFlattenedSize() const { return (8 + (handle ? handle->numInts : 0))*sizeof(int); } diff --git a/opengl/libagl/TextureObjectManager.cpp b/opengl/libagl/TextureObjectManager.cpp index 6a006aabf..06d45cc22 100644 --- a/opengl/libagl/TextureObjectManager.cpp +++ b/opengl/libagl/TextureObjectManager.cpp @@ -19,8 +19,6 @@ #include "context.h" #include "TextureObjectManager.h" -#include - namespace android { // ---------------------------------------------------------------------------- diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp index eb55beefd..92d32a282 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -30,6 +30,7 @@ #include #include +#include #include #include @@ -39,8 +40,6 @@ #include #include -#include - #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 88e865124..08536dfd2 100644 --- a/opengl/libagl/texture.cpp +++ b/opengl/libagl/texture.cpp @@ -23,7 +23,6 @@ #include "texture.h" #include "TextureObjectManager.h" -#include #include namespace android {