Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(810)

Unified Diff: Source/core/html/canvas/WebGLRenderingContextBase.cpp

Issue 1192283002: Fix WebGL tex-image-and-sub-image-2d-with-video-rgb{565,4444,5551} tests on Android. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/canvas/WebGLRenderingContextBase.cpp
diff --git a/Source/core/html/canvas/WebGLRenderingContextBase.cpp b/Source/core/html/canvas/WebGLRenderingContextBase.cpp
index 4c7cc57438bcead5516d20fa34c7911ad4e7c9e6..1f1288f7f0fcd95bffbb33106e102646e8991c1f 100644
--- a/Source/core/html/canvas/WebGLRenderingContextBase.cpp
+++ b/Source/core/html/canvas/WebGLRenderingContextBase.cpp
@@ -3927,8 +3927,9 @@ void WebGLRenderingContextBase::texImage2D(GLenum target, GLint level, GLenum in
// Otherwise, it will fall back to the normal SW path.
WebGLTexture* texture = validateTextureBinding("texImage2D", target, true);
ASSERT(texture);
- if (Extensions3DUtil::canUseCopyTextureCHROMIUM(target, internalformat, type, level)) {
- if (video->copyVideoTextureToPlatformTexture(webContext(), texture->object(), internalformat, type, m_unpackPremultiplyAlpha, m_unpackFlipY)) {
+ if (GL_TEXTURE_2D == target) {
Sami 2015/06/19 06:15:58 I assume the intention is that we want to try usin
+ if (Extensions3DUtil::canUseCopyTextureCHROMIUM(target, internalformat, type, level)
+ && video->copyVideoTextureToPlatformTexture(webContext(), texture->object(), internalformat, type, m_unpackPremultiplyAlpha, m_unpackFlipY)) {
texture->setLevelInfo(target, level, internalformat, video->videoWidth(), video->videoHeight(), 1, type);
return;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698