cc: Always log shader compiler errors

cc/output/program_binding.h

 // Copyright 2011 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 CC_OUTPUT_PROGRAM_BINDING_H_
 #define CC_OUTPUT_PROGRAM_BINDING_H_
 
 #include <string>
 
 #include "base/logging.h"
@@ skipping 14 matching lines @@
 namespace cc {
 
 class ProgramBindingBase {
  public:
   ProgramBindingBase();
   ~ProgramBindingBase();
 
   bool Init(gpu::gles2::GLES2Interface* context,
             const std::string& vertex_shader,
             const std::string& fragment_shader);
-  bool Link(gpu::gles2::GLES2Interface* context);
+  bool Link(gpu::gles2::GLES2Interface* context,
+            const std::string& vertex_source,
+            const std::string& fragment_source);
   void Cleanup(gpu::gles2::GLES2Interface* context);
 
   unsigned program() const { return program_; }
   bool initialized() const { return initialized_; }
 
  protected:
   unsigned LoadShader(gpu::gles2::GLES2Interface* context,
                       unsigned type,
                       const std::string& shader_source);
   unsigned CreateShaderProgram(gpu::gles2::GLES2Interface* context,
@@ skipping 350 matching lines @@
     fragment_shader_.uv_texture_mode_ = key.uv_texture_mode_;
   }
 
   void InitializeInternal(ContextProvider* context_provider) {
     DCHECK(context_provider);
     DCHECK(!initialized_);
 
     if (IsContextLost(context_provider->ContextGL()))
       return;
 
-    if (!ProgramBindingBase::Init(context_provider->ContextGL(),
-                                  vertex_shader_.GetShaderString(),
-                                  fragment_shader_.GetShaderString())) {
+    std::string vertex_source = vertex_shader_.GetShaderString();
+    std::string fragment_source = fragment_shader_.GetShaderString();
+    if (!ProgramBindingBase::Init(context_provider->ContextGL(), vertex_source,
+                                  fragment_source)) {
       DCHECK(IsContextLost(context_provider->ContextGL()));
       return;
     }
 
     int base_uniform_index = 0;
     vertex_shader_.Init(context_provider->ContextGL(),
                         program_, &base_uniform_index);
     fragment_shader_.Init(context_provider->ContextGL(),
                           program_, &base_uniform_index);
 
     // Link after binding uniforms
-    if (!Link(context_provider->ContextGL())) {
+    if (!Link(context_provider->ContextGL(), vertex_source, fragment_source)) {
       DCHECK(IsContextLost(context_provider->ContextGL()));
       return;
     }
 
     initialized_ = true;
   }
 
   VertexShader vertex_shader_;
   FragmentShader fragment_shader_;
 
   DISALLOW_COPY_AND_ASSIGN(Program);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_PROGRAM_BINDING_H_