diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 22:37:27 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 22:37:27 +0000 |
| commit | 4326fe52ca81a709b944bbad8b7342b1da2a1d5e (patch) | |
| tree | 42504115b1cd1943b31286fd2bf0ff3857cbd28c /gpu | |
| parent | 10385fed87bf2ddfac12398d90bcafd3aea8f88b (diff) | |
| download | chromium_src-4326fe52ca81a709b944bbad8b7342b1da2a1d5e.zip chromium_src-4326fe52ca81a709b944bbad8b7342b1da2a1d5e.tar.gz chromium_src-4326fe52ca81a709b944bbad8b7342b1da2a1d5e.tar.bz2 | |
Revert 141302 - hook up new MacVideoDecodeAccelerator
This CL hooks up the new MacVideoDecodeAccelerator so that it can be instantiated by the HTML5 and pepper code. Currently only the pepper code uses it.
I also updated the pepper video_decode example app to be able to draw the GL_TEXTURE_RECTANGLE_ARB textures that the Mac decoder generates.
BUG=127414
TEST=
Review URL: https://chromiumcodereview.appspot.com/10411042
TBR=sail@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10534077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/common/gles2_cmd_utils.cc | 2 | ||||
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 4 | ||||
| -rw-r--r-- | gpu/command_buffer/service/program_manager.h | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/gpu/command_buffer/common/gles2_cmd_utils.cc b/gpu/command_buffer/common/gles2_cmd_utils.cc index ea0bd73..9c10bb4 100644 --- a/gpu/command_buffer/common/gles2_cmd_utils.cc +++ b/gpu/command_buffer/common/gles2_cmd_utils.cc @@ -497,8 +497,6 @@ uint32 GLES2Util::GetGLDataTypeSizeForUniforms(int type) { return sizeof(GLfloat) * 4 * 4; // NOLINT case GL_SAMPLER_2D: return sizeof(GLint); // NOLINT - case GL_SAMPLER_2D_RECT_ARB: - return sizeof(GLint); // NOLINT case GL_SAMPLER_CUBE: return sizeof(GLint); // NOLINT case GL_SAMPLER_EXTERNAL_OES: diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index e53f1ee1..31f6a8b 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -4695,8 +4695,8 @@ void GLES2DecoderImpl::DoUniform1iv( fake_location, "glUniform1iv", &real_location, &type, &count)) { return; } - if (type == GL_SAMPLER_2D || type == GL_SAMPLER_2D_RECT_ARB || - type == GL_SAMPLER_CUBE || type == GL_SAMPLER_EXTERNAL_OES) { + if (type == GL_SAMPLER_2D || 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"); diff --git a/gpu/command_buffer/service/program_manager.h b/gpu/command_buffer/service/program_manager.h index 553c313..650385c 100644 --- a/gpu/command_buffer/service/program_manager.h +++ b/gpu/command_buffer/service/program_manager.h @@ -42,8 +42,8 @@ class GPU_EXPORT ProgramManager { ~UniformInfo(); bool IsSampler() const { - return type == GL_SAMPLER_2D || type == GL_SAMPLER_2D_RECT_ARB || - type == GL_SAMPLER_CUBE || type == GL_SAMPLER_EXTERNAL_OES; + return type == GL_SAMPLER_2D || type == GL_SAMPLER_CUBE || + type == GL_SAMPLER_EXTERNAL_OES; } GLsizei size; |