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

Unified Diff: media/blink/skcanvas_video_renderer.cc

Issue 972833004: Revert of gpu: introduce glCopySubTextureCHROMIUM (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « media/blink/skcanvas_video_renderer.h ('k') | media/blink/webmediaplayer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/skcanvas_video_renderer.cc
diff --git a/media/blink/skcanvas_video_renderer.cc b/media/blink/skcanvas_video_renderer.cc
index f20b90164fbbb7dfd7ec0b751d8b1742cea38552..02d914a653955abc113f3901892c92f81233720f 100644
--- a/media/blink/skcanvas_video_renderer.cc
+++ b/media/blink/skcanvas_video_renderer.cc
@@ -144,8 +144,8 @@
// |texture_id|, it's needed to invalidate the state cached in skia,
// but currently the state isn't changed.
SkCanvasVideoRenderer::CopyVideoFrameTextureToGLTexture(
- context_3d.gl, video_frame, texture_id, GL_RGBA, GL_UNSIGNED_BYTE, true,
- false);
+ context_3d.gl, video_frame, texture_id, 0, GL_RGBA, GL_UNSIGNED_BYTE,
+ true, false);
bitmap->notifyPixelsChanged();
return true;
}
@@ -602,6 +602,7 @@
gpu::gles2::GLES2Interface* gl,
VideoFrame* video_frame,
unsigned int texture,
+ unsigned int level,
unsigned int internal_format,
unsigned int type,
bool premultiply_alpha,
@@ -624,7 +625,7 @@
// "flip_y == true" means to reverse the video orientation while
// "flip_y == false" means to keep the intrinsic orientation.
gl->PixelStorei(GL_UNPACK_FLIP_Y_CHROMIUM, flip_y);
- gl->CopyTextureCHROMIUM(GL_TEXTURE_2D, source_texture, texture,
+ gl->CopyTextureCHROMIUM(GL_TEXTURE_2D, source_texture, texture, level,
internal_format, type);
gl->PixelStorei(GL_UNPACK_FLIP_Y_CHROMIUM, false);
gl->PixelStorei(GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM, false);
« no previous file with comments | « media/blink/skcanvas_video_renderer.h ('k') | media/blink/webmediaplayer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698