Add glBindUniformLocationCHROMIUM

gpu/command_buffer/service/program_manager.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_SERVICE_PROGRAM_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 18 matching lines @@
   // This is used to track which attributes a particular program needs
   // so we can verify at glDrawXXX time that every attribute is either disabled
   // or if enabled that it points to a valid source.
   class GPU_EXPORT ProgramInfo : public base::RefCounted<ProgramInfo> {
    public:
     typedef scoped_refptr<ProgramInfo> Ref;
 
     static const int kMaxAttachedShaders = 2;
 
     struct UniformInfo {
+      UniformInfo();
       UniformInfo(
           GLsizei _size, GLenum _type, GLint _fake_location_base,
           const std::string& _name);
       ~UniformInfo();
 
+      bool IsValid() const {
+        return size != 0;
+      }
+
       bool IsSampler() const {
         return type == GL_SAMPLER_2D || type == GL_SAMPLER_2D_RECT_ARB ||
                type == GL_SAMPLER_CUBE || type == GL_SAMPLER_EXTERNAL_OES;
       }
 
       GLsizei size;
       GLenum type;
       GLint fake_location_base;
       bool is_array;
       std::string name;
@@ skipping 42 matching lines @@
     const VertexAttribInfo* GetAttribInfoByLocation(GLuint location) const {
       if (location < attrib_location_to_index_map_.size()) {
         GLint index = attrib_location_to_index_map_[location];
         if (index >= 0) {
           return &attrib_infos_[index];
         }
       }
       return NULL;
     }
 
-    const UniformInfo* GetUniformInfo(GLint index) const {
-      return (static_cast<size_t>(index) < uniform_infos_.size()) ?
-         &uniform_infos_[index] : NULL;
-    }
+    const UniformInfo* GetUniformInfo(GLint index) const;
 
     // If the original name is not found, return NULL.
     const std::string* GetAttribMappedName(
         const std::string& original_name) const;
 
     // Gets the fake location of a uniform by name.
     GLint GetUniformFakeLocation(const std::string& name) const;
 
     // Gets the UniformInfo of a uniform by location.
     const UniformInfo* GetUniformInfoByFakeLocation(
@@ skipping 36 matching lines @@
     const std::string* log_info() const {
       return log_info_.get();
     }
 
     bool InUse() const {
       DCHECK_GE(use_count_, 0);
       return use_count_ != 0;
     }
 
     // Sets attribute-location binding from a glBindAttribLocation() call.
-    void SetAttribLocationBinding(const std::string& attrib,
-                                  GLint location) {
+    void SetAttribLocationBinding(const std::string& attrib, GLint location) {
       bind_attrib_location_map_[attrib] = location;
     }
 
+    // Sets uniform-location binding from a glBindUniformLocationCHROMIUM call.
+    // returns false if error.
+    bool SetUniformLocationBinding(const std::string& name, GLint location);
+
     // Detects if there are attribute location conflicts from
     // glBindAttribLocation() calls.
     // We only consider the declared attributes in the program.
     bool DetectAttribLocationBindingConflicts() const;
 
    private:
     friend class base::RefCounted<ProgramInfo>;
     friend class ProgramManager;
 
+    typedef std::map<std::string, GLint> LocationMap;
+
     ~ProgramInfo();
 
     void set_log_info(const char* str) {
       log_info_.reset(str ? new std::string(str) : NULL);
     }
 
     void ClearLinkStatus() {
       link_status_ = false;
     }
 
@@ skipping 22 matching lines @@
 
     // Clears all the uniforms.
     void ClearUniforms(std::vector<uint8>* zero_buffer);
 
     // If long attribate names are mapped during shader translation, call
     // glBindAttribLocation() again with the mapped names.
     // This is called right before the glLink() call, but after shaders are
     // translated.
     void ExecuteBindAttribLocationCalls();
 
-    const UniformInfo* AddUniformInfo(
-        GLsizei size, GLenum type, GLint location,
-        const std::string& name, const std::string& original_name);
+    bool AddUniformInfo(
+        GLsizei size, GLenum type, GLint location, GLint fake_base_location,
+        const std::string& name, const std::string& original_name,
+        size_t* next_available_index);
 
     void GetCorrectedVariableInfo(
         bool use_uniforms, const std::string& name, std::string* corrected_name,
         std::string* original_name, GLsizei* size, GLenum* type) const;
 
     void DetachShaders(ShaderManager* manager);
 
     static inline GLint GetUniformInfoIndexFromFakeLocation(
         GLint fake_location) {
       return fake_location & 0xFFFF;
@@ skipping 35 matching lines @@
 
     // This is true if glLinkProgram was successful at least once.
     bool valid_;
 
     // This is true if glLinkProgram was successful last time it was called.
     bool link_status_;
 
     // True if the uniforms have been cleared.
     bool uniforms_cleared_;
 
+    // This is different than uniform_infos_.size() because
+    // that is a sparce array.
+    GLint num_uniforms_;
+
     // Log info
     scoped_ptr<std::string> log_info_;
 
     // attribute-location binding map from glBindAttribLocation() calls.
-    std::map<std::string, GLint> bind_attrib_location_map_;
+    LocationMap bind_attrib_location_map_;
+
+    // uniform-location binding map from glBindUniformLocationCHROMIUM() calls.
+    LocationMap bind_uniform_location_map_;
   };
 
   ProgramManager();
   ~ProgramManager();
 
   // Must call before destruction.
   void Destroy(bool have_context);
 
   // Creates a new program info.
   ProgramInfo* CreateProgramInfo(GLuint client_id, GLuint service_id);
@@ skipping 15 matching lines @@
 
   // Clears the uniforms for this program.
   void ClearUniforms(ProgramInfo* info);
 
   // Returns true if prefix is invalid for gl.
   static bool IsInvalidPrefix(const char* name, size_t length);
 
   // Check if a ProgramInfo is owned by this ProgramManager.
   bool IsOwned(ProgramInfo* info);
 
+  static int32 MakeFakeLocation(int32 index, int32 element);
+
  private:
   void StartTracking(ProgramInfo* info);
   void StopTracking(ProgramInfo* info);
 
   // 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_;
 
   // Counts the number of ProgramInfo allocated with 'this' as its manager.
@@ skipping 10 matching lines @@
   void RemoveProgramInfoIfUnused(
       ShaderManager* shader_manager, ProgramInfo* info);
 
   DISALLOW_COPY_AND_ASSIGN(ProgramManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_