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

gpu/command_buffer/client/gles2_implementation.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_GLES2_IMPLEMENTATION_H_
 #define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 267 matching lines @@
 
   ShareGroupContextData* share_group_context_data() {
     return &share_group_context_data_;
   }
 
  private:
   friend class GLES2ImplementationTest;
   friend class VertexArrayObjectManager;
   friend class QueryTracker;
 
+  using IdNamespaces = id_namespaces::IdNamespaces;
+
   // Used to track whether an extension is available
   enum ExtensionStatus {
       kAvailableExtensionStatus,
       kUnavailableExtensionStatus,
       kUnknownExtensionStatus
   };
 
   enum Dimension {
       k2D,
       k3D,
@@ skipping 184 matching lines @@
   void BindSamplerHelper(GLuint unit, GLuint sampler);
   void BindTextureHelper(GLenum target, GLuint texture);
   void BindTransformFeedbackHelper(GLenum target, GLuint transformfeedback);
   void BindVertexArrayOESHelper(GLuint array);
   void UseProgramHelper(GLuint program);
 
   void BindBufferStub(GLenum target, GLuint buffer);
   void BindBufferBaseStub(GLenum target, GLuint index, GLuint buffer);
   void BindBufferRangeStub(GLenum target, GLuint index, GLuint buffer,
                            GLintptr offset, GLsizeiptr size);
-  void BindFramebufferStub(GLenum target, GLuint framebuffer);
   void BindRenderbufferStub(GLenum target, GLuint renderbuffer);
   void BindTextureStub(GLenum target, GLuint texture);
 
   void GenBuffersHelper(GLsizei n, const GLuint* buffers);
   void GenFramebuffersHelper(GLsizei n, const GLuint* framebuffers);
   void GenRenderbuffersHelper(GLsizei n, const GLuint* renderbuffers);
   void GenTexturesHelper(GLsizei n, const GLuint* textures);
   void GenVertexArraysOESHelper(GLsizei n, const GLuint* arrays);
   void GenQueriesEXTHelper(GLsizei n, const GLuint* queries);
   void GenSamplersHelper(GLsizei n, const GLuint* samplers);
   void GenTransformFeedbacksHelper(GLsizei n, const GLuint* transformfeedbacks);
 
   void DeleteBuffersHelper(GLsizei n, const GLuint* buffers);
   void DeleteFramebuffersHelper(GLsizei n, const GLuint* framebuffers);
   void DeleteRenderbuffersHelper(GLsizei n, const GLuint* renderbuffers);
   void DeleteTexturesHelper(GLsizei n, const GLuint* textures);
   bool DeleteProgramHelper(GLuint program);
   bool DeleteShaderHelper(GLuint shader);
   void DeleteQueriesEXTHelper(GLsizei n, const GLuint* queries);
   void DeleteVertexArraysOESHelper(GLsizei n, const GLuint* arrays);
   void DeleteSamplersHelper(GLsizei n, const GLuint* samplers);
   void DeleteTransformFeedbacksHelper(
       GLsizei n, const GLuint* transformfeedbacks);
   void DeleteSyncHelper(GLsync sync);
 
   void DeleteBuffersStub(GLsizei n, const GLuint* buffers);
-  void DeleteFramebuffersStub(GLsizei n, const GLuint* framebuffers);
   void DeleteRenderbuffersStub(GLsizei n, const GLuint* renderbuffers);
   void DeleteTexturesStub(GLsizei n, const GLuint* textures);
   void DeletePathsCHROMIUMStub(GLuint first_client_id, GLsizei range);
   void DeleteProgramStub(GLsizei n, const GLuint* programs);
   void DeleteShaderStub(GLsizei n, const GLuint* shaders);
-  void DeleteVertexArraysOESStub(GLsizei n, const GLuint* arrays);
   void DeleteSamplersStub(GLsizei n, const GLuint* samplers);
-  void DeleteTransformFeedbacksStub(
-      GLsizei n, const GLuint* transformfeedbacks);
   void DeleteSyncStub(GLsizei n, const GLuint* syncs);
 
   void BufferDataHelper(
       GLenum target, GLsizeiptr size, const void* data, GLenum usage);
   void BufferSubDataHelper(
       GLenum target, GLintptr offset, GLsizeiptr size, const void* data);
   void BufferSubDataHelperImpl(
       GLenum target, GLintptr offset, GLsizeiptr size, const void* data,
       ScopedTransferBufferPtr* buffer);
 
@@ skipping 74 matching lines @@
   bool GetShaderivHelper(GLuint shader, GLenum pname, GLint* params);
   bool GetTexParameterfvHelper(GLenum target, GLenum pname, GLfloat* params);
   bool GetTexParameterivHelper(GLenum target, GLenum pname, GLint* params);
   const GLubyte* GetStringHelper(GLenum name);
 
   bool IsExtensionAvailable(const char* ext);
 
   // Caches certain capabilties state. Return true if cached.
   bool SetCapabilityState(GLenum cap, bool enabled);
 
-  IdHandlerInterface* GetIdHandler(int id_namespace) const;
+  IdHandlerInterface* GetIdHandler(SharedIdNamespaces id_namespace) const;
   RangeIdHandlerInterface* GetRangeIdHandler(int id_namespace) const;
   // IdAllocators for objects that can't be shared among contexts.
-  // For now, used only for Queries. TODO(hj.r.chung) Should be added for
-  // Framebuffer and Vertex array objects.
-  IdAllocator* GetIdAllocator(int id_namespace) const;
+  IdAllocator* GetIdAllocator(IdNamespaces id_namespace) const;
 
   void FinishHelper();
   void FlushHelper();
 
   void RunIfContextNotLost(const base::Closure& callback);
 
   // Validate if an offset is valid, i.e., non-negative and fit into 32-bit.
   // If not, generate an approriate error, and return false.
   bool ValidateOffset(const char* func, GLintptr offset);
 
@@ skipping 164 matching lines @@
 
   typedef std::map<const void*, MappedTexture> MappedTextureMap;
   MappedTextureMap mapped_textures_;
 
   std::unique_ptr<MappedMemoryManager> mapped_memory_;
 
   scoped_refptr<ShareGroup> share_group_;
   ShareGroupContextData share_group_context_data_;
 
   std::unique_ptr<QueryTracker> query_tracker_;
-  std::unique_ptr<IdAllocator> query_id_allocator_;
+  std::unique_ptr<IdAllocator>
+      id_allocators_[static_cast<int>(IdNamespaces::kNumIdNamespaces)];
 
   std::unique_ptr<BufferTracker> buffer_tracker_;
 
   base::Callback<void(const char*, int32_t)> error_message_callback_;
   base::Closure lost_context_callback_;
   bool lost_context_callback_run_ = false;
 
   int current_trace_stack_;
 
   GpuControl* const gpu_control_;
@@ skipping 54 matching lines @@
 
 inline bool GLES2Implementation::GetTexParameterivHelper(
     GLenum /* target */, GLenum /* pname */, GLint* /* params */) {
   return false;
 }
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_