Make ShareGroup thread safe

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 <GLES2/gl2.h>
 
 #include <map>
 #include <queue>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "../common/gles2_cmd_utils.h"
 #include "../common/scoped_ptr.h"
 #include "../client/ref_counted.h"
 #include "../client/gles2_cmd_helper.h"
 #include "../client/query_tracker.h"
 #include "../client/ring_buffer.h"
+#include "../client/share_group.h"
 #include "gles2_impl_export.h"
 
 #if !defined(NDEBUG) && !defined(__native_client__) && !defined(GLES2_CONFORMANCE_TESTS)  // NOLINT
   #if defined(GLES2_INLINE_OPTIMIZATION)
     // TODO(gman): Replace with macros that work with inline optmization.
     #define GPU_CLIENT_SINGLE_THREAD_CHECK()
     #define GPU_CLIENT_LOG(args)
     #define GPU_CLIENT_LOG_CODE_BLOCK(code)
     #define GPU_CLIENT_DCHECK_CODE_BLOCK(code)
   #else
@@ skipping 44 matching lines @@
 
 namespace gpu {
 
 class MappedMemoryManager;
 class ScopedTransferBufferPtr;
 class TransferBufferInterface;
 
 namespace gles2 {
 
 class ClientSideBufferHelper;
-class ProgramInfoManager;
-class ShareGroup;
-
-// Base class for IdHandlers
-class IdHandlerInterface {
- public:
-  IdHandlerInterface() { }
-  virtual ~IdHandlerInterface() { }
-
-  // Makes some ids at or above id_offset.
-  virtual void MakeIds(GLuint id_offset, GLsizei n, GLuint* ids) = 0;
-
-  // Frees some ids.
-  virtual bool FreeIds(GLsizei n, const GLuint* ids) = 0;
-
-  // Marks an id as used for glBind functions. id = 0 does nothing.
-  virtual bool MarkAsUsedForBind(GLuint id) = 0;
-};
 
 // This class emulates GLES2 over command buffers. It can be used by a client
 // program so that the program does not need deal with shared memory and command
 // buffer management. See gl2_lib.h.  Note that there is a performance gain to
 // be had by changing your code to use command buffers directly by using the
 // GLES2CmdHelper but that entails changing your code to use and deal with
 // shared memory and synchronization issues.
 class GLES2_IMPL_EXPORT GLES2Implementation {
  public:
   class ErrorMessageCallback {
@@ skipping 88 matching lines @@
   void GetProgramInfoCHROMIUMHelper(GLuint program, std::vector<int8>* result);
   GLint GetAttribLocationHelper(GLuint program, const char* name);
   GLint GetUniformLocationHelper(GLuint program, const char* name);
   bool GetActiveAttribHelper(
       GLuint program, GLuint index, GLsizei bufsize, GLsizei* length,
       GLint* size, GLenum* type, char* name);
   bool GetActiveUniformHelper(
       GLuint program, GLuint index, GLsizei bufsize, GLsizei* length,
       GLint* size, GLenum* type, char* name);
 
-  GLuint MakeTextureId() {
-    GLuint id;
-    id_handlers_[id_namespaces::kTextures]->MakeIds(0, 1, &id);
-    return id;
-  }
-
-  void FreeTextureId(GLuint id) {
-    id_handlers_[id_namespaces::kTextures]->FreeIds(1, &id);
-  }
+  GLuint MakeTextureId();
+  void FreeTextureId(GLuint id);
 
   void SetSharedMemoryChunkSizeMultiple(unsigned int multiple);
 
   void FreeUnusedSharedMemory();
   void FreeEverything();
 
   void SetErrorMessageCallback(ErrorMessageCallback* callback) {
     error_message_callback_ = callback;
   }
 
@@ skipping 216 matching lines @@
   bool GetProgramivHelper(GLuint program, GLenum pname, GLint* params);
   bool GetRenderbufferParameterivHelper(
       GLenum target, GLenum pname, GLint* params);
   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);
 
+  IdHandlerInterface* GetIdHandler(int id_namespace) const;
+
   GLES2Util util_;
   GLES2CmdHelper* helper_;
   TransferBufferInterface* transfer_buffer_;
-  scoped_ptr<IdHandlerInterface> id_handlers_[id_namespaces::kNumIdNamespaces];
   std::string last_error_;
 
   std::queue<int32> swap_buffers_tokens_;
   std::queue<int32> rate_limit_tokens_;
 
   ExtensionStatus angle_pack_reverse_row_order_status;
 
   GLState gl_state_;
 
   // pack alignment as last set by glPixelStorei
@@ skipping 31 matching lines @@
   scoped_ptr<ClientSideBufferHelper> client_side_buffer_helper_;
 
   GLuint reserved_ids_[2];
 
   // Current GL error bits.
   uint32 error_bits_;
 
   // Whether or not to print debugging info.
   bool debug_;
 
-  // Whether or not this context is sharing resources.
-  bool sharing_resources_;
-
-  bool bind_generates_resource_;
-
   // Used to check for single threaded access.
   int use_count_;
 
   // Map of GLenum to Strings for glGetString.  We need to cache these because
   // the pointer passed back to the client has to remain valid for eternity.
   typedef std::map<uint32, std::set<std::string> > GLStringMap;
   GLStringMap gl_strings_;
 
   // Similar cache for glGetRequestableExtensionsCHROMIUM. We don't
   // have an enum for this so handle it separately.
   std::set<std::string> requestable_extensions_set_;
 
   typedef std::map<const void*, MappedBuffer> MappedBufferMap;
   MappedBufferMap mapped_buffers_;
 
   typedef std::map<const void*, MappedTexture> MappedTextureMap;
   MappedTextureMap mapped_textures_;
 
   scoped_ptr<MappedMemoryManager> mapped_memory_;
 
-  scoped_ptr<ProgramInfoManager> program_info_manager_;
-
   scoped_refptr<ShareGroup> share_group_;
 
   scoped_ptr<QueryTracker> query_tracker_;
   QueryTracker::Query* current_query_;
 
   ErrorMessageCallback* error_message_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(GLES2Implementation);
 };
 
@@ skipping 27 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_