diff options
| author | Romain Guy <romainguy@google.com> | 2013-05-02 17:36:28 -0700 |
|---|---|---|
| committer | Romain Guy <romainguy@google.com> | 2013-05-02 17:36:28 -0700 |
| commit | 877cfe0e32a845d5a58252b8a6e1f54f95b4379c (patch) | |
| tree | 0204e80d336ac4da7a4b507e950e41e0d1fa390d /libs/hwui/AssetAtlas.h | |
| parent | 3b748a44c6bd2ea05fe16839caf73dbe50bd7ae9 (diff) | |
| download | frameworks_base-877cfe0e32a845d5a58252b8a6e1f54f95b4379c.zip frameworks_base-877cfe0e32a845d5a58252b8a6e1f54f95b4379c.tar.gz frameworks_base-877cfe0e32a845d5a58252b8a6e1f54f95b4379c.tar.bz2 | |
Wrap EGLImage with a C++ API
Change-Id: I0fa3282ea7e2ace3ba2aadd929b32232b3d41628
Diffstat (limited to 'libs/hwui/AssetAtlas.h')
| -rw-r--r-- | libs/hwui/AssetAtlas.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libs/hwui/AssetAtlas.h b/libs/hwui/AssetAtlas.h index 4ede716..0bbd2a7 100644 --- a/libs/hwui/AssetAtlas.h +++ b/libs/hwui/AssetAtlas.h @@ -19,9 +19,6 @@ #include <GLES2/gl2.h> -#include <EGL/egl.h> -#include <EGL/eglext.h> - #include <ui/GraphicBuffer.h> #include <utils/KeyedVector.h> @@ -30,6 +27,7 @@ #include <SkBitmap.h> +#include "Image.h" #include "Texture.h" #include "UvMapper.h" @@ -92,7 +90,7 @@ public: friend class AssetAtlas; }; - AssetAtlas(): mWidth(0), mHeight(0), mTexture(0), mImage(EGL_NO_IMAGE_KHR) { } + AssetAtlas(): mWidth(0), mHeight(0), mTexture(0), mImage(NULL) { } ~AssetAtlas() { terminate(); } /** @@ -160,7 +158,7 @@ private: uint32_t mHeight; GLuint mTexture; - EGLImageKHR mImage; + Image* mImage; KeyedVector<SkBitmap*, Entry*> mEntries; }; // class AssetAtlas |