diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-06-21 17:05:38 -0700 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2011-06-24 13:35:03 -0700 |
| commit | 64036ff80901c6af07b1f00a3a4da3966fc166c9 (patch) | |
| tree | c8fd36473f6ebb5bbc50c828825a91e7b5e2df8c /Source/WebCore/platform/graphics/android/MediaLayer.cpp | |
| parent | fc4c5f6f54a106674454dee955a0b4fbd455aeb7 (diff) | |
| download | external_webkit-64036ff80901c6af07b1f00a3a4da3966fc166c9.zip external_webkit-64036ff80901c6af07b1f00a3a4da3966fc166c9.tar.gz external_webkit-64036ff80901c6af07b1f00a3a4da3966fc166c9.tar.bz2 | |
Browser ST: Support both OES and 2D texture target
B/c of driver limitation, we are using 2D texture target for our Surface
Texture, this will be switched to EXTERNAL_OES soon. In order to have smooth
transition, I added the code which can handle both types and it depends on what
Surface Texture itself reports.
Tested with both modes on Crespo since its driver support both.
bug:4905428
Change-Id: Ic91702e7b8f75329f7d948e9217f7fc689a95bbb
Diffstat (limited to 'Source/WebCore/platform/graphics/android/MediaLayer.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/MediaLayer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/MediaLayer.cpp b/Source/WebCore/platform/graphics/android/MediaLayer.cpp index 1ba6d46..3d1fe12 100644 --- a/Source/WebCore/platform/graphics/android/MediaLayer.cpp +++ b/Source/WebCore/platform/graphics/android/MediaLayer.cpp @@ -119,7 +119,8 @@ bool MediaLayer::drawGL(GLWebViewState* glWebViewState, SkMatrix& matrix) textureInfo->m_internalFormat == GL_ALPHA; TilesManager::instance()->shader()->drawLayerQuad(m, mediaBounds, textureInfo->m_textureId, - 1.0f, forceBlending); + 1.0f, forceBlending, + textureInfo->getTextureTarget()); } m_bufferedTexture->consumerRelease(); } |