GPU context creation code duplication cleanup

gpu/command_buffer/common/gles2_cmd_utils.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.
 
 // This file is here so other GLES2 related files can have a common set of
 // includes where appropriate.
 
 #include <sstream>
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
@@ skipping 766 matching lines @@
     getting_array_location = true;
   }
   *getting_array = getting_array_location;
   *element_index = index;
   *array_pos = open_pos;
   return true;
 }
 
 namespace {
 
+// WebGraphicsContext3DCommandBufferImpl configuration attributes. Those in
+// the 16-bit range are the same as used by EGL. Those outside the 16-bit range
+// are unique to Chromium. Attributes are matched using a closest fit algorithm.
+
 // From <EGL/egl.h>.
 const int32 kAlphaSize       = 0x3021;  // EGL_ALPHA_SIZE
 const int32 kBlueSize        = 0x3022;  // EGL_BLUE_SIZE
 const int32 kGreenSize       = 0x3023;  // EGL_GREEN_SIZE
 const int32 kRedSize         = 0x3024;  // EGL_RED_SIZE
 const int32 kDepthSize       = 0x3025;  // EGL_DEPTH_SIZE
 const int32 kStencilSize     = 0x3026;  // EGL_STENCIL_SIZE
 const int32 kSamples         = 0x3031;  // EGL_SAMPLES
 const int32 kSampleBuffers   = 0x3032;  // EGL_SAMPLE_BUFFERS
 const int32 kNone            = 0x3038;  // EGL_NONE
 const int32 kSwapBehavior    = 0x3093;  // EGL_SWAP_BEHAVIOR
 const int32 kBufferPreserved = 0x3094;  // EGL_BUFFER_PRESERVED
 const int32 kBufferDestroyed = 0x3095;  // EGL_BUFFER_DESTROYED
 
 // Chromium only.
-const int32 kShareResources        = 0x10000;

[Zhenyao Mo, 2014/08/09 00:42:25]

nit: move the below three values one up.  It's weird to skip one value.

 const int32 kBindGeneratesResource = 0x10001;
 const int32 kFailIfMajorPerfCaveat = 0x10002;
 const int32 kLoseContextWhenOutOfMemory = 0x10003;
 
 }  // namespace
 
 ContextCreationAttribHelper::ContextCreationAttribHelper()
     : alpha_size_(-1),
       blue_size_(-1),
       green_size_(-1),
       red_size_(-1),
       depth_size_(-1),
       stencil_size_(-1),
       samples_(-1),
       sample_buffers_(-1),
       buffer_preserved_(true),
-      share_resources_(false),
       bind_generates_resource_(true),
       fail_if_major_perf_caveat_(false),
       lose_context_when_out_of_memory_(false) {}
 
-void ContextCreationAttribHelper::Serialize(std::vector<int32>* attribs) {
+void ContextCreationAttribHelper::Serialize(std::vector<int32>* attribs) const {
   if (alpha_size_ != -1) {
     attribs->push_back(kAlphaSize);
     attribs->push_back(alpha_size_);
   }
   if (blue_size_ != -1) {
     attribs->push_back(kBlueSize);
     attribs->push_back(blue_size_);
   }
   if (green_size_ != -1) {
     attribs->push_back(kGreenSize);
@@ skipping 14 matching lines @@
   if (samples_ != -1) {
     attribs->push_back(kSamples);
     attribs->push_back(samples_);
   }
   if (sample_buffers_ != -1) {
     attribs->push_back(kSampleBuffers);
     attribs->push_back(sample_buffers_);
   }
   attribs->push_back(kSwapBehavior);
   attribs->push_back(buffer_preserved_ ? kBufferPreserved : kBufferDestroyed);
-  attribs->push_back(kShareResources);
-  attribs->push_back(share_resources_ ? 1 : 0);
   attribs->push_back(kBindGeneratesResource);
   attribs->push_back(bind_generates_resource_ ? 1 : 0);
   attribs->push_back(kFailIfMajorPerfCaveat);
   attribs->push_back(fail_if_major_perf_caveat_ ? 1 : 0);
   attribs->push_back(kLoseContextWhenOutOfMemory);
   attribs->push_back(lose_context_when_out_of_memory_ ? 1 : 0);
   attribs->push_back(kNone);
 }
 
 bool ContextCreationAttribHelper::Parse(const std::vector<int32>& attribs) {
@@ skipping 31 matching lines @@
         break;
       case kSamples:
         samples_ = value;
         break;
       case kSampleBuffers:
         sample_buffers_ = value;
         break;
       case kSwapBehavior:
         buffer_preserved_ = value == kBufferPreserved;
         break;
-      case kShareResources:
-        share_resources_ = value != 0;
-        break;
       case kBindGeneratesResource:
         bind_generates_resource_ = value != 0;
         break;
       case kFailIfMajorPerfCaveat:
         fail_if_major_perf_caveat_ = value != 0;
         break;
       case kLoseContextWhenOutOfMemory:
         lose_context_when_out_of_memory_ = value != 0;
         break;
       case kNone:
         // Terminate list, even if more attributes.
         return true;
       default:
         DLOG(ERROR) << "Invalid context creation attribute: " << attrib;
         return false;
     }
   }
 
   return true;
 }
 
 #include "gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu