From d195bafa7b5ba5798253db60ff5f50c5154a6823 Mon Sep 17 00:00:00 2001 From: senorblanco Date: Tue, 26 Jan 2016 15:27:28 -0800 Subject: cc: remove unused texture rect params, functions. Looks like the target_rect param to BindFramebufferToTexture is now unused. And it looks like UseScopedTexture is entirely unused. Remove them both. BUG= CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1633283002 Cr-Commit-Position: refs/heads/master@{#371632} --- cc/output/direct_renderer.cc | 2 +- cc/output/direct_renderer.h | 3 +-- cc/output/gl_renderer.cc | 13 +------------ cc/output/gl_renderer.h | 7 +------ cc/output/software_renderer.cc | 3 +-- cc/output/software_renderer.h | 3 +-- 6 files changed, 6 insertions(+), 25 deletions(-) (limited to 'cc/output') diff --git a/cc/output/direct_renderer.cc b/cc/output/direct_renderer.cc index 3a10cbe..ede93ab 100644 --- a/cc/output/direct_renderer.cc +++ b/cc/output/direct_renderer.cc @@ -547,7 +547,7 @@ bool DirectRenderer::UseRenderPass(DrawingFrame* frame, } DCHECK(texture->id()); - if (BindFramebufferToTexture(frame, texture, render_pass->output_rect)) { + if (BindFramebufferToTexture(frame, texture)) { InitializeViewport(frame, render_pass->output_rect, gfx::Rect(render_pass->output_rect.size()), render_pass->output_rect.size()); diff --git a/cc/output/direct_renderer.h b/cc/output/direct_renderer.h index cf05af4..2f6736f 100644 --- a/cc/output/direct_renderer.h +++ b/cc/output/direct_renderer.h @@ -115,8 +115,7 @@ class CC_EXPORT DirectRenderer : public Renderer { virtual void BindFramebufferToOutputSurface(DrawingFrame* frame) = 0; virtual bool BindFramebufferToTexture(DrawingFrame* frame, - const ScopedResource* resource, - const gfx::Rect& target_rect) = 0; + const ScopedResource* resource) = 0; virtual void SetScissorTestRect(const gfx::Rect& scissor_rect) = 0; virtual void PrepareSurfaceForPass( DrawingFrame* frame, diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc index 4dd3bde..7ba415c 100644 --- a/cc/output/gl_renderer.cc +++ b/cc/output/gl_renderer.cc @@ -2946,16 +2946,6 @@ void GLRenderer::GetFramebufferTexture(unsigned texture_id, gl_->BindTexture(GL_TEXTURE_2D, 0); } -bool GLRenderer::UseScopedTexture(DrawingFrame* frame, - const ScopedResource* texture, - const gfx::Rect& viewport_rect) { - DCHECK(texture->id()); - frame->current_render_pass = NULL; - frame->current_texture = texture; - - return BindFramebufferToTexture(frame, texture, viewport_rect); -} - void GLRenderer::BindFramebufferToOutputSurface(DrawingFrame* frame) { current_framebuffer_lock_ = nullptr; output_surface_->BindFramebuffer(); @@ -2969,8 +2959,7 @@ void GLRenderer::BindFramebufferToOutputSurface(DrawingFrame* frame) { } bool GLRenderer::BindFramebufferToTexture(DrawingFrame* frame, - const ScopedResource* texture, - const gfx::Rect& target_rect) { + const ScopedResource* texture) { DCHECK(texture->id()); // Explicitly release lock, otherwise we can crash when try to lock diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h index dc3b6dd..321c2377 100644 --- a/cc/output/gl_renderer.h +++ b/cc/output/gl_renderer.h @@ -102,8 +102,7 @@ class CC_EXPORT GLRenderer : public DirectRenderer { void BindFramebufferToOutputSurface(DrawingFrame* frame) override; bool BindFramebufferToTexture(DrawingFrame* frame, - const ScopedResource* resource, - const gfx::Rect& target_rect) override; + const ScopedResource* resource) override; void SetScissorTestRect(const gfx::Rect& scissor_rect) override; void PrepareSurfaceForPass(DrawingFrame* frame, SurfaceInitializationMode initialization_mode, @@ -236,10 +235,6 @@ class CC_EXPORT GLRenderer : public DirectRenderer { int matrix_location); void SetUseProgram(unsigned program); - bool UseScopedTexture(DrawingFrame* frame, - const ScopedResource* resource, - const gfx::Rect& viewport_rect); - bool MakeContextCurrent(); void InitializeSharedObjects(); diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc index 99be9ae..f08aa08 100644 --- a/cc/output/software_renderer.cc +++ b/cc/output/software_renderer.cc @@ -143,8 +143,7 @@ void SoftwareRenderer::BindFramebufferToOutputSurface(DrawingFrame* frame) { bool SoftwareRenderer::BindFramebufferToTexture( DrawingFrame* frame, - const ScopedResource* texture, - const gfx::Rect& target_rect) { + const ScopedResource* texture) { DCHECK(texture->id()); // Explicitly release lock, otherwise we can crash when try to lock diff --git a/cc/output/software_renderer.h b/cc/output/software_renderer.h index 19143a5..208b051 100644 --- a/cc/output/software_renderer.h +++ b/cc/output/software_renderer.h @@ -43,8 +43,7 @@ class CC_EXPORT SoftwareRenderer : public DirectRenderer { protected: void BindFramebufferToOutputSurface(DrawingFrame* frame) override; bool BindFramebufferToTexture(DrawingFrame* frame, - const ScopedResource* texture, - const gfx::Rect& target_rect) override; + const ScopedResource* texture) override; void SetScissorTestRect(const gfx::Rect& scissor_rect) override; void PrepareSurfaceForPass(DrawingFrame* frame, SurfaceInitializationMode initialization_mode, -- cgit v1.1