command_buffer: Defer restoring of FBO bindings when changing virtual contexts

gpu/command_buffer/build_gles2_cmd_buffer.py

Index: gpu/command_buffer/build_gles2_cmd_buffer.py
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index ef83eccaa5759c1c9135c90443ace7f5d8953e01..f10b49b4cea600d9347cf06801db7e8dd9e86915 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -74,14 +74,17 @@ _GL_TYPES_64 = {
 _CAPABILITY_FLAGS = [
   {'name': 'blend'},
   {'name': 'cull_face'},
-  {'name': 'depth_test', 'state_flag': 'framebuffer_state_.clear_state_dirty'},
+  {'name': 'depth_test',
+   'state_flag': 'framebuffer_state_'
+   '.set_draw_framebuffer_clear_state_dirty(true)'},
   {'name': 'dither', 'default': True},
   {'name': 'polygon_offset_fill'},
   {'name': 'sample_alpha_to_coverage'},
   {'name': 'sample_coverage'},
   {'name': 'scissor_test'},
   {'name': 'stencil_test',
-   'state_flag': 'framebuffer_state_.clear_state_dirty'},
+   'state_flag': 'framebuffer_state_'
+   '.set_draw_framebuffer_clear_state_dirty(true)'},
   {'name': 'rasterizer_discard', 'es3': True},
   {'name': 'primitive_restart_fixed_index', 'es3': True},
   {'name': 'multisample_ext', 'default': True,
@@ -140,7 +143,8 @@ _STATES = {
         'cached': True
       },
     ],
-    'state_flag': 'framebuffer_state_.clear_state_dirty',
+    'state_flag': 'framebuffer_state_'
+    '.set_draw_framebuffer_clear_state_dirty(true)',
   },
   'ClearStencil': {
     'type': 'Normal',
@@ -293,7 +297,8 @@ _STATES = {
   'StencilMask': {
     'type': 'FrontBack',
     'func': 'StencilMaskSeparate',
-    'state_flag': 'framebuffer_state_.clear_state_dirty',
+    'state_flag': 'framebuffer_state_'
+    '.set_draw_framebuffer_clear_state_dirty(true)',
     'states': [
       {
         'name': 'stencil_front_writemask',
@@ -524,7 +529,8 @@ _STATES = {
         'cached': True
       },
     ],
-    'state_flag': 'framebuffer_state_.clear_state_dirty',
+    'state_flag': 'framebuffer_state_'
+    '.set_draw_framebuffer_clear_state_dirty(true)',
   },
   'Scissor': {
     'type': 'Normal',
@@ -5427,7 +5433,7 @@ class StateSetHandler(TypeHandler):
     for ndx,item in enumerate(states):
       f.write("    state_.%s = %s;\n" % (item['name'], args[ndx].name))
     if 'state_flag' in state:
-      f.write("    %s = true;\n" % state['state_flag'])
+      f.write("    %s;\n" % state['state_flag'])
     if not func.GetInfo("no_gl"):
       for ndx,item in enumerate(states):
         if item.get('cached', False):
@@ -5516,7 +5522,7 @@ class StateSetRGBAlphaHandler(TypeHandler):
       f.write("    state_.%s = %s;\n" %
                  (item['name'], args[ndx % num_args].name))
     if 'state_flag' in state:
-      f.write("    %s = true;\n" % state['state_flag'])
+      f.write("    %s;\n" % state['state_flag'])
     if not func.GetInfo("no_gl"):
       f.write("    %s(%s);\n" %
                  (func.GetGLFunctionName(), func.MakeOriginalArgString("")))
@@ -5552,7 +5558,7 @@ class StateSetFrontBackSeparateHandler(TypeHandler):
                    (item['name'], args[ndx + 1].name))
       f.write("    }\n")
     if 'state_flag' in state:
-      f.write("    %s = true;\n" % state['state_flag'])
+      f.write("    %s;\n" % state['state_flag'])
     if not func.GetInfo("no_gl"):
       f.write("    %s(%s);\n" %
                  (func.GetGLFunctionName(), func.MakeOriginalArgString("")))
@@ -5578,7 +5584,7 @@ class StateSetFrontBackHandler(TypeHandler):
       for ndx, item in enumerate(group):
         f.write("    state_.%s = %s;\n" % (item['name'], args[ndx].name))
     if 'state_flag' in state:
-      f.write("    %s = true;\n" % state['state_flag'])
+      f.write("    %s;\n" % state['state_flag'])
     if not func.GetInfo("no_gl"):
       f.write("    %s(%s);\n" %
                  (func.GetGLFunctionName(), func.MakeOriginalArgString("")))
@@ -10655,7 +10661,7 @@ bool GLES2DecoderImpl::SetCapabilityState(GLenum cap, bool enabled) {
               state_.enable_flags.%(name)s = enabled;
               if (state_.enable_flags.cached_%(name)s != enabled
                   || state_.ignore_cached_state) {
-                %(state_flag)s = true;
+                %(state_flag)s;
               }
               return false;
               """ % capability)