Reland of Upgrade PixelStorei to ES3/WebGL2.

gpu/command_buffer/service/context_state.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/context_state.h"
 
 #include <cmath>
 
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/buffer_manager.h"
@@ skipping 252 matching lines @@
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, GetBufferId(element_array_buffer));
   }
   glBindBuffer(GL_ARRAY_BUFFER, GetBufferId(bound_array_buffer.get()));
   if (feature_info_->IsES3Capable()) {
     glBindBuffer(GL_COPY_READ_BUFFER,
                  GetBufferId(bound_copy_read_buffer.get()));
     glBindBuffer(GL_COPY_WRITE_BUFFER,
                  GetBufferId(bound_copy_write_buffer.get()));
     glBindBuffer(GL_PIXEL_PACK_BUFFER,
                  GetBufferId(bound_pixel_pack_buffer.get()));
+    UpdatePackParameters();
     glBindBuffer(GL_PIXEL_UNPACK_BUFFER,
                  GetBufferId(bound_pixel_unpack_buffer.get()));
+    UpdateUnpackParameters();
     glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER,
                  GetBufferId(bound_transform_feedback_buffer.get()));
     glBindBuffer(GL_UNIFORM_BUFFER, GetBufferId(bound_uniform_buffer.get()));
   }
 }
 
 void ContextState::RestoreRenderbufferBindings() {
   // Require Renderbuffer rebind.
   bound_renderbuffer_valid = false;
 }
@@ skipping 150 matching lines @@
     if (feature_info_->feature_flags().emulate_primitive_restart_fixed_index)
       pname = GL_PRIMITIVE_RESTART;
   }
   if (enable) {
     glEnable(pname);
   } else {
     glDisable(pname);
   }
 }
 
+void ContextState::UpdatePackParameters() const {
+  if (!feature_info_->IsES3Capable())
+    return;
+  if (bound_pixel_pack_buffer.get()) {
+    glPixelStorei(GL_PACK_ROW_LENGTH, pack_row_length);
+    glPixelStorei(GL_PACK_SKIP_PIXELS, pack_skip_pixels);
+    glPixelStorei(GL_PACK_SKIP_ROWS, pack_skip_rows);
+  } else {
+    glPixelStorei(GL_PACK_ROW_LENGTH, 0);
+    glPixelStorei(GL_PACK_SKIP_PIXELS, 0);
+    glPixelStorei(GL_PACK_SKIP_ROWS, 0);
+  }
+}
+
+void ContextState::UpdateUnpackParameters() const {
+  if (!feature_info_->IsES3Capable())
+    return;
+  if (bound_pixel_unpack_buffer.get()) {
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, unpack_row_length);
+    glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, unpack_image_height);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, unpack_skip_pixels);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, unpack_skip_rows);
+    glPixelStorei(GL_UNPACK_SKIP_IMAGES, unpack_skip_images);
+  } else {
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+    glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, 0);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
+    glPixelStorei(GL_UNPACK_SKIP_IMAGES, 0);
+  }
+}
+
 void ContextState::SetBoundBuffer(GLenum target, Buffer* buffer) {
   switch (target) {
     case GL_ARRAY_BUFFER:
       bound_array_buffer = buffer;
       break;
     case GL_ELEMENT_ARRAY_BUFFER:
       vertex_attrib_manager->SetElementArrayBuffer(buffer);
       break;
     case GL_COPY_READ_BUFFER:
       bound_copy_read_buffer = buffer;
       break;
     case GL_COPY_WRITE_BUFFER:
       bound_copy_write_buffer = buffer;
       break;
     case GL_PIXEL_PACK_BUFFER:
       bound_pixel_pack_buffer = buffer;
+      UpdatePackParameters();
       break;
     case GL_PIXEL_UNPACK_BUFFER:
       bound_pixel_unpack_buffer = buffer;
+      UpdateUnpackParameters();
       break;
     case GL_TRANSFORM_FEEDBACK_BUFFER:
       bound_transform_feedback_buffer = buffer;
       break;
     case GL_UNIFORM_BUFFER:
       bound_uniform_buffer = buffer;
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 void ContextState::RemoveBoundBuffer(Buffer* buffer) {
   DCHECK(buffer);
   vertex_attrib_manager->Unbind(buffer);
   if (bound_array_buffer.get() == buffer) {
     bound_array_buffer = nullptr;
   }
   if (bound_copy_read_buffer.get() == buffer) {
     bound_copy_read_buffer = nullptr;
   }
   if (bound_copy_write_buffer.get() == buffer) {
     bound_copy_write_buffer = nullptr;
   }
   if (bound_pixel_pack_buffer.get() == buffer) {
     bound_pixel_pack_buffer = nullptr;
+    UpdatePackParameters();
   }
   if (bound_pixel_unpack_buffer.get() == buffer) {
     bound_pixel_unpack_buffer = nullptr;
+    UpdateUnpackParameters();
   }
   if (bound_transform_feedback_buffer.get() == buffer) {
     bound_transform_feedback_buffer = nullptr;
   }
   if (bound_uniform_buffer.get() == buffer) {
     bound_uniform_buffer = nullptr;
   }
 }
 
 void ContextState::UnbindTexture(TextureRef* texture) {
@@ skipping 43 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/context_state_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu