diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-08-01 11:32:58 -0700 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2011-08-02 17:48:21 -0700 |
| commit | 7c554a61cb935660cdc86905d040c781b490150f (patch) | |
| tree | 033ba7f31eb01931dd94eb37cff5e014faf79bc3 /Source/WebCore/platform/graphics/android/TextureInfo.h | |
| parent | d4f990572c3485cdc15cff48c3bedc6e7cad809b (diff) | |
| download | external_webkit-7c554a61cb935660cdc86905d040c781b490150f.zip external_webkit-7c554a61cb935660cdc86905d040c781b490150f.tar.gz external_webkit-7c554a61cb935660cdc86905d040c781b490150f.tar.bz2 | |
Shared surface texture
Instead of assigning each tile a Surface Texture, now just a normal GL texture.
The content from skia bitmap will first drawn into a queue of Surface Textures,
at draw time, blit them into each tile's GL texture.
Added extra lock to protect the queue operation and Surface Texture operation.
bug:5044597
Change-Id: I25f46228b93a3e99526daf52d8bd0d8d8fcc2879
Diffstat (limited to 'Source/WebCore/platform/graphics/android/TextureInfo.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/TextureInfo.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/TextureInfo.h b/Source/WebCore/platform/graphics/android/TextureInfo.h index c1cb1cd..fda85da 100644 --- a/Source/WebCore/platform/graphics/android/TextureInfo.h +++ b/Source/WebCore/platform/graphics/android/TextureInfo.h @@ -31,9 +31,11 @@ #include <jni.h> #include <ui/GraphicBuffer.h> #include <utils/RefBase.h> - +#include "BaseTile.h" using android::sp; +#define DEPRECATED_SURFACE_TEXTURE_MODE 0 + namespace android { class SurfaceTexture; } @@ -68,12 +70,15 @@ public: GLenum m_internalFormat; // Surface Texture specific data +#if DEPRECATED_SURFACE_TEXTURE_MODE sp<android::SurfaceTexture> m_surfaceTexture; +#endif + // TODO: Delete this after the Ganesh code path get fixed. sp<ANativeWindow> m_ANW; - // The EGLSurface wraps the m_ANW to enable direct OpenGL rendering (e.g. Ganesh) EGLSurface m_eglSurface; + int m_pictureCount; private: SharedTextureMode m_sharedTextureMode; }; |