Bug fixes for getTranslatedShader

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/hash_tables.h"
@@ skipping 15 matching lines @@
  public:
   // 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 ShaderInfo : public base::RefCounted<ShaderInfo> {
    public:
     typedef scoped_refptr<ShaderInfo> Ref;
     typedef ShaderTranslator::VariableInfo VariableInfo;
 
+    enum CompilationStatus {
+      NOT_COMPILED,
+      // We're pending compilation for a cache hit with the program cache.
+      PENDING_DEFERRED_COMPILE,
+      COMPILED
+    };
+
     void UpdateSource(const char* source) {
       // If the source is flagged as compiled, then store our previous source
       // for deferred compile and caching.
       if (!deferred_compilation_source_.get()) {
         deferred_compilation_source_.reset(source_.release());
       }
       source_.reset(source ? new std::string(source) : NULL);
-      translated_source_.reset(NULL);
     }
 
     void UpdateTranslatedSource(const char* translated_source) {
       translated_source_.reset(
           translated_source ? new std::string(translated_source) : NULL);
     }
 
     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* translated_source() const {
       return translated_source_.get();
     }
 
     void SetStatus(
         bool valid, const char* log,
         ShaderTranslatorInterface* translator);
 
-    // If the source was actually compiled (compilation wasn't deferred)
-    bool source_compiled() const {
-      return source_compiled_;
+    CompilationStatus compilation_status() const {
+      return compilation_status_;
     }
 
     // The source that was used when the user called CompileShader.
     // This is used for a deferred compile and in the program cache
     const std::string* deferred_compilation_source() const {
       return deferred_compilation_source_.get() != NULL ?
           deferred_compilation_source_.get() :
           source_.get();
     }
 
     // Resets our deferred compilation source and stores if the source was
     // actually compiled, or if we're expecting a cache hit
     void FlagSourceAsCompiled(bool actually_compiled) {
-      source_compiled_ = actually_compiled;
+      compilation_status_ = actually_compiled ?
+          COMPILED :
+          PENDING_DEFERRED_COMPILE;
       deferred_compilation_source_.reset();
     }
 
     const VariableInfo* GetAttribInfo(const std::string& name) const;
     const VariableInfo* GetUniformInfo(const std::string& name) const;
 
     // If the original_name is not found, return NULL.
     const std::string* GetAttribMappedName(
         const std::string& original_name) const;
 
@@ skipping 65 matching lines @@
     // The translated shader source.
     scoped_ptr<std::string> translated_source_;
 
     // The shader translation log.
     scoped_ptr<std::string> log_info_;
 
     // The type info when the shader was last compiled.
     VariableMap attrib_map_;
     VariableMap uniform_map_;
 
-    // If the source was actually compiled (otherwise we're deferring
-    // compilation because of a possible cache hit)
-    bool source_compiled_;
+    // The current compilation status of the shader
+    CompilationStatus compilation_status_;
 
     // Holds on to the source for a deferred compile.
     scoped_ptr<std::string> deferred_compilation_source_;
   };
 
   ShaderManager();
   ~ShaderManager();
 
   // Must call before destruction.
   void Destroy(bool have_context);
@@ skipping 31 matching lines @@
   void RemoveShaderInfoIfUnused(ShaderInfo* info);
 
   DISALLOW_COPY_AND_ASSIGN(ShaderManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_