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

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

Issue 12717013: Add reference-counting for mailbox textures. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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/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 5e3bea65d6b8fbcb2c6fa1efd37be785e09e8bcb..27c5201a380e92afa9a88051e93f832c0cc9fd06 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -9968,8 +9968,7 @@ void GLES2DecoderImpl::DoProduceTextureCHROMIUM(GLenum target,
if (!group_->mailbox_manager()->ProduceTexture(
target,
*reinterpret_cast<const MailboxName*>(mailbox),
- definition,
- texture_manager())) {
+ definition)) {
bool success = texture_manager()->Restore(
"glProductTextureCHROMIUM", this, texture, definition);
DCHECK(success);
@@ -9978,8 +9977,6 @@ void GLES2DecoderImpl::DoProduceTextureCHROMIUM(GLenum target,
"glProduceTextureCHROMIUM", "invalid mailbox name");
return;
}
-
- glBindTexture(texture->target(), texture->service_id());
}
void GLES2DecoderImpl::DoConsumeTextureCHROMIUM(GLenum target,
@@ -9992,7 +9989,7 @@ void GLES2DecoderImpl::DoConsumeTextureCHROMIUM(GLenum target,
return;
}
- scoped_ptr<TextureDefinition> definition(
+ scoped_refptr<TextureDefinition> definition(
group_->mailbox_manager()->ConsumeTexture(
target,
*reinterpret_cast<const MailboxName*>(mailbox)));
@@ -10004,7 +10001,7 @@ void GLES2DecoderImpl::DoConsumeTextureCHROMIUM(GLenum target,
}
if (!texture_manager()->Restore(
- "glConsumeTextureCHROMIUM", this, texture, definition.release())) {
+ "glConsumeTextureCHROMIUM", this, texture, definition)) {
LOCAL_SET_GL_ERROR(
GL_INVALID_OPERATION,
"glConsumeTextureCHROMIUM", "invalid texture");

Powered by Google App Engine
This is Rietveld 408576698