diff options
| author | 2011-11-29 17:46:35 -0800 | |
|---|---|---|
| committer | 2011-11-29 17:46:35 -0800 | |
| commit | bb1e7d4324ff43491c526c77f405bbbf0cece611 (patch) | |
| tree | 235d607f7473ec35ba7db47e9fc371166f143398 /services | |
| parent | 6f1dd757cb158d17c76baeb170f7db2271802ef8 (diff) | |
| parent | 77cec6132aea6ed98812125f5ad5f79e889cf658 (diff) | |
Merge changes I7e973a35,Ib3386fcc into ics-mr1
* changes:
SurfaceTexture: add EGL_KHR_fence_sync option
SurfaceTexture: add a blit-to-FBO test
Diffstat (limited to 'services')
| -rw-r--r-- | services/surfaceflinger/SurfaceTextureLayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceTextureLayer.cpp b/services/surfaceflinger/SurfaceTextureLayer.cpp index 4390ca19fc24..5020e0007ae7 100644 --- a/services/surfaceflinger/SurfaceTextureLayer.cpp +++ b/services/surfaceflinger/SurfaceTextureLayer.cpp @@ -28,7 +28,7 @@ namespace android { SurfaceTextureLayer::SurfaceTextureLayer(GLuint tex, const sp<Layer>& layer) - : SurfaceTexture(tex), mLayer(layer) { + : SurfaceTexture(tex, true, GL_TEXTURE_EXTERNAL_OES, false), mLayer(layer) { } SurfaceTextureLayer::~SurfaceTextureLayer() { |