Clean up interfaces between Shader / ShaderTranslator / ANGLE side.

gpu/command_buffer/service/shader_translator.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_TRANSLATOR_H_
 #define GPU_COMMAND_BUFFER_SERVICE_SHADER_TRANSLATOR_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 56 matching lines @@
   // Must be called once before using the translator object.
   virtual bool Init(
       sh::GLenum shader_type,
       ShShaderSpec shader_spec,
       const ShBuiltInResources* resources,
       GlslImplementationType glsl_implementation_type,
       ShCompileOptions driver_bug_workarounds) = 0;
 
   // Translates the given shader source.
   // Returns true if translation is successful, false otherwise.
-  virtual bool Translate(const char* shader) = 0;
-
-  // The following functions return results from the last translation.
-  // The results are NULL/empty if the translation was unsuccessful.
-  // A valid info-log is always returned irrespective of whether translation
-  // was successful or not.
-  virtual const char* translated_shader() const = 0;
-  virtual const char* info_log() const = 0;
-
-  virtual const VariableMap& attrib_map() const = 0;
-  virtual const VariableMap& uniform_map() const = 0;
-  virtual const VariableMap& varying_map() const = 0;
-  virtual const NameMap& name_map() const = 0;
+  // Always fill |info_log| if it's non-null.
+  // Upon success, fill |translated_shader|, |attrib_map|, |uniform_map|,
+  // |varying_map|, and |name_map| if they are non-null.
+  virtual bool Translate(const std::string& shader_source,
+                         std::string* info_log,
+                         std::string* translated_shader,
+                         VariableMap* attrib_map,
+                         VariableMap* uniform_map,
+                         VariableMap* varying_map,
+                         NameMap* name_map) const = 0;
 
   // Return a string that is unique for a specfic set of options that would
   // possibly affect compilation.
   virtual std::string GetStringForOptionsThatWouldAffectCompilation() const = 0;
 
  protected:
   virtual ~ShaderTranslatorInterface() {}
 };
 
 // Implementation of ShaderTranslatorInterface
@@ skipping 16 matching lines @@
 
   // Overridden from ShaderTranslatorInterface.
   virtual bool Init(
       sh::GLenum shader_type,
       ShShaderSpec shader_spec,
       const ShBuiltInResources* resources,
       GlslImplementationType glsl_implementation_type,
       ShCompileOptions driver_bug_workarounds) OVERRIDE;
 
   // Overridden from ShaderTranslatorInterface.
-  virtual bool Translate(const char* shader) OVERRIDE;
-
-  // Overridden from ShaderTranslatorInterface.
-  virtual const char* translated_shader() const OVERRIDE;
-  virtual const char* info_log() const OVERRIDE;
-
-  // Overridden from ShaderTranslatorInterface.
-  virtual const VariableMap& attrib_map() const OVERRIDE;
-  virtual const VariableMap& uniform_map() const OVERRIDE;
-  virtual const VariableMap& varying_map() const OVERRIDE;
-  virtual const NameMap& name_map() const OVERRIDE;
+  virtual bool Translate(const std::string& shader_source,
+                         std::string* info_log,
+                         std::string* translated_source,
+                         VariableMap* attrib_map,
+                         VariableMap* uniform_map,
+                         VariableMap* varying_map,
+                         NameMap* name_map) const OVERRIDE;
 
   virtual std::string GetStringForOptionsThatWouldAffectCompilation() const
       OVERRIDE;
 
   void AddDestructionObserver(DestructionObserver* observer);
   void RemoveDestructionObserver(DestructionObserver* observer);
 
  private:
   friend class base::RefCounted<ShaderTranslator>;
 
   virtual ~ShaderTranslator();
-  void ClearResults();
   int GetCompileOptions() const;
 
   ShHandle compiler_;
   ShBuiltInResources compiler_options_;
-  scoped_ptr<char[]> translated_shader_;
-  scoped_ptr<char[]> info_log_;
-  VariableMap attrib_map_;
-  VariableMap uniform_map_;
-  VariableMap varying_map_;
-  NameMap name_map_;
   bool implementation_is_glsl_es_;
   ShCompileOptions driver_bug_workarounds_;
   ObserverList<DestructionObserver> destruction_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ShaderTranslator);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_SHADER_TRANSLATOR_H_