| Index: cc/output/program_binding.h
|
| diff --git a/cc/output/program_binding.h b/cc/output/program_binding.h
|
| index ce45f2692ad4340eecf56832b1820ff447af70f7..6f1bc9148752f4b58a130a81eaf0e2871a9fb9a1 100644
|
| --- a/cc/output/program_binding.h
|
| +++ b/cc/output/program_binding.h
|
| @@ -32,9 +32,7 @@
|
| bool Init(gpu::gles2::GLES2Interface* context,
|
| const std::string& vertex_shader,
|
| const std::string& fragment_shader);
|
| - bool Link(gpu::gles2::GLES2Interface* context,
|
| - const std::string& vertex_source,
|
| - const std::string& fragment_source);
|
| + bool Link(gpu::gles2::GLES2Interface* context);
|
| void Cleanup(gpu::gles2::GLES2Interface* context);
|
|
|
| unsigned program() const { return program_; }
|
| @@ -405,10 +403,9 @@
|
| if (IsContextLost(context_provider->ContextGL()))
|
| return;
|
|
|
| - std::string vertex_source = vertex_shader_.GetShaderString();
|
| - std::string fragment_source = fragment_shader_.GetShaderString();
|
| - if (!ProgramBindingBase::Init(context_provider->ContextGL(), vertex_source,
|
| - fragment_source)) {
|
| + if (!ProgramBindingBase::Init(context_provider->ContextGL(),
|
| + vertex_shader_.GetShaderString(),
|
| + fragment_shader_.GetShaderString())) {
|
| DCHECK(IsContextLost(context_provider->ContextGL()));
|
| return;
|
| }
|
| @@ -420,7 +417,7 @@
|
| program_, &base_uniform_index);
|
|
|
| // Link after binding uniforms
|
| - if (!Link(context_provider->ContextGL(), vertex_source, fragment_source)) {
|
| + if (!Link(context_provider->ContextGL())) {
|
| DCHECK(IsContextLost(context_provider->ContextGL()));
|
| return;
|
| }
|
|
|