Pull in various gpu/command_buffer fixes from chromium

gpu/command_buffer/service/context_state_impl_autogen.h

 // Copyright 2014 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.
 
 // This file is auto-generated from
 // gpu/command_buffer/build_gles2_cmd_buffer.py
 // It's formatted by clang-format using chromium coding style:
 //    clang-format -i -style=chromium filename
 // DO NOT EDIT!
 
@@ skipping 14 matching lines @@
       cached_polygon_offset_fill(false),
       sample_alpha_to_coverage(false),
       cached_sample_alpha_to_coverage(false),
       sample_coverage(false),
       cached_sample_coverage(false),
       scissor_test(false),
       cached_scissor_test(false),
       stencil_test(false),
       cached_stencil_test(false),
       rasterizer_discard(false),
-      cached_rasterizer_discard(false) {
+      cached_rasterizer_discard(false),
+      primitive_restart_fixed_index(false),
+      cached_primitive_restart_fixed_index(false) {
 }
 
 void ContextState::Initialize() {
   blend_color_red = 0.0f;
   blend_color_green = 0.0f;
   blend_color_blue = 0.0f;
   blend_color_alpha = 0.0f;
   blend_equation_rgb = GL_FUNC_ADD;
   blend_equation_alpha = GL_FUNC_ADD;
   blend_source_rgb = GL_ONE;
@@ skipping 125 matching lines @@
     if (prev_state->enable_flags.cached_stencil_test !=
         enable_flags.cached_stencil_test) {
       EnableDisable(GL_STENCIL_TEST, enable_flags.cached_stencil_test);
     }
     if (feature_info_->IsES3Capable()) {
       if (prev_state->enable_flags.cached_rasterizer_discard !=
           enable_flags.cached_rasterizer_discard) {
         EnableDisable(GL_RASTERIZER_DISCARD,
                       enable_flags.cached_rasterizer_discard);
       }
+      if (prev_state->enable_flags.cached_primitive_restart_fixed_index !=
+          enable_flags.cached_primitive_restart_fixed_index) {
+        EnableDisable(GL_PRIMITIVE_RESTART_FIXED_INDEX,
+                      enable_flags.cached_primitive_restart_fixed_index);
+      }
     }
   } else {
     EnableDisable(GL_BLEND, enable_flags.cached_blend);
     EnableDisable(GL_CULL_FACE, enable_flags.cached_cull_face);
     EnableDisable(GL_DEPTH_TEST, enable_flags.cached_depth_test);
     EnableDisable(GL_DITHER, enable_flags.cached_dither);
     EnableDisable(GL_POLYGON_OFFSET_FILL,
                   enable_flags.cached_polygon_offset_fill);
     EnableDisable(GL_SAMPLE_ALPHA_TO_COVERAGE,
                   enable_flags.cached_sample_alpha_to_coverage);
     EnableDisable(GL_SAMPLE_COVERAGE, enable_flags.cached_sample_coverage);
     EnableDisable(GL_SCISSOR_TEST, enable_flags.cached_scissor_test);
     EnableDisable(GL_STENCIL_TEST, enable_flags.cached_stencil_test);
     if (feature_info_->IsES3Capable()) {
       EnableDisable(GL_RASTERIZER_DISCARD,
                     enable_flags.cached_rasterizer_discard);
+      EnableDisable(GL_PRIMITIVE_RESTART_FIXED_INDEX,
+                    enable_flags.cached_primitive_restart_fixed_index);
     }
   }
 }
 
 void ContextState::InitState(const ContextState* prev_state) const {
   if (prev_state) {
     if ((blend_color_red != prev_state->blend_color_red) ||
         (blend_color_green != prev_state->blend_color_green) ||
         (blend_color_blue != prev_state->blend_color_blue) ||
         (blend_color_alpha != prev_state->blend_color_alpha))
@@ skipping 168 matching lines @@
     case GL_SAMPLE_ALPHA_TO_COVERAGE:
       return enable_flags.sample_alpha_to_coverage;
     case GL_SAMPLE_COVERAGE:
       return enable_flags.sample_coverage;
     case GL_SCISSOR_TEST:
       return enable_flags.scissor_test;
     case GL_STENCIL_TEST:
       return enable_flags.stencil_test;
     case GL_RASTERIZER_DISCARD:
       return enable_flags.rasterizer_discard;
+    case GL_PRIMITIVE_RESTART_FIXED_INDEX:
+      return enable_flags.primitive_restart_fixed_index;
     default:
       NOTREACHED();
       return false;
   }
 }
 
 bool ContextState::GetStateAsGLint(GLenum pname,
                                    GLint* params,
                                    GLsizei* num_written) const {
   switch (pname) {
@@ skipping 328 matching lines @@
       if (params) {
         params[0] = static_cast<GLint>(enable_flags.stencil_test);
       }
       return true;
     case GL_RASTERIZER_DISCARD:
       *num_written = 1;
       if (params) {
         params[0] = static_cast<GLint>(enable_flags.rasterizer_discard);
       }
       return true;
+    case GL_PRIMITIVE_RESTART_FIXED_INDEX:
+      *num_written = 1;
+      if (params) {
+        params[0] =
+            static_cast<GLint>(enable_flags.primitive_restart_fixed_index);
+      }
+      return true;
     default:
       return false;
   }
 }
 
 bool ContextState::GetStateAsGLfloat(GLenum pname,
                                      GLfloat* params,
                                      GLsizei* num_written) const {
   switch (pname) {
     case GL_BLEND_COLOR:
@@ skipping 323 matching lines @@
       if (params) {
         params[0] = static_cast<GLfloat>(enable_flags.stencil_test);
       }
       return true;
     case GL_RASTERIZER_DISCARD:
       *num_written = 1;
       if (params) {
         params[0] = static_cast<GLfloat>(enable_flags.rasterizer_discard);
       }
       return true;
+    case GL_PRIMITIVE_RESTART_FIXED_INDEX:
+      *num_written = 1;
+      if (params) {
+        params[0] =
+            static_cast<GLfloat>(enable_flags.primitive_restart_fixed_index);
+      }
+      return true;
     default:
       return false;
   }
 }
 #endif  // GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_IMPL_AUTOGEN_H_