Make shader and program object lifetimes match OpenGL ES spec....

gpu/command_buffer/client/gles2_implementation.cc

 // Copyright (c) 2009 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.
 
 // A class to emluate GLES2 over command buffers.
 
 #include "../client/gles2_implementation.h"
 #include <GLES2/gles2_command_buffer.h>
 #include "../client/mapped_memory.h"
 #include "../common/gles2_cmd_utils.h"
@@ skipping 41 matching lines @@
   }
 
   // Overridden from IdHandlerInterface.
   virtual bool MarkAsUsedForBind(GLuint id) {
     return id == 0 ? true : id_allocator_.MarkAsUsed(id);
   }
  private:
   IdAllocator id_allocator_;
 };
 
+// An id handler for non-shared ids that are never reused.
+class NonSharedNonReusedIdHandler : public IdHandlerInterface {
+ public:
+  NonSharedNonReusedIdHandler() : last_id_(0) { }
+  virtual ~NonSharedNonReusedIdHandler() { }
+
+  // Overridden from IdHandlerInterface.
+  virtual void MakeIds(GLuint id_offset, GLsizei n, GLuint* ids) {
+    for (GLsizei ii = 0; ii < n; ++ii) {
+      ids[ii] = ++last_id_ + id_offset;
+    }
+  }
+
+  // Overridden from IdHandlerInterface.
+  virtual void FreeIds(GLsizei /* n */, const GLuint* /* ids */) {
+    // Ids are never freed.
+  }
+
+  // Overridden from IdHandlerInterface.
+  virtual bool MarkAsUsedForBind(GLuint /* id */) {
+    // This is only used for Shaders and Programs which have no bind.
+    return false;
+  }
+
+ private:
+  GLuint last_id_;
+};
+
 // An id handler for shared ids.
 class SharedIdHandler : public IdHandlerInterface {
  public:
   SharedIdHandler(
     GLES2Implementation* gles2,
     id_namespaces::IdNamespaces id_namespace)
       : gles2_(gles2),
         id_namespace_(id_namespace) {
   }
 
@@ skipping 360 matching lines @@
     renderbuffer_id_handler_.reset(
         new SharedIdHandler(this, id_namespaces::kRenderbuffers));
     program_and_shader_id_handler_.reset(
         new SharedIdHandler(this, id_namespaces::kProgramsAndShaders));
     texture_id_handler_.reset(
         new SharedIdHandler(this, id_namespaces::kTextures));
   } else {
     buffer_id_handler_.reset(new NonSharedIdHandler());
     framebuffer_id_handler_.reset(new NonSharedIdHandler());
     renderbuffer_id_handler_.reset(new NonSharedIdHandler());
-    program_and_shader_id_handler_.reset(new NonSharedIdHandler());
+    program_and_shader_id_handler_.reset(new NonSharedNonReusedIdHandler());
     texture_id_handler_.reset(new NonSharedIdHandler());
   }
 
 #if defined(GLES2_SUPPORT_CLIENT_SIDE_BUFFERS)
   GLint max_vertex_attribs;
   GetIntegerv(GL_MAX_VERTEX_ATTRIBS, &max_vertex_attribs);
 
   buffer_id_handler_->MakeIds(
       kClientSideArrayId, arraysize(reserved_ids_), &reserved_ids_[0]);
 
@@ skipping 1160 matching lines @@
 }
 
 void GLES2Implementation::RequestExtensionCHROMIUM(const char* extension) {
   SetBucketAsCString(kResultBucketId, extension);
   helper_->RequestExtensionCHROMIUM(kResultBucketId);
   helper_->SetBucketSize(kResultBucketId, 0);
 }
 
 }  // namespace gles2
 }  // namespace gpu