Clean up interfaces between Shader / ShaderTranslator / ANGLE side.

gpu/command_buffer/service/shader_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_SHADER_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_
 
 #include <string>
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/shader_translator.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
 namespace gles2 {
 
 // This is used to keep the source code for a shader. This is because in order
 // to emluate GLES2 the shaders will have to be re-written before passed to
 // the underlying OpenGL. But, when the user calls glGetShaderSource they
 // should get the source they passed in, not the re-written source.
 class GPU_EXPORT Shader : public base::RefCounted<Shader> {
  public:
+  enum TranslatedShaderSourceType {
+    kANGLE,
+    kGL,  // GL or GLES
+  };
+
   typedef ShaderTranslator::VariableInfo VariableInfo;
 
-  void UpdateSource(const char* source) {
-    source_.reset(source ? new std::string(source) : NULL);
-  }
-
-  void UpdateTranslatedSource(const char* translated_source) {
-    translated_source_.reset(
-        translated_source ? new std::string(translated_source) : NULL);
-  }
+  void DoCompile(ShaderTranslatorInterface* translator,
+                 TranslatedShaderSourceType type);
 
   GLuint service_id() const {
     return service_id_;
   }
 
   GLenum shader_type() const {
     return shader_type_;
   }
 
-  const std::string* source() const {
-    return source_.get();
+  const std::string& source() const {
+    return source_;
   }
 
-  const std::string* translated_source() const {
-    return translated_source_.get();
+  void set_source(const std::string& source) {
+    source_ = source;
   }
 
-  const std::string* signature_source() const {
-    return signature_source_.get();
+  const std::string& translated_source() const {
+    return translated_source_;
   }
 
-  void SetStatus(
-      bool valid, const char* log,
-      ShaderTranslatorInterface* translator);
+  const std::string& signature_source() const {
+    return signature_source_;
+  }
 
   const VariableInfo* GetAttribInfo(const std::string& name) const;
   const VariableInfo* GetUniformInfo(const std::string& name) const;
+  const VariableInfo* GetVaryingInfo(const std::string& name) const;
 
   // If the original_name is not found, return NULL.
   const std::string* GetAttribMappedName(
       const std::string& original_name) const;
 
   // If the hashed_name is not found, return NULL.
   const std::string* GetOriginalNameFromHashedName(
       const std::string& hashed_name) const;
 
-  const std::string* log_info() const {
-    return log_info_.get();
+  const std::string& log_info() const {
+    return log_info_;
   }
 
-  bool IsValid() const {
+  bool valid() const {
     return valid_;
   }
 
   bool IsDeleted() const {
     return service_id_ == 0;
   }
 
   bool InUse() const {
     DCHECK_GE(use_count_, 0);
     return use_count_ != 0;
@@ skipping 50 matching lines @@
 
   // The shader this Shader is tracking.
   GLuint service_id_;
   // Type of shader - GL_VERTEX_SHADER or GL_FRAGMENT_SHADER.
   GLenum shader_type_;
 
   // True if compilation succeeded.
   bool valid_;
 
   // The shader source as passed to glShaderSource.
-  scoped_ptr<std::string> source_;
+  std::string source_;
 
   // The source the last compile used.
-  scoped_ptr<std::string> signature_source_;
+  std::string signature_source_;
 
   // The translated shader source.
-  scoped_ptr<std::string> translated_source_;
+  std::string translated_source_;
 
   // The shader translation log.
-  scoped_ptr<std::string> log_info_;
+  std::string log_info_;
 
   // The type info when the shader was last compiled.
   VariableMap attrib_map_;
   VariableMap uniform_map_;
   VariableMap varying_map_;
 
   // The name hashing info when the shader was last compiled.
   NameMap name_map_;
 };
 
@@ skipping 44 matching lines @@
   void RemoveShader(Shader* shader);
 
   DISALLOW_COPY_AND_ASSIGN(ShaderManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_