| 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 a74b4f030214540185320dd16ecd5b162dd91bb5..c0f8600aa87567360a93116217f01e229c93173d 100644
|
| --- a/gpu/command_buffer/client/program_info_manager.cc
|
| +++ b/gpu/command_buffer/client/program_info_manager.cc
|
| @@ -17,43 +17,42 @@ namespace gles2 {
|
| class NonCachedProgramInfoManager : public ProgramInfoManager {
|
| public:
|
| NonCachedProgramInfoManager();
|
| - virtual ~NonCachedProgramInfoManager();
|
| -
|
| - virtual void CreateInfo(GLuint program) override;
|
| -
|
| - virtual void DeleteInfo(GLuint program) override;
|
| -
|
| - virtual bool GetProgramiv(GLES2Implementation* gl,
|
| - GLuint program,
|
| - GLenum pname,
|
| - GLint* params) override;
|
| -
|
| - virtual GLint GetAttribLocation(GLES2Implementation* gl,
|
| - GLuint program,
|
| - const char* name) override;
|
| -
|
| - virtual GLint GetUniformLocation(GLES2Implementation* gl,
|
| - GLuint program,
|
| - const char* name) override;
|
| -
|
| - virtual bool GetActiveAttrib(GLES2Implementation* gl,
|
| - GLuint program,
|
| - GLuint index,
|
| - GLsizei bufsize,
|
| - GLsizei* length,
|
| - GLint* size,
|
| - GLenum* type,
|
| - char* name) override;
|
| -
|
| - virtual bool GetActiveUniform(GLES2Implementation* gl,
|
| - GLuint program,
|
| - GLuint index,
|
| - GLsizei bufsize,
|
| - GLsizei* length,
|
| - GLint* size,
|
| - GLenum* type,
|
| - char* name) override;
|
| -
|
| + ~NonCachedProgramInfoManager() override;
|
| +
|
| + void CreateInfo(GLuint program) override;
|
| +
|
| + void DeleteInfo(GLuint program) override;
|
| +
|
| + bool GetProgramiv(GLES2Implementation* gl,
|
| + GLuint program,
|
| + GLenum pname,
|
| + GLint* params) override;
|
| +
|
| + GLint GetAttribLocation(GLES2Implementation* gl,
|
| + GLuint program,
|
| + const char* name) override;
|
| +
|
| + GLint GetUniformLocation(GLES2Implementation* gl,
|
| + GLuint program,
|
| + const char* name) override;
|
| +
|
| + bool GetActiveAttrib(GLES2Implementation* gl,
|
| + GLuint program,
|
| + GLuint index,
|
| + GLsizei bufsize,
|
| + GLsizei* length,
|
| + GLint* size,
|
| + GLenum* type,
|
| + char* name) override;
|
| +
|
| + bool GetActiveUniform(GLES2Implementation* gl,
|
| + GLuint program,
|
| + GLuint index,
|
| + GLsizei bufsize,
|
| + GLsizei* length,
|
| + GLint* size,
|
| + GLenum* type,
|
| + char* name) override;
|
| };
|
|
|
| NonCachedProgramInfoManager::NonCachedProgramInfoManager() {
|
| @@ -105,42 +104,42 @@ bool NonCachedProgramInfoManager::GetActiveUniform(
|
| class CachedProgramInfoManager : public ProgramInfoManager {
|
| public:
|
| CachedProgramInfoManager();
|
| - virtual ~CachedProgramInfoManager();
|
| -
|
| - virtual void CreateInfo(GLuint program) override;
|
| -
|
| - virtual void DeleteInfo(GLuint program) override;
|
| -
|
| - virtual bool GetProgramiv(GLES2Implementation* gl,
|
| - GLuint program,
|
| - GLenum pname,
|
| - GLint* params) override;
|
| -
|
| - virtual GLint GetAttribLocation(GLES2Implementation* gl,
|
| - GLuint program,
|
| - const char* name) override;
|
| -
|
| - virtual GLint GetUniformLocation(GLES2Implementation* gl,
|
| - GLuint program,
|
| - const char* name) override;
|
| -
|
| - virtual bool GetActiveAttrib(GLES2Implementation* gl,
|
| - GLuint program,
|
| - GLuint index,
|
| - GLsizei bufsize,
|
| - GLsizei* length,
|
| - GLint* size,
|
| - GLenum* type,
|
| - char* name) override;
|
| -
|
| - virtual bool GetActiveUniform(GLES2Implementation* gl,
|
| - GLuint program,
|
| - GLuint index,
|
| - GLsizei bufsize,
|
| - GLsizei* length,
|
| - GLint* size,
|
| - GLenum* type,
|
| - char* name) override;
|
| + ~CachedProgramInfoManager() override;
|
| +
|
| + void CreateInfo(GLuint program) override;
|
| +
|
| + void DeleteInfo(GLuint program) override;
|
| +
|
| + bool GetProgramiv(GLES2Implementation* gl,
|
| + GLuint program,
|
| + GLenum pname,
|
| + GLint* params) override;
|
| +
|
| + GLint GetAttribLocation(GLES2Implementation* gl,
|
| + GLuint program,
|
| + const char* name) override;
|
| +
|
| + GLint GetUniformLocation(GLES2Implementation* gl,
|
| + GLuint program,
|
| + const char* name) override;
|
| +
|
| + bool GetActiveAttrib(GLES2Implementation* gl,
|
| + GLuint program,
|
| + GLuint index,
|
| + GLsizei bufsize,
|
| + GLsizei* length,
|
| + GLint* size,
|
| + GLenum* type,
|
| + char* name) override;
|
| +
|
| + bool GetActiveUniform(GLES2Implementation* gl,
|
| + GLuint program,
|
| + GLuint index,
|
| + GLsizei bufsize,
|
| + GLsizei* length,
|
| + GLint* size,
|
| + GLenum* type,
|
| + char* name) override;
|
|
|
| private:
|
| class Program {
|
|
|