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

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

Issue 8669008: DestroyStreamTextureChromium should not disallow rendering (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fixing the DCHECK instead Created 9 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3a433d3105937f88716c6ad384aee09e2ad6d91a..349514320a5ac2b8f733c80fc472375e6c514f38 100644
--- a/gpu/command_buffer/service/texture_manager.cc
+++ b/gpu/command_buffer/service/texture_manager.cc
@@ -143,7 +143,9 @@ bool TextureManager::TextureInfo::MarkMipmapsGenerated(
}
void TextureManager::TextureInfo::SetTarget(GLenum target, GLint max_levels) {
- DCHECK_EQ(0u, target_); // you can only set this once.
+ // You can only set target_ once for textures that are not
+ // GL_TEXTURE_EXTERNAL_OES .
+ DCHECK(0u == target_ || GL_TEXTURE_EXTERNAL_OES == target_);
target_ = target;
size_t num_faces = (target == GL_TEXTURE_CUBE_MAP) ? 6 : 1;
level_infos_.resize(num_faces);
« 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