Add ES3 commands GetVertexAttribI{u}iv to GPU command buffer.

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 63 matching lines @@
 
 }  // anonymous namespace.
 
 TextureUnit::TextureUnit()
     : bind_target(GL_TEXTURE_2D) {
 }
 
 TextureUnit::~TextureUnit() {
 }
 
+bool Vec4::Equal(const Vec4& other) const {
+  if (type_ != other.type_)
+    return false;
+  switch (type_) {
+    case kFloat:
+      for (size_t ii = 0; ii < 4; ++ii) {
+        if (v_[ii].float_value != other.v_[ii].float_value)
+          return false;
+      }
+      break;
+    case kInt:
+      for (size_t ii = 0; ii < 4; ++ii) {
+        if (v_[ii].int_value != other.v_[ii].int_value)
+          return false;
+      }
+      break;
+    case kUInt:
+      for (size_t ii = 0; ii < 4; ++ii) {
+        if (v_[ii].uint_value != other.v_[ii].uint_value)
+          return false;
+      }
+      break;
+  }
+  return true;
+}
+
+template <>
+void Vec4::GetValues<GLfloat>(GLfloat* values) const {
+  DCHECK(values);
+  switch (type_) {
+    case kFloat:
+      for (size_t ii = 0; ii < 4; ++ii)
+        values[ii] = v_[ii].float_value;
+      break;
+    case kInt:
+      for (size_t ii = 0; ii < 4; ++ii)
+        values[ii] = static_cast<GLfloat>(v_[ii].int_value);

[Zhenyao Mo, 2015/05/13 16:52:25]

Note that the casting behavior might change depending on how WebGL 2 decides to
get rid of the undefined behavior.

+      break;
+    case kUInt:
+      for (size_t ii = 0; ii < 4; ++ii)
+        values[ii] = static_cast<GLfloat>(v_[ii].uint_value);
+      break;
+  }
+}
+
+template <>
+void Vec4::GetValues<GLint>(GLint* values) const {
+  DCHECK(values);
+  switch (type_) {
+    case kFloat:
+      for (size_t ii = 0; ii < 4; ++ii)
+        values[ii] = static_cast<GLint>(v_[ii].float_value);
+      break;
+    case kInt:
+      for (size_t ii = 0; ii < 4; ++ii)
+        values[ii] = v_[ii].int_value;
+      break;
+    case kUInt:
+      for (size_t ii = 0; ii < 4; ++ii)
+        values[ii] = static_cast<GLint>(v_[ii].uint_value);
+      break;
+  }
+}
+
+template <>
+void Vec4::GetValues<GLuint>(GLuint* values) const {
+  DCHECK(values);
+  switch (type_) {
+    case kFloat:
+      for (size_t ii = 0; ii < 4; ++ii)
+        values[ii] = static_cast<GLuint>(v_[ii].float_value);
+      break;
+    case kInt:
+      for (size_t ii = 0; ii < 4; ++ii)
+        values[ii] = static_cast<GLuint>(v_[ii].int_value);
+      break;
+    case kUInt:
+      for (size_t ii = 0; ii < 4; ++ii)
+        values[ii] = v_[ii].uint_value;
+      break;
+  }
+}
+
+template <>
+void Vec4::SetValues<GLfloat>(const GLfloat* values) {
+  DCHECK(values);
+  for (size_t ii = 0; ii < 4; ++ii)
+    v_[ii].float_value = values[ii];
+  type_ = kFloat;
+}
+
+template <>
+void Vec4::SetValues<GLint>(const GLint* values) {
+  DCHECK(values);
+  for (size_t ii = 0; ii < 4; ++ii)
+    v_[ii].int_value = values[ii];
+  type_ = kInt;
+}
+
+template <>
+void Vec4::SetValues<GLuint>(const GLuint* values) {
+  DCHECK(values);
+  for (size_t ii = 0; ii < 4; ++ii)
+    v_[ii].uint_value = values[ii];
+  type_ = kUInt;
+}
+
 ContextState::ContextState(FeatureInfo* feature_info,
                            ErrorStateClient* error_state_client,
                            Logger* logger)
     : active_texture_unit(0),
       bound_renderbuffer_valid(false),
       pack_reverse_row_order(false),
       ignore_cached_state(false),
       fbo_binding_for_scissor_workaround_dirty(false),
       feature_info_(feature_info),
       error_state_(ErrorState::Create(error_state_client, logger)) {
@@ skipping 84 matching lines @@
 void ContextState::RestoreActiveTextureUnitBinding(unsigned int target) const {
   DCHECK_LT(active_texture_unit, texture_units.size());
   const TextureUnit& texture_unit = texture_units[active_texture_unit];
   if (TargetIsSupported(feature_info_, target))
     glBindTexture(target, GetServiceId(texture_unit, target));
 }
 
 void ContextState::RestoreVertexAttribValues() const {
   for (size_t attrib = 0; attrib < vertex_attrib_manager->num_attribs();
        ++attrib) {
-    glVertexAttrib4fv(attrib, attrib_values[attrib].v);
+    switch (attrib_values[attrib].type()) {
+      case Vec4::kFloat:
+        {
+          GLfloat v[4];
+          attrib_values[attrib].GetValues(v);
+          glVertexAttrib4fv(attrib, v);
+        }
+        break;
+      case Vec4::kInt:
+        {
+          GLint v[4];
+          attrib_values[attrib].GetValues(v);
+          glVertexAttribI4iv(attrib, v);
+        }
+        break;
+      case Vec4::kUInt:
+        {
+          GLuint v[4];
+          attrib_values[attrib].GetValues(v);
+          glVertexAttribI4uiv(attrib, v);
+        }
+        break;
+    }
   }
 }
 
 void ContextState::RestoreVertexAttribArrays(
     const scoped_refptr<VertexAttribManager> attrib_manager) const {
   // This is expected to be called only for VAO with service_id 0,
   // either to restore the default VAO or a virtual VAO with service_id 0.
   GLuint vao_service_id = attrib_manager->service_id();
   DCHECK(vao_service_id == 0);
 
@@ skipping 98 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