Merge 147584 - On desktop GL, don't disable vertex attribute 0 when restoring state, or nothing wil…

gpu/command_buffer/service/gles2_cmd_decoder.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
===================================================================
--- gpu/command_buffer/service/gles2_cmd_decoder.cc	(revision 147879)
+++ gpu/command_buffer/service/gles2_cmd_decoder.cc	(working copy)
@@ -5219,10 +5219,16 @@
   glBindBuffer(GL_ARRAY_BUFFER,
                bound_array_buffer_ ? bound_array_buffer_->service_id() : 0);
 
-  if (info->enabled()) {
-    glEnableVertexAttribArray(attrib);
-  } else {
-    glDisableVertexAttribArray(attrib);
+  // 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);
+    }
   }
 }