Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2085)

Unified Diff: gpu/command_buffer/client/program_info_manager.cc

Issue 663363002: Standardize usage of virtual/override/final in gpu/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update generator script Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 {
« no previous file with comments | « gpu/command_buffer/client/gles2_trace_implementation_autogen.h ('k') | gpu/command_buffer/client/share_group.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698