commit 90dce4d38c5ff5333bea97d859d4e484e27edf0c
author Torne (Richard Coles) <torne@google.com> Wed May 29 14:40:03 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Wed May 29 14:40:03 2013 +0100
tree 9c51c7dd97d24b15befa97a3482c51851e5383a1
parent 1515035f5917d10d363b0888a3615d581ad8b83f

Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb

gpu/command_buffer/service/program_cache.h

diff --git a/gpu/command_buffer/service/program_cache.h b/gpu/command_buffer/service/program_cache.h
index c4b50e8..c42d359 100644
--- a/gpu/command_buffer/service/program_cache.h
+++ b/gpu/command_buffer/service/program_cache.h
@@ -18,6 +18,7 @@
 namespace gles2 {
 
 class Shader;
+class ShaderTranslator;
 
 // Program cache base class for caching linked gpu programs
 class GPU_EXPORT ProgramCache {
@@ -45,13 +46,17 @@
   virtual ~ProgramCache();
 
   CompiledShaderStatus GetShaderCompilationStatus(
-      const std::string& shader_src) const;
-  void ShaderCompilationSucceeded(const std::string& shader_src);
+      const std::string& shader_src,
+      const ShaderTranslatorInterface* translator) const;
+  void ShaderCompilationSucceeded(const std::string& shader_src,
+                                  const ShaderTranslatorInterface* translator);
   void ShaderCompilationSucceededSha(const std::string& sha_string);
 
   LinkedProgramStatus GetLinkedProgramStatus(
-      const std::string& untranslated_a,
-      const std::string& untranslated_b,
+      const std::string& untranslated_shader_a,
+      const ShaderTranslatorInterface* translator_a,
+      const std::string& untranslated_shader_b,
+      const ShaderTranslatorInterface* translator_b,
       const LocationMap* bind_attrib_location_map) const;
 
   // Loads the linked program from the cache.  If the program is not found or
@@ -59,7 +64,9 @@
   virtual ProgramLoadResult LoadLinkedProgram(
       GLuint program,
       Shader* shader_a,
+      const ShaderTranslatorInterface* translator_a,
       Shader* shader_b,
+      const ShaderTranslatorInterface* translator_b,
       const LocationMap* bind_attrib_location_map,
       const ShaderCacheCallback& shader_callback) const = 0;
 
@@ -68,7 +75,9 @@
   virtual void SaveLinkedProgram(
       GLuint program,
       const Shader* shader_a,
+      const ShaderTranslatorInterface* translator_a,
       const Shader* shader_b,
+      const ShaderTranslatorInterface* translator_b,
       const LocationMap* bind_attrib_location_map,
       const ShaderCacheCallback& shader_callback) = 0;
 
@@ -79,7 +88,9 @@
 
   // Only for testing
   void LinkedProgramCacheSuccess(const std::string& shader_a,
+                                 const ShaderTranslatorInterface* translator_a,
                                  const std::string& shader_b,
+                                 const ShaderTranslatorInterface* translator_b,
                                  const LocationMap* bind_attrib_location_map);
 
  protected:
@@ -90,6 +101,7 @@
 
   // result is not null terminated
   void ComputeShaderHash(const std::string& shader,
+                         const ShaderTranslatorInterface* translator,
                          char* result) const;
 
   // result is not null terminated.  hashed shaders are expected to be