Do not share FBOs/VAOs/Transform feedback objects across contexts

gpu/command_buffer/client/share_group.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_CLIENT_SHARE_GROUP_H_
 #define GPU_COMMAND_BUFFER_CLIENT_SHARE_GROUP_H_
 
 #include <GLES2/gl2.h>
 #include <stdint.h>
 
@@ skipping 14 matching lines @@
 
 typedef void (GLES2Implementation::*DeleteFn)(GLsizei n, const GLuint* ids);
 typedef void (GLES2Implementation::*DeleteRangeFn)(const GLuint first_id,
                                                    GLsizei range);
 typedef void (GLES2Implementation::*BindFn)(GLenum target, GLuint id);
 typedef void (GLES2Implementation::*BindIndexedFn)( \
     GLenum target, GLuint index, GLuint id);
 typedef void (GLES2Implementation::*BindIndexedRangeFn)( \
     GLenum target, GLuint index, GLuint id, GLintptr offset, GLsizeiptr size);
 
+template <typename Type>
+inline int ToInt(Type t) {

[Zhenyao Mo, 2017/05/11 22:10:57]

You don't need this.  See my comments in other places.  We should still pass
enum class to GetIdAllocator() and other functions, and only do static_cast
inside these functions.

[Chandan, 2017/05/12 12:30:31]

Done.

+  return static_cast<int>(t);
+}
+
+using SharedIdNamespaces = id_namespaces::SharedIdNamespaces;
+
 class ShareGroupContextData {
  public:
   struct IdHandlerData {
     IdHandlerData();
     ~IdHandlerData();
 
     std::vector<GLuint> freed_ids_;
     uint32_t flush_generation_;
   };
 
   IdHandlerData* id_handler_data(int namespace_id) {
     return &id_handler_data_[namespace_id];
   }
 
  private:
-  IdHandlerData id_handler_data_[id_namespaces::kNumIdNamespaces];
+  IdHandlerData id_handler_data_[static_cast<int>(
+      SharedIdNamespaces::kNumSharedIdNamespaces)];
 };
 
 // Base class for IdHandlers
 class IdHandlerInterface {
  public:
   IdHandlerInterface() { }
   virtual ~IdHandlerInterface() { }
 
   // Makes some ids at or above id_offset.
   virtual void MakeIds(
@@ skipping 69 matching lines @@
 
   RangeIdHandlerInterface* GetRangeIdHandler(int range_namespace_id) const {
     return range_id_handlers_[range_namespace_id].get();
   }
 
   ProgramInfoManager* program_info_manager() {
     return program_info_manager_.get();
   }
 
   void FreeContext(GLES2Implementation* gl_impl) {
-    for (int i = 0; i < id_namespaces::kNumIdNamespaces; ++i) {
+    for (int i = 0; i < ToInt(SharedIdNamespaces::kNumSharedIdNamespaces);
+         ++i) {
       id_handlers_[i]->FreeContext(gl_impl);
     }
     for (auto& range_id_handler : range_id_handlers_) {
       range_id_handler->FreeContext(gl_impl);
     }
   }
 
   uint64_t TracingGUID() const { return tracing_guid_; }
 
   // Mark the ShareGroup as lost when an error occurs on any context in the
   // group. This is thread safe as contexts may be on different threads.
   void Lose();
   // Report if any context in the ShareGroup has reported itself lost. This is
   // thread safe as contexts may be on different threads.
   bool IsLost() const;
 
  private:
   friend class gpu::RefCountedThreadSafe<ShareGroup>;
   friend class gpu::gles2::GLES2ImplementationTest;
   ~ShareGroup();
 
   // Install a new program info manager. Used for testing only;
   void SetProgramInfoManagerForTesting(ProgramInfoManager* manager);
 
-  std::unique_ptr<IdHandlerInterface>
-      id_handlers_[id_namespaces::kNumIdNamespaces];
+  std::unique_ptr<IdHandlerInterface> id_handlers_[static_cast<int>(
+      SharedIdNamespaces::kNumSharedIdNamespaces)];
   std::unique_ptr<RangeIdHandlerInterface>
       range_id_handlers_[id_namespaces::kNumRangeIdNamespaces];
   std::unique_ptr<ProgramInfoManager> program_info_manager_;
 
   bool bind_generates_resource_;
   uint64_t tracing_guid_;
 
   mutable base::Lock lost_lock_;
   bool lost_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(ShareGroup);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_SHARE_GROUP_H_