| Index: gpu/command_buffer/service/shader_translator.cc
|
| diff --git a/gpu/command_buffer/service/shader_translator.cc b/gpu/command_buffer/service/shader_translator.cc
|
| index a81a2d0067856162eeaa1506bd8a338add86a255..d24a90d35b793d2bada56f476431f82172d4897a 100644
|
| --- a/gpu/command_buffer/service/shader_translator.cc
|
| +++ b/gpu/command_buffer/service/shader_translator.cc
|
| @@ -205,7 +205,7 @@ bool ShaderTranslator::Init(GLenum shader_type,
|
| return compiler_ != NULL;
|
| }
|
|
|
| -int ShaderTranslator::GetCompileOptions() const {
|
| +ShCompileOptions ShaderTranslator::GetCompileOptions() const {
|
| return compile_options_;
|
| }
|
|
|
| @@ -261,7 +261,7 @@ std::string ShaderTranslator::GetStringForOptionsThatWouldAffectCompilation()
|
| const {
|
| DCHECK(compiler_ != NULL);
|
| return std::string(":CompileOptions:" +
|
| - base::IntToString(GetCompileOptions())) +
|
| + base::Uint64ToString(GetCompileOptions())) +
|
| ShGetBuiltInResourcesString(compiler_);
|
| }
|
|
|
|
|