Remove flip_y, premultiply_alpha, unmultiply_alpha support in command buffer.

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 1871 matching lines @@
 
   // All the state for this context.
   ContextState state_;
 
   // Current width and height of the offscreen frame buffer.
   gfx::Size offscreen_size_;
 
   // 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_;
 
   // The value currently in attrib_0.
   Vec4 attrib_0_value_;
 
   // Whether or not the attrib_0 buffer holds the attrib_0_value.
   bool attrib_0_buffer_matches_value_;
 
   // The size of attrib 0.
@@ skipping 592 matching lines @@
 
 GLES2Decoder* GLES2Decoder::Create(ContextGroup* group) {
   return new GLES2DecoderImpl(group);
 }
 
 GLES2DecoderImpl::GLES2DecoderImpl(ContextGroup* group)
     : GLES2Decoder(),
       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),
       fixed_attrib_buffer_id_(0),
       fixed_attrib_buffer_size_(0),
       offscreen_target_color_format_(0),
       offscreen_target_depth_format_(0),
       offscreen_target_stencil_format_(0),
       offscreen_target_samples_(0),
       offscreen_target_buffer_preserved_(true),
@@ skipping 2761 matching lines @@
       *num_written = 1;
       if (params) {
         TextureUnit& unit = state_.texture_units[state_.active_texture_unit];
         if (unit.bound_texture_rectangle_arb.get()) {
           *params = unit.bound_texture_rectangle_arb->client_id();
         } else {
           *params = 0;
         }
       }
       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) {
         params[0] = group_->bind_generates_resource() ? 1 : 0;
       }
       return true;
     default:
       if (pname >= GL_DRAW_BUFFER0_ARB &&
           pname < GL_DRAW_BUFFER0_ARB + group_->max_draw_buffers()) {
         *num_written = 1;
@@ skipping 3167 matching lines @@
   }
   switch (pname) {
     case GL_PACK_ALIGNMENT:
     case GL_UNPACK_ALIGNMENT:
         if (!validators_->pixel_store_alignment.IsValid(param)) {
             LOCAL_SET_GL_ERROR(
                 GL_INVALID_VALUE, "glPixelStorei", "param GL_INVALID_VALUE");
             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;
   }
   glPixelStorei(pname, param);
   switch (pname) {
     case GL_PACK_ALIGNMENT:
         state_.pack_alignment = param;
         break;
     case GL_PACK_REVERSE_ROW_ORDER_ANGLE:
         state_.pack_reverse_row_order = (param != 0);
@@ skipping 3507 matching lines @@
     GLenum target,
     GLuint source_id,
     GLuint dest_id,
     GLenum internal_format,
     GLenum dest_type,
     GLboolean unpack_flip_y,
     GLboolean unpack_premultiply_alpha,
     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();
   Texture* dest_texture = dest_texture_ref->texture();
   int source_width = 0;
   int source_height = 0;
   gfx::GLImage* image =
       source_texture->GetLevelImage(source_texture->target(), 0);
   if (image) {
     gfx::Size size = image->GetSize();
@@ skipping 144 matching lines @@
     GLint yoffset,
     GLint x,
     GLint y,
     GLsizei width,
     GLsizei height,
     GLboolean unpack_flip_y,
     GLboolean unpack_premultiply_alpha,
     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();
   Texture* dest_texture = dest_texture_ref->texture();
   int source_width = 0;
   int source_height = 0;
   gfx::GLImage* image =
       source_texture->GetLevelImage(source_texture->target(), 0);
   if (image) {
     gfx::Size size = image->GetSize();
@@ skipping 1505 matching lines @@
   }
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu