| 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 c2fd4e743e4e9c663192ec4adf4556273a6fd84e..d4d9463f64c0074da8077b40b79e3858633ece24 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| @@ -1889,13 +1889,6 @@ class GLES2DecoderImpl : public GLES2Decoder,
|
| // Util to help with GL.
|
| GLES2Util util_;
|
|
|
| - // unpack flip y as last set by glPixelStorei
|
| - bool unpack_flip_y_;
|
| -
|
| - // unpack (un)premultiply alpha as last set by glPixelStorei
|
| - bool unpack_premultiply_alpha_;
|
| - bool unpack_unpremultiply_alpha_;
|
| -
|
| // The buffer we bind to attrib 0 since OpenGL requires it (ES does not).
|
| GLuint attrib_0_buffer_id_;
|
|
|
| @@ -2508,9 +2501,6 @@ GLES2DecoderImpl::GLES2DecoderImpl(ContextGroup* group)
|
| group_(group),
|
| logger_(&debug_marker_manager_),
|
| state_(group_->feature_info(), this, &logger_),
|
| - unpack_flip_y_(false),
|
| - unpack_premultiply_alpha_(false),
|
| - unpack_unpremultiply_alpha_(false),
|
| attrib_0_buffer_id_(0),
|
| attrib_0_buffer_matches_value_(true),
|
| attrib_0_size_(0),
|
| @@ -5292,24 +5282,6 @@ bool GLES2DecoderImpl::GetHelper(
|
| }
|
| }
|
| return true;
|
| - case GL_UNPACK_FLIP_Y_CHROMIUM:
|
| - *num_written = 1;
|
| - if (params) {
|
| - params[0] = unpack_flip_y_;
|
| - }
|
| - return true;
|
| - case GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM:
|
| - *num_written = 1;
|
| - if (params) {
|
| - params[0] = unpack_premultiply_alpha_;
|
| - }
|
| - return true;
|
| - case GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM:
|
| - *num_written = 1;
|
| - if (params) {
|
| - params[0] = unpack_unpremultiply_alpha_;
|
| - }
|
| - return true;
|
| case GL_BIND_GENERATES_RESOURCE_CHROMIUM:
|
| *num_written = 1;
|
| if (params) {
|
| @@ -8497,15 +8469,6 @@ error::Error GLES2DecoderImpl::HandlePixelStorei(uint32 immediate_data_size,
|
| return error::kNoError;
|
| }
|
| break;
|
| - case GL_UNPACK_FLIP_Y_CHROMIUM:
|
| - unpack_flip_y_ = (param != 0);
|
| - return error::kNoError;
|
| - case GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM:
|
| - unpack_premultiply_alpha_ = (param != 0);
|
| - return error::kNoError;
|
| - case GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM:
|
| - unpack_unpremultiply_alpha_ = (param != 0);
|
| - return error::kNoError;
|
| default:
|
| break;
|
| }
|
| @@ -12033,12 +11996,6 @@ void GLES2DecoderImpl::DoCopyTextureCHROMIUM(
|
| GLboolean unpack_unmultiply_alpha) {
|
| TRACE_EVENT0("gpu", "GLES2DecoderImpl::DoCopyTextureCHROMIUM");
|
|
|
| - // TODO(zmo): Get rid of the following three lines when we begin to pass
|
| - // in meaningful data to these three arguments in blink.
|
| - unpack_flip_y = unpack_flip_y_;
|
| - unpack_premultiply_alpha = unpack_premultiply_alpha_;
|
| - unpack_unmultiply_alpha = unpack_unpremultiply_alpha_;
|
| -
|
| TextureRef* source_texture_ref = GetTexture(source_id);
|
| TextureRef* dest_texture_ref = GetTexture(dest_id);
|
| Texture* source_texture = source_texture_ref->texture();
|
| @@ -12203,12 +12160,6 @@ void GLES2DecoderImpl::DoCopySubTextureCHROMIUM(
|
| GLboolean unpack_unmultiply_alpha) {
|
| TRACE_EVENT0("gpu", "GLES2DecoderImpl::DoCopySubTextureCHROMIUM");
|
|
|
| - // TODO(zmo): Get rid of the following three lines when we begin to pass
|
| - // in meaningful data to these three arguments in blink.
|
| - unpack_flip_y = unpack_flip_y_;
|
| - unpack_premultiply_alpha = unpack_premultiply_alpha_;
|
| - unpack_unmultiply_alpha = unpack_unpremultiply_alpha_;
|
| -
|
| TextureRef* source_texture_ref = GetTexture(source_id);
|
| TextureRef* dest_texture_ref = GetTexture(dest_id);
|
| Texture* source_texture = source_texture_ref->texture();
|
|
|