gpu/command_buffer/service/gles2_cmd_decoder_autogen.h - Issue 14095009: Android: Fix up video to work with mailboxes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_autogen.h

Issue 14095009: Android: Fix up video to work with mailboxes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 8 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 | « gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc » ('j') | gpu/command_buffer/service/texture_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/gles2_cmd_decoder_autogen.h

diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h

index bf9efeb84f9b66e152e2659120826d3daa4ccbef..f145d90e83b6f249c1f9850228e5dcbc7384922f 100644

--- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h

+++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h

@@ -3048,7 +3048,7 @@ error::Error GLES2DecoderImpl::HandleProduceTextureCHROMIUM(

}

const GLbyte* mailbox = GetSharedMemoryAs<const GLbyte*>(

c.mailbox_shm_id, c.mailbox_shm_offset, data_size);

- if (!validators_->texture_target.IsValid(target)) {

+ if (!validators_->texture_bind_target.IsValid(target)) {

LOCAL_SET_GL_ERROR_INVALID_ENUM("glProduceTextureCHROMIUM", target,

"target");

return error::kNoError;

@@ -3073,7 +3073,7 @@ error::Error GLES2DecoderImpl::HandleProduceTextureCHROMIUMImmediate(

}

const GLbyte* mailbox = GetImmediateDataAs<const GLbyte*>(

c, data_size, immediate_data_size);

- if (!validators_->texture_target.IsValid(target)) {

+ if (!validators_->texture_bind_target.IsValid(target)) {

LOCAL_SET_GL_ERROR_INVALID_ENUM("glProduceTextureCHROMIUM", target,

"target");

return error::kNoError;

@@ -3094,7 +3094,7 @@ error::Error GLES2DecoderImpl::HandleConsumeTextureCHROMIUM(

}

const GLbyte* mailbox = GetSharedMemoryAs<const GLbyte*>(

c.mailbox_shm_id, c.mailbox_shm_offset, data_size);

- if (!validators_->texture_target.IsValid(target)) {

+ if (!validators_->texture_bind_target.IsValid(target)) {

LOCAL_SET_GL_ERROR_INVALID_ENUM("glConsumeTextureCHROMIUM", target,

"target");

return error::kNoError;

@@ -3119,7 +3119,7 @@ error::Error GLES2DecoderImpl::HandleConsumeTextureCHROMIUMImmediate(

}

const GLbyte* mailbox = GetImmediateDataAs<const GLbyte*>(

c, data_size, immediate_data_size);

- if (!validators_->texture_target.IsValid(target)) {

+ if (!validators_->texture_bind_target.IsValid(target)) {

LOCAL_SET_GL_ERROR_INVALID_ENUM("glConsumeTextureCHROMIUM", target,

"target");

return error::kNoError;