Changes the code to use separate ids namspaces...

gpu/command_buffer/service/program_manager.h

 // Copyright (c) 2010 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_SERVICE_PROGRAM_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 46 matching lines @@
       GLsizei size;
       GLenum type;
       GLint location;
       std::string name;
     };
 
     typedef std::vector<UniformInfo> UniformInfoVector;
     typedef std::vector<VertexAttribInfo> AttribInfoVector;
     typedef std::vector<int> SamplerIndices;
 
-    explicit ProgramInfo(GLuint program_id)
+    explicit ProgramInfo(GLuint service_id)
         : max_attrib_name_length_(0),
           max_uniform_name_length_(0),
-          program_id_(program_id) {
+          service_id_(service_id),
+          valid_(false) {
+    }
+
+    GLuint service_id() const {
+      return service_id_;
     }
 
     const SamplerIndices& sampler_indices() {
       return sampler_indices_;
     }
 
+    // Resets the program after an unsuccessful link.
+    void Reset();
+
+    // Updates the program info after a successful link.
     void Update();
 
     const AttribInfoVector& GetAttribInfos() const {
       return attrib_infos_;
     }
 
     const VertexAttribInfo* GetAttribInfo(GLint index) const {
       return (static_cast<size_t>(index) < attrib_infos_.size()) ?
          &attrib_infos_[index] : NULL;
     }
@@ skipping 10 matching lines @@
 
     // Gets the type of a uniform by location.
     bool GetUniformTypeByLocation(GLint location, GLenum* type) const;
 
     // Sets the sampler values for a uniform.
     // This is safe to call for any location. If the location is not
     // a sampler uniform nothing will happen.
     bool SetSamplers(GLint location, GLsizei count, const GLint* value);
 
     bool IsDeleted() const {
-      return program_id_ == 0;
+      return service_id_ == 0;
     }
 
     void GetProgramiv(GLenum pname, GLint* params);
 
+    bool IsValid() const {
+      return valid_;
+    }
+
    private:
     friend class base::RefCounted<ProgramInfo>;
     friend class ProgramManager;
 
     ~ProgramInfo() { }
 
     void MarkAsDeleted() {
-      program_id_ = 0;
+      service_id_ = 0;
     }
 
     const UniformInfo* AddUniformInfo(
         GLsizei size, GLenum type, GLint location, const std::string& name);
 
     GLsizei max_attrib_name_length_;
 
     AttribInfoVector attrib_infos_;
 
     GLsizei max_uniform_name_length_;
 
     // Uniform info by index.
     UniformInfoVector uniform_infos_;
 
     // Uniform location to index.
     std::vector<GLint> location_to_index_map_;
 
     // The indices of the uniforms that are samplers.
     SamplerIndices sampler_indices_;
 
     // The program this ProgramInfo is tracking.
-    GLuint program_id_;
+    GLuint service_id_;
+
+    // This is true if glLinkProgram was successful.
+    bool valid_;
   };
 
   ProgramManager() { }
 
   // Creates a new program info.
-  void CreateProgramInfo(GLuint program_id);
+  void CreateProgramInfo(GLuint client_id, GLuint service_id);
 
   // Gets a program info
-  ProgramInfo* GetProgramInfo(GLuint program_id);
+  ProgramInfo* GetProgramInfo(GLuint client_id);
 
   // Deletes the program info for the given program.
-  void RemoveProgramInfo(GLuint program_id);
+  void RemoveProgramInfo(GLuint client_id);
 
   // Returns true if prefix is invalid for gl.
   static bool IsInvalidPrefix(const char* name, size_t length);
 
  private:
   // Info for each "successfully linked" program by service side program Id.
   // TODO(gman): Choose a faster container.
   typedef std::map<GLuint, ProgramInfo::Ref> ProgramInfoMap;
   ProgramInfoMap program_infos_;
 
   DISALLOW_COPY_AND_ASSIGN(ProgramManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_