Fix for gl programs. An unsuccessful link should report...

gpu/command_buffer/service/program_manager.h

 // Copyright (c) 2010 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_PROGRAM_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 57 matching lines @@
     explicit ProgramInfo(GLuint service_id);
 
     GLuint service_id() const {
       return service_id_;
     }
 
     const SamplerIndices& sampler_indices() {
       return sampler_indices_;
     }
 
-    // Resets the program after an unsuccessful link.
-    void Reset();
-
     // Updates the program info after a successful link.
     void Update();
 
     // Updates the program log info.
     void UpdateLogInfo();
 
     const AttribInfoVector& GetAttribInfos() const {
       return attrib_infos_;
     }
 
@@ skipping 33 matching lines @@
     bool IsDeleted() const {
       return service_id_ == 0;
     }
 
     void GetProgramiv(GLenum pname, GLint* params);
 
     bool IsValid() const {
       return valid_;
     }
 
+    void ClearLinkStatus() {
+      link_status_ = false;
+    }
+
     bool AttachShader(ShaderManager* manager, ShaderManager::ShaderInfo* info);
     void DetachShader(ShaderManager* manager, ShaderManager::ShaderInfo* info);
 
     bool CanLink() const;
 
     const std::string& log_info() const {
       return log_info_;
     }
 
     void set_log_info(const std::string& str) {
@@ skipping 18 matching lines @@
     void DecUseCount() {
       --use_count_;
       DCHECK_GE(use_count_, 0);
     }
 
     void MarkAsDeleted() {
       DCHECK_NE(service_id_, 0u);
       service_id_ = 0;
     }
 
+    // Resets the program.
+    void Reset();
+
     const UniformInfo* AddUniformInfo(
         GLsizei size, GLenum type, GLint location, const std::string& name);
 
     void GetCorrectedVariableInfo(
         bool use_uniforms, const std::string& name, std::string* corrected_name,
         GLsizei* size, GLenum* type) const;
 
     void DetachShaders(ShaderManager* manager);
 
     int use_count_;
@@ skipping 16 matching lines @@
 
     // The indices of the uniforms that are samplers.
     SamplerIndices sampler_indices_;
 
     // The program this ProgramInfo is tracking.
     GLuint service_id_;
 
     // Shaders by type of shader.
     ShaderManager::ShaderInfo::Ref attached_shaders_[kMaxAttachedShaders];
 
-    // This is true if glLinkProgram was successful.
+    // This is true if glLinkProgram was successful at least once.
     bool valid_;
 
+    // This is true if glLinkProgram was successful last time it was called.
+    bool link_status_;
+
     // Log info
     std::string log_info_;
   };
 
   ProgramManager();
   ~ProgramManager();
 
   // Must call before destruction.
   void Destroy(bool have_context);
 
@@ skipping 27 matching lines @@
   void RemoveProgramInfoIfUnused(
       ShaderManager* shader_manager, ProgramInfo* info);
 
   DISALLOW_COPY_AND_ASSIGN(ProgramManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_