| Index: gpu/command_buffer/service/program_manager.cc
|
| diff --git a/gpu/command_buffer/service/program_manager.cc b/gpu/command_buffer/service/program_manager.cc
|
| index 747d1578edb88687267868eb1908e373638c7ad1..5c31f14cbdec716e8713e777a0c78b7db8a67b52 100644
|
| --- a/gpu/command_buffer/service/program_manager.cc
|
| +++ b/gpu/command_buffer/service/program_manager.cc
|
| @@ -445,8 +445,8 @@ void ProgramManager::DoCompileShader(Shader* shader,
|
| FeatureInfo* feature_info) {
|
| TimeTicks before = TimeTicks::HighResNow();
|
| if (program_cache_ &&
|
| - program_cache_->GetShaderCompilationStatus(shader->source() ?
|
| - *shader->source() : "") ==
|
| + program_cache_->GetShaderCompilationStatus(
|
| + shader->source() ? *shader->source() : std::string()) ==
|
| ProgramCache::COMPILATION_SUCCEEDED) {
|
| shader->SetStatus(true, "", translator);
|
| shader->FlagSourceAsCompiled(false);
|
| @@ -525,9 +525,9 @@ void ProgramManager::ForceCompileShader(const std::string* source,
|
| LOG_IF(ERROR, translator)
|
| << "Shader translator allowed/produced an invalid shader "
|
| << "unless the driver is buggy:"
|
| - << "\n--original-shader--\n" << (source ? *source : "")
|
| - << "\n--translated-shader--\n" << shader_src
|
| - << "\n--info-log--\n" << *shader->log_info();
|
| + << "\n--original-shader--\n" << (source ? *source : std::string())
|
| + << "\n--translated-shader--\n" << shader_src << "\n--info-log--\n"
|
| + << *shader->log_info();
|
| }
|
| }
|
|
|
|
|