| Index: gpu/command_buffer/client/program_info_manager.cc
|
| diff --git a/gpu/command_buffer/client/program_info_manager.cc b/gpu/command_buffer/client/program_info_manager.cc
|
| index d854aa01f75065353e52a97b1adc91cef2a65e76..a74b4f030214540185320dd16ecd5b162dd91bb5 100644
|
| --- a/gpu/command_buffer/client/program_info_manager.cc
|
| +++ b/gpu/command_buffer/client/program_info_manager.cc
|
| @@ -19,22 +19,22 @@ class NonCachedProgramInfoManager : public ProgramInfoManager {
|
| NonCachedProgramInfoManager();
|
| virtual ~NonCachedProgramInfoManager();
|
|
|
| - virtual void CreateInfo(GLuint program) OVERRIDE;
|
| + virtual void CreateInfo(GLuint program) override;
|
|
|
| - virtual void DeleteInfo(GLuint program) OVERRIDE;
|
| + virtual void DeleteInfo(GLuint program) override;
|
|
|
| virtual bool GetProgramiv(GLES2Implementation* gl,
|
| GLuint program,
|
| GLenum pname,
|
| - GLint* params) OVERRIDE;
|
| + GLint* params) override;
|
|
|
| virtual GLint GetAttribLocation(GLES2Implementation* gl,
|
| GLuint program,
|
| - const char* name) OVERRIDE;
|
| + const char* name) override;
|
|
|
| virtual GLint GetUniformLocation(GLES2Implementation* gl,
|
| GLuint program,
|
| - const char* name) OVERRIDE;
|
| + const char* name) override;
|
|
|
| virtual bool GetActiveAttrib(GLES2Implementation* gl,
|
| GLuint program,
|
| @@ -43,7 +43,7 @@ class NonCachedProgramInfoManager : public ProgramInfoManager {
|
| GLsizei* length,
|
| GLint* size,
|
| GLenum* type,
|
| - char* name) OVERRIDE;
|
| + char* name) override;
|
|
|
| virtual bool GetActiveUniform(GLES2Implementation* gl,
|
| GLuint program,
|
| @@ -52,7 +52,7 @@ class NonCachedProgramInfoManager : public ProgramInfoManager {
|
| GLsizei* length,
|
| GLint* size,
|
| GLenum* type,
|
| - char* name) OVERRIDE;
|
| + char* name) override;
|
|
|
| };
|
|
|
| @@ -107,22 +107,22 @@ class CachedProgramInfoManager : public ProgramInfoManager {
|
| CachedProgramInfoManager();
|
| virtual ~CachedProgramInfoManager();
|
|
|
| - virtual void CreateInfo(GLuint program) OVERRIDE;
|
| + virtual void CreateInfo(GLuint program) override;
|
|
|
| - virtual void DeleteInfo(GLuint program) OVERRIDE;
|
| + virtual void DeleteInfo(GLuint program) override;
|
|
|
| virtual bool GetProgramiv(GLES2Implementation* gl,
|
| GLuint program,
|
| GLenum pname,
|
| - GLint* params) OVERRIDE;
|
| + GLint* params) override;
|
|
|
| virtual GLint GetAttribLocation(GLES2Implementation* gl,
|
| GLuint program,
|
| - const char* name) OVERRIDE;
|
| + const char* name) override;
|
|
|
| virtual GLint GetUniformLocation(GLES2Implementation* gl,
|
| GLuint program,
|
| - const char* name) OVERRIDE;
|
| + const char* name) override;
|
|
|
| virtual bool GetActiveAttrib(GLES2Implementation* gl,
|
| GLuint program,
|
| @@ -131,7 +131,7 @@ class CachedProgramInfoManager : public ProgramInfoManager {
|
| GLsizei* length,
|
| GLint* size,
|
| GLenum* type,
|
| - char* name) OVERRIDE;
|
| + char* name) override;
|
|
|
| virtual bool GetActiveUniform(GLES2Implementation* gl,
|
| GLuint program,
|
| @@ -140,7 +140,7 @@ class CachedProgramInfoManager : public ProgramInfoManager {
|
| GLsizei* length,
|
| GLint* size,
|
| GLenum* type,
|
| - char* name) OVERRIDE;
|
| + char* name) override;
|
|
|
| private:
|
| class Program {
|
|
|