The Shader class now support deferred shader compiling.

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"
@@ skipping 11 matching lines @@
 // 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
   };
 
+  enum ShaderState {
+    kShaderStateWaiting,
+    kShaderStateCompileRequested,
+    kShaderStateCompiled, // Signifies compile happened, not valid compile.
+  };
+
+  void RequestCompile();
+
   void DoCompile(ShaderTranslatorInterface* translator,
                  TranslatedShaderSourceType type);
 
+  ShaderState shader_state() const {
+    return shader_state_;
+  }
+
   GLuint service_id() const {
     return service_id_;
   }
 
   GLenum shader_type() const {
     return shader_type_;
   }
 
   const std::string& source() const {
     return source_;
   }
 
   void set_source(const std::string& source) {
     source_ = source;
   }
 
   const std::string& translated_source() const {
     return translated_source_;
   }
 
-  const std::string& signature_source() const {
-    return signature_source_;
+  const std::string& last_compiled_source() const {
+    return last_compiled_source_;
   }
 
   const sh::Attribute* GetAttribInfo(const std::string& name) const;
   const sh::Uniform* GetUniformInfo(const std::string& name) const;
   const sh::Varying* 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_;
   }
 
   bool valid() const {
-    return valid_;
+    return shader_state_ == kShaderStateCompiled && valid_;
   }
 
   bool IsDeleted() const {
     return service_id_ == 0;
   }
 
   bool InUse() const {
     DCHECK_GE(use_count_, 0);
     return use_count_ != 0;
   }
@@ skipping 37 matching lines @@
 
   Shader(GLuint service_id, GLenum shader_type);
   ~Shader();
 
   void IncUseCount();
   void DecUseCount();
   void MarkAsDeleted();
 
   int use_count_;
 
+  // The current state of the shader.
+  ShaderState shader_state_;
+
   // 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.
   std::string source_;
 
   // The source the last compile used.
-  std::string signature_source_;
+  std::string last_compiled_source_;
 
   // The translated shader source.
   std::string translated_source_;
 
   // The shader translation log.
   std::string log_info_;
 
   // The type info when the shader was last compiled.
   AttributeMap attrib_map_;
   UniformMap uniform_map_;
@@ skipping 50 matching lines @@
   void RemoveShader(Shader* shader);
 
   DISALLOW_COPY_AND_ASSIGN(ShaderManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_SHADER_MANAGER_H_