Fix VAOs and client side arrays

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 "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
 
@@ skipping 55 matching lines @@
     glBindTexture(GL_TEXTURE_CUBE_MAP, service_id);
     // TODO: Restore bindings for GL_TEXTURE_RECTANGLE_ARB and
     // GL_TEXTURE_EXTERNAL_OES.
   }
   glActiveTexture(GL_TEXTURE0 + active_texture_unit);
 
   // Restore Attrib State
   // TODO: This if should not be needed. RestoreState is getting called
   // before GLES2Decoder::Initialize which is a bug.
   if (vertex_attrib_manager) {
+    // TODO(gman): Move this restoration to VertexAttribManager.
     for (size_t attrib = 0; attrib < vertex_attrib_manager->num_attribs();
          ++attrib) {
       const VertexAttribManager::VertexAttribInfo* info =
           vertex_attrib_manager->GetVertexAttribInfo(attrib);
       const void* ptr = reinterpret_cast<const void*>(info->offset());
       BufferManager::BufferInfo* buffer_info = info->buffer();
       glBindBuffer(
           GL_ARRAY_BUFFER, buffer_info ? buffer_info->service_id() : 0);
       glVertexAttribPointer(
           attrib, info->size(), info->type(), info->normalized(),
           info->gl_stride(), ptr);
       if (info->divisor())
         glVertexAttribDivisorANGLE(attrib, info->divisor());
       // Never touch vertex attribute 0's state (in particular, never
       // disable it) when running on desktop GL because it will never be
       // re-enabled.
       if (attrib != 0 ||
           gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2) {
         if (info->enabled()) {
           glEnableVertexAttribArray(attrib);
         } else {
           glDisableVertexAttribArray(attrib);
         }
       }
+      glVertexAttrib4fv(attrib, attrib_values[attrib].v);
     }
     BufferManager::BufferInfo* element_array_buffer =
         vertex_attrib_manager->element_array_buffer();
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,
         element_array_buffer ? element_array_buffer->service_id() : 0);
   }
 
   // Restore Bindings
   glBindBuffer(
       GL_ARRAY_BUFFER,
       bound_array_buffer ? bound_array_buffer->service_id() : 0);
   glBindRenderbufferEXT(
       GL_RENDERBUFFER,
       bound_renderbuffer ? bound_renderbuffer->service_id() : 0);
 
   glUseProgram(current_program ? current_program->service_id() : 0);
 }
 
 // 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