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

Unified Diff: cc/output/gl_renderer.cc

Issue 2150993002: Revert of Always apply UniformMatrix4fvStreamTextureMatrixCHROMIUM matrix argument. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | « cc/layers/video_layer_impl.cc ('k') | cc/output/shader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/gl_renderer.cc
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index d99672111dab3e7b4f74c0bc8b0625032c33e9c4..47f1b222c8b2937519ca0539f89a534ffd2bf160 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -2317,6 +2317,13 @@
DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_));
gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id());
+ // TODO(liberato): stream_texture_android should stop sending |gl_matrix| to
+ // the video frame provider with this change (and to us), but it should
+ // start reporting the current matrix via
+ // GLStreamTextureImage::GetTextureMatrix. Until then, though, this will use
+ // the matrix that we provide to it, unless the GLStreamTextureImage
+ // overrides it. This lets it also work with AVDACodecImage, which provides
+ // the correct custom matrix and supplies a default one to us.
gl_->UniformMatrix4fvStreamTextureMatrixCHROMIUM(
program->vertex_shader().tex_matrix_location(), false, gl_matrix);
« no previous file with comments | « cc/layers/video_layer_impl.cc ('k') | cc/output/shader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698