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

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

Issue 14828011: Mark zero dimension textures as unrenderable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | « no previous file | gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 180a36d27a11b1db28da7c34ef4ee0268c5e7c25..7e1e01e36bc2b0bacc00e10d678d69afa5ea50fa 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -5638,6 +5638,7 @@ bool GLES2DecoderImpl::SetBlackTextureForNonRenderableTextures() {
if (!texture_manager()->HaveUnrenderableTextures()) {
return false;
}
+ LOCAL_PERFORMANCE_WARNING("Some textures are unrenderable.");
bool textures_set = false;
const Program::SamplerIndices& sampler_indices =
state_.current_program->sampler_indices();
@@ -9368,7 +9369,7 @@ error::Error GLES2DecoderImpl::HandleCreateStreamTextureCHROMIUM(
texture->service_id(), client_id);
if (object_id) {
- texture->SetStreamTexture(true);
+ texture_manager()->SetStreamTexture(texture, true);
} else {
LOCAL_SET_GL_ERROR(
GL_OUT_OF_MEMORY,
@@ -9389,7 +9390,7 @@ error::Error GLES2DecoderImpl::HandleDestroyStreamTextureCHROMIUM(
return error::kInvalidArguments;
stream_texture_manager_->DestroyStreamTexture(texture->service_id());
- texture->SetStreamTexture(false);
+ texture_manager()->SetStreamTexture(texture, false);
} else {
LOCAL_SET_GL_ERROR(
GL_INVALID_VALUE,
« no previous file with comments | « no previous file | gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698