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

Unified Diff: media/gpu/ipc/service/gpu_video_decode_accelerator.cc

Issue 2481943003: Enforce no uncleared OES external textures. Clear in AVDA, not GVD. (Closed)
Patch Set: Fix mismerge. Created 4 years, 1 month 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/gpu/avda_picture_buffer_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/ipc/service/gpu_video_decode_accelerator.cc
diff --git a/media/gpu/ipc/service/gpu_video_decode_accelerator.cc b/media/gpu/ipc/service/gpu_video_decode_accelerator.cc
index 1470a1254cd4bf9c8357878c246c693058ca7704..cdc67c2e7540bd8710dbfdea6e8739219fe6c7c6 100644
--- a/media/gpu/ipc/service/gpu_video_decode_accelerator.cc
+++ b/media/gpu/ipc/service/gpu_video_decode_accelerator.cc
@@ -519,8 +519,14 @@ void GpuVideoDecodeAccelerator::SetTextureCleared(const Picture& picture) {
GLenum target = texture_ref->texture()->target();
gpu::gles2::TextureManager* texture_manager =
stub_->decoder()->GetContextGroup()->texture_manager();
- DCHECK(!texture_ref->texture()->IsLevelCleared(target, 0));
- texture_manager->SetLevelCleared(texture_ref.get(), target, 0, true);
+
+ // External textures are a special case and expected to already be cleared.
+ if (target == GL_TEXTURE_EXTERNAL_OES) {
+ DCHECK(texture_ref->texture()->IsLevelCleared(target, 0));
+ } else {
+ DCHECK(!texture_ref->texture()->IsLevelCleared(target, 0));
+ texture_manager->SetLevelCleared(texture_ref.get(), target, 0, true);
+ }
}
uncleared_textures_.erase(it);
}
« no previous file with comments | « media/gpu/avda_picture_buffer_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698