gpu/command_buffer/service/gles2_cmd_decoder.cc - Issue 10411042: hook up new MacVideoDecodeAccelerator

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.cc

Issue 10411042: hook up new MacVideoDecodeAccelerator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: address review comments Created 8 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:

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 33d35d753f35c3a33d159680bdb7f541d0ebb0dc..1a37ef99c10e54c8e342378fa500e1d0f1c455fe 100644

--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc

+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc

@@ -4683,8 +4683,8 @@ void GLES2DecoderImpl::DoUniform1iv(

fake_location, "glUniform1iv", &real_location, &type, &count)) {

return;

}

- if (type == GL_SAMPLER_2D || type == GL_SAMPLER_CUBE ||

- type == GL_SAMPLER_EXTERNAL_OES) {

+ if (type == GL_SAMPLER_2D || type == GL_SAMPLER_2D_RECT_ARB ||

+ type == GL_SAMPLER_CUBE || type == GL_SAMPLER_EXTERNAL_OES) {

if (!current_program_->SetSamplers(

group_->max_texture_units(), fake_location, count, value)) {

SetGLError(GL_INVALID_VALUE, "glUniform1iv: texture unit out of range");