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

Unified Diff: gpu/command_buffer/service/texture_manager.cc

Issue 24152009: Allow rendering from non-stream GL_TEXTURE_EXTERNAL_OES (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@git-svn
Patch Set: 2fea9080 Initial. Created 7 years, 3 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
Index: gpu/command_buffer/service/texture_manager.cc
diff --git a/gpu/command_buffer/service/texture_manager.cc b/gpu/command_buffer/service/texture_manager.cc
index deb8c8e66458cb11b6fe7d8b835327702012c62a..ac8ff71e968fa450fc46303b88ea4a94de593c8d 100644
--- a/gpu/command_buffer/service/texture_manager.cc
+++ b/gpu/command_buffer/service/texture_manager.cc
@@ -198,11 +198,7 @@ Texture::CanRenderCondition Texture::GetCanRenderCondition() const {
if (target_ == 0)
return CAN_RENDER_ALWAYS;
- if (target_ == GL_TEXTURE_EXTERNAL_OES) {
- if (!IsStreamTexture()) {
- return CAN_RENDER_NEVER;
- }
- } else {
+ if (target_ != GL_TEXTURE_EXTERNAL_OES) {
if (level_infos_.empty()) {
return CAN_RENDER_NEVER;
}

Powered by Google App Engine
This is Rietveld 408576698