command_buffer: Add support for creating non-WebGL ES 3 contexts

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 1217 matching lines @@
 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 kBindGeneratesResource = 0x10000;
 const int32 kFailIfMajorPerfCaveat = 0x10001;
 const int32 kLoseContextWhenOutOfMemory = 0x10002;
-const int32 kWebGLVersion = 0x10003;
+const int32 kContextType = 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),
       bind_generates_resource(true),
       fail_if_major_perf_caveat(false),
       lose_context_when_out_of_memory(false),
-      webgl_version(0) {
-}
+      context_type(CONTEXT_TYPE_OPENGLES2) {}
 
 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);
   }
@@ skipping 22 matching lines @@
     attribs->push_back(sample_buffers);
   }
   attribs->push_back(kSwapBehavior);
   attribs->push_back(buffer_preserved ? kBufferPreserved : kBufferDestroyed);
   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(kWebGLVersion);
-  attribs->push_back(webgl_version);
+  attribs->push_back(kContextType);
+  attribs->push_back(context_type);
   attribs->push_back(kNone);
 }
 
 bool ContextCreationAttribHelper::Parse(const std::vector<int32>& attribs) {
   for (size_t i = 0; i < attribs.size(); i += 2) {
     const int32 attrib = attribs[i];
     if (i + 1 >= attribs.size()) {
       if (attrib == kNone) {
         return true;
       }
@@ skipping 34 matching lines @@
         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 kWebGLVersion:
-        webgl_version = value;
+      case kContextType:
+        context_type = static_cast<ContextType>(value);
         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