diff options
author | junov <junov@chromium.org> | 2015-09-22 09:46:55 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-09-22 16:47:51 +0000 |
commit | e4787c4cc75862dbe9eaf4610284544828c33745 (patch) | |
tree | 74cc6872a4dcc884cde0735d4faa78db08bd1a9e /gpu | |
parent | ca31353e8f739f9759ff6f1fccc3e60d7cb65371 (diff) | |
download | chromium_src-e4787c4cc75862dbe9eaf4610284544828c33745.zip chromium_src-e4787c4cc75862dbe9eaf4610284544828c33745.tar.gz chromium_src-e4787c4cc75862dbe9eaf4610284544828c33745.tar.bz2 |
Removing GL context rate limiting feature and related wrappers
Dead code removal.
BUG=531659
TBR=jamesr@chromium.org, vmiura@chromium.org
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/1341423006
Cr-Commit-Position: refs/heads/master@{#350172}
Diffstat (limited to 'gpu')
12 files changed, 0 insertions, 49 deletions
diff --git a/gpu/GLES2/gl2chromium_autogen.h b/gpu/GLES2/gl2chromium_autogen.h index 810eff8..2e6ed9b 100644 --- a/gpu/GLES2/gl2chromium_autogen.h +++ b/gpu/GLES2/gl2chromium_autogen.h @@ -280,8 +280,6 @@ #define glGetRequestableExtensionsCHROMIUM \ GLES2_GET_FUN(GetRequestableExtensionsCHROMIUM) #define glRequestExtensionCHROMIUM GLES2_GET_FUN(RequestExtensionCHROMIUM) -#define glRateLimitOffscreenContextCHROMIUM \ - GLES2_GET_FUN(RateLimitOffscreenContextCHROMIUM) #define glGetProgramInfoCHROMIUM GLES2_GET_FUN(GetProgramInfoCHROMIUM) #define glGetUniformBlocksCHROMIUM GLES2_GET_FUN(GetUniformBlocksCHROMIUM) #define glGetTransformFeedbackVaryingsCHROMIUM \ diff --git a/gpu/GLES2/gl2extchromium.h b/gpu/GLES2/gl2extchromium.h index f96c930..74988dc 100644 --- a/gpu/GLES2/gl2extchromium.h +++ b/gpu/GLES2/gl2extchromium.h @@ -227,15 +227,6 @@ typedef void (GL_APIENTRYP PFNGLRELEASETEXIMAGE2DCHROMIUMPROC) ( GLenum target, GLint imageId); #endif /* GL_CHROMIUM_texture_from_image */ -/* GL_CHROMIUM_rate_limit_offscreen_context */ -#ifndef GL_CHROMIUM_rate_limit_offscreen_context -#define GL_CHROMIUM_rate_limit_offscreen_context 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glRateLimitOffscreenContextCHROMIUM(); -#endif -typedef void (GL_APIENTRYP PFNGLRATELIMITOFFSCREENCONTEXTCHROMIUMPROC) (); -#endif /* GL_CHROMIUM_rate_limit_offscreen_context */ - /* GL_CHROMIUM_post_sub_buffer */ #ifndef GL_CHROMIUM_post_sub_buffer #define GL_CHROMIUM_post_sub_buffer 1 diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py index 679eeea..d6d81ea 100755 --- a/gpu/command_buffer/build_gles2_cmd_buffer.py +++ b/gpu/command_buffer/build_gles2_cmd_buffer.py @@ -3758,12 +3758,6 @@ _FUNCTION_INFO = { 'extension': 'CHROMIUM_request_extension', 'chromium': True, }, - 'RateLimitOffscreenContextCHROMIUM': { - 'gen_cmd': False, - 'extension': True, - 'chromium': True, - 'client_test': False, - }, 'CreateStreamTextureCHROMIUM': { 'type': 'HandWritten', 'impl_func': False, diff --git a/gpu/command_buffer/client/gles2_c_lib_autogen.h b/gpu/command_buffer/client/gles2_c_lib_autogen.h index 870a4f9..e1ce501 100644 --- a/gpu/command_buffer/client/gles2_c_lib_autogen.h +++ b/gpu/command_buffer/client/gles2_c_lib_autogen.h @@ -1269,9 +1269,6 @@ const GLchar* GL_APIENTRY GLES2GetRequestableExtensionsCHROMIUM() { void GL_APIENTRY GLES2RequestExtensionCHROMIUM(const char* extension) { gles2::GetGLContext()->RequestExtensionCHROMIUM(extension); } -void GL_APIENTRY GLES2RateLimitOffscreenContextCHROMIUM() { - gles2::GetGLContext()->RateLimitOffscreenContextCHROMIUM(); -} void GL_APIENTRY GLES2GetProgramInfoCHROMIUM(GLuint program, GLsizei bufsize, GLsizei* size, @@ -2561,11 +2558,6 @@ extern const NameToFunc g_gles2_function_table[] = { reinterpret_cast<GLES2FunctionPointer>(glRequestExtensionCHROMIUM), }, { - "glRateLimitOffscreenContextCHROMIUM", - reinterpret_cast<GLES2FunctionPointer>( - glRateLimitOffscreenContextCHROMIUM), - }, - { "glGetProgramInfoCHROMIUM", reinterpret_cast<GLES2FunctionPointer>(glGetProgramInfoCHROMIUM), }, diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc index 2bf603b..2b186a4 100644 --- a/gpu/command_buffer/client/gles2_implementation.cc +++ b/gpu/command_buffer/client/gles2_implementation.cc @@ -4655,17 +4655,6 @@ void GLES2Implementation::RequestExtensionCHROMIUM(const char* extension) { } } -void GLES2Implementation::RateLimitOffscreenContextCHROMIUM() { - GPU_CLIENT_SINGLE_THREAD_CHECK(); - GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glRateLimitOffscreenCHROMIUM()"); - // Wait if this would add too many rate limit tokens. - if (rate_limit_tokens_.size() == kMaxSwapBuffers) { - helper_->WaitForToken(rate_limit_tokens_.front()); - rate_limit_tokens_.pop(); - } - rate_limit_tokens_.push(helper_->InsertToken()); -} - void GLES2Implementation::GetProgramInfoCHROMIUMHelper( GLuint program, std::vector<int8>* result) { DCHECK(result); diff --git a/gpu/command_buffer/client/gles2_implementation_autogen.h b/gpu/command_buffer/client/gles2_implementation_autogen.h index 48d2e4f..305f971 100644 --- a/gpu/command_buffer/client/gles2_implementation_autogen.h +++ b/gpu/command_buffer/client/gles2_implementation_autogen.h @@ -876,8 +876,6 @@ const GLchar* GetRequestableExtensionsCHROMIUM() override; void RequestExtensionCHROMIUM(const char* extension) override; -void RateLimitOffscreenContextCHROMIUM() override; - void GetProgramInfoCHROMIUM(GLuint program, GLsizei bufsize, GLsizei* size, diff --git a/gpu/command_buffer/client/gles2_interface_autogen.h b/gpu/command_buffer/client/gles2_interface_autogen.h index be4f4ee..43e3b90 100644 --- a/gpu/command_buffer/client/gles2_interface_autogen.h +++ b/gpu/command_buffer/client/gles2_interface_autogen.h @@ -649,7 +649,6 @@ virtual void ResizeCHROMIUM(GLuint width, GLfloat scale_factor) = 0; virtual const GLchar* GetRequestableExtensionsCHROMIUM() = 0; virtual void RequestExtensionCHROMIUM(const char* extension) = 0; -virtual void RateLimitOffscreenContextCHROMIUM() = 0; virtual void GetProgramInfoCHROMIUM(GLuint program, GLsizei bufsize, GLsizei* size, diff --git a/gpu/command_buffer/client/gles2_interface_stub_autogen.h b/gpu/command_buffer/client/gles2_interface_stub_autogen.h index 321ce34..0d08d67 100644 --- a/gpu/command_buffer/client/gles2_interface_stub_autogen.h +++ b/gpu/command_buffer/client/gles2_interface_stub_autogen.h @@ -626,7 +626,6 @@ void UnmapTexSubImage2DCHROMIUM(const void* mem) override; void ResizeCHROMIUM(GLuint width, GLuint height, GLfloat scale_factor) override; const GLchar* GetRequestableExtensionsCHROMIUM() override; void RequestExtensionCHROMIUM(const char* extension) override; -void RateLimitOffscreenContextCHROMIUM() override; void GetProgramInfoCHROMIUM(GLuint program, GLsizei bufsize, GLsizei* size, diff --git a/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h b/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h index 1318f09..6e30251 100644 --- a/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h +++ b/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h @@ -866,7 +866,6 @@ const GLchar* GLES2InterfaceStub::GetRequestableExtensionsCHROMIUM() { } void GLES2InterfaceStub::RequestExtensionCHROMIUM(const char* /* extension */) { } -void GLES2InterfaceStub::RateLimitOffscreenContextCHROMIUM() {} void GLES2InterfaceStub::GetProgramInfoCHROMIUM(GLuint /* program */, GLsizei /* bufsize */, GLsizei* /* size */, diff --git a/gpu/command_buffer/client/gles2_trace_implementation_autogen.h b/gpu/command_buffer/client/gles2_trace_implementation_autogen.h index 241623d..41140be 100644 --- a/gpu/command_buffer/client/gles2_trace_implementation_autogen.h +++ b/gpu/command_buffer/client/gles2_trace_implementation_autogen.h @@ -626,7 +626,6 @@ void UnmapTexSubImage2DCHROMIUM(const void* mem) override; void ResizeCHROMIUM(GLuint width, GLuint height, GLfloat scale_factor) override; const GLchar* GetRequestableExtensionsCHROMIUM() override; void RequestExtensionCHROMIUM(const char* extension) override; -void RateLimitOffscreenContextCHROMIUM() override; void GetProgramInfoCHROMIUM(GLuint program, GLsizei bufsize, GLsizei* size, diff --git a/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h b/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h index d527fd1..11d76df9 100644 --- a/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h +++ b/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h @@ -1853,12 +1853,6 @@ void GLES2TraceImplementation::RequestExtensionCHROMIUM(const char* extension) { gl_->RequestExtensionCHROMIUM(extension); } -void GLES2TraceImplementation::RateLimitOffscreenContextCHROMIUM() { - TRACE_EVENT_BINARY_EFFICIENT0( - "gpu", "GLES2Trace::RateLimitOffscreenContextCHROMIUM"); - gl_->RateLimitOffscreenContextCHROMIUM(); -} - void GLES2TraceImplementation::GetProgramInfoCHROMIUM(GLuint program, GLsizei bufsize, GLsizei* size, diff --git a/gpu/command_buffer/cmd_buffer_functions.txt b/gpu/command_buffer/cmd_buffer_functions.txt index f355571..9eda893e 100644 --- a/gpu/command_buffer/cmd_buffer_functions.txt +++ b/gpu/command_buffer/cmd_buffer_functions.txt @@ -268,7 +268,6 @@ GL_APICALL void GL_APIENTRY glUnmapTexSubImage2DCHROMIUM (const void* me GL_APICALL void GL_APIENTRY glResizeCHROMIUM (GLuint width, GLuint height, GLfloat scale_factor); GL_APICALL const GLchar* GL_APIENTRY glGetRequestableExtensionsCHROMIUM (void); GL_APICALL void GL_APIENTRY glRequestExtensionCHROMIUM (const char* extension); -GL_APICALL void GL_APIENTRY glRateLimitOffscreenContextCHROMIUM (void); GL_APICALL void GL_APIENTRY glGetProgramInfoCHROMIUM (GLidProgram program, GLsizeiNotNegative bufsize, GLsizei* size, void* info); GL_APICALL void GL_APIENTRY glGetUniformBlocksCHROMIUM (GLidProgram program, GLsizeiNotNegative bufsize, GLsizei* size, void* info); GL_APICALL void GL_APIENTRY glGetTransformFeedbackVaryingsCHROMIUM (GLidProgram program, GLsizeiNotNegative bufsize, GLsizei* size, void* info); |