Revert 147328 - Current status of patch:

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>
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/common_decoder.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/shader_manager.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
 namespace gles2 {
-class ProgramCache;
-class FeatureInfo;
 
 // Tracks the Programs.
 //
 // NOTE: To support shared resources an instance of this class will
 // need to be shared by multiple GLES2Decoders.
 class GPU_EXPORT ProgramManager {
  public:
-  typedef std::map<std::string, GLint> LocationMap;
-
   // 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 {
@@ skipping 104 matching lines @@
     bool IsValid() const {
       return valid_;
     }
 
     bool AttachShader(ShaderManager* manager, ShaderManager::ShaderInfo* info);
     bool DetachShader(ShaderManager* manager, ShaderManager::ShaderInfo* info);
 
     bool CanLink() const;
 
     // Performs glLinkProgram and related activities.
-    bool Link(ShaderManager* manager,
-              ShaderTranslator* vertex_translator,
-              ShaderTranslator* fragment_shader,
-              FeatureInfo* feature_info);
+    bool Link();
 
     // Performs glValidateProgram and related activities.
     void Validate();
 
     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) {
       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;
 
-    // Visible for testing
-    const LocationMap& bind_attrib_location_map() const {
-      return bind_attrib_location_map_;
-    }
-
    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 95 matching lines @@
     // Log info
     scoped_ptr<std::string> log_info_;
 
     // attribute-location binding map from glBindAttribLocation() calls.
     LocationMap bind_attrib_location_map_;
 
     // uniform-location binding map from glBindUniformLocationCHROMIUM() calls.
     LocationMap bind_uniform_location_map_;
   };
 
-  explicit ProgramManager(ProgramCache* program_cache);
+  ProgramManager();
   ~ProgramManager();
 
   // Must call before destruction.
   void Destroy(bool have_context);
 
   // Creates a new program info.
   ProgramInfo* CreateProgramInfo(GLuint client_id, GLuint service_id);
 
   // Gets a program info
   ProgramInfo* GetProgramInfo(GLuint client_id);
 
   // Gets a client id for a given service id.
   bool GetClientId(GLuint service_id, GLuint* client_id) const;
 
-  // Gets the shader cache
-  ProgramCache* program_cache() const;
-
   // Marks a program as deleted. If it is not used the info will be deleted.
   void MarkAsDeleted(ShaderManager* shader_manager, ProgramInfo* info);
 
   // Marks a program as used.
   void UseProgram(ProgramInfo* info);
 
   // Makes a program as unused. If deleted the program info will be removed.
   void UnuseProgram(ShaderManager* shader_manager, ProgramInfo* info);
 
   // 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);
 
-  // Cache-aware shader compiling.  If no cache or if the shader wasn't
-  // previously compiled, ForceCompileShader is called
-  void DoCompileShader(ShaderManager::ShaderInfo* info,
-                       ShaderTranslator* translator,
-                       FeatureInfo* feature_info);
-
  private:
-  // Actually compiles the shader
-  void ForceCompileShader(const std::string* source,
-                          ShaderManager::ShaderInfo* info,
-                          ShaderTranslator* translator,
-                          FeatureInfo* feature_info);
-
   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.
   // Allows to check no ProgramInfo will outlive this.
   unsigned int program_info_count_;
 
   bool have_context_;
 
   bool disable_workarounds_;
 
   // Used to clear uniforms.
   std::vector<uint8> zero_;
 
-  ProgramCache* program_cache_;
-
   void RemoveProgramInfoIfUnused(
       ShaderManager* shader_manager, ProgramInfo* info);
 
   DISALLOW_COPY_AND_ASSIGN(ProgramManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_