From 13e6576424317c6c54323a6de34876f44112560e Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 25 Mar 2014 22:07:24 +0000 Subject: Remove forceRenderTargetFlush (unused) R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/210253004 git-svn-id: http://skia.googlecode.com/svn/trunk@13948 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/gpu/GrGpu.cpp | 5 ----- src/gpu/GrGpu.h | 10 ---------- src/gpu/gl/GrGpuGL.cpp | 4 ---- src/gpu/gl/GrGpuGL.h | 2 -- 4 files changed, 21 deletions(-) (limited to 'src') diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp index 328b40ed83..7c694c9dbc 100644 --- a/src/gpu/GrGpu.cpp +++ b/src/gpu/GrGpu.cpp @@ -219,11 +219,6 @@ void GrGpu::clear(const SkIRect* rect, this->onClear(rect, color, canIgnoreRect); } -void GrGpu::forceRenderTargetFlush() { - this->handleDirtyContext(); - this->onForceRenderTargetFlush(); -} - bool GrGpu::readPixels(GrRenderTarget* target, int left, int top, int width, int height, GrPixelConfig config, void* buffer, diff --git a/src/gpu/GrGpu.h b/src/gpu/GrGpu.h index e8ccc26b1d..d73fa59ace 100644 --- a/src/gpu/GrGpu.h +++ b/src/gpu/GrGpu.h @@ -140,13 +140,6 @@ public: */ void resolveRenderTarget(GrRenderTarget* target); - /** - * Ensures that the current render target is actually set in the - * underlying 3D API. Used when client wants to use 3D API to directly - * render to the RT. - */ - void forceRenderTargetFlush(); - /** * Gets a preferred 8888 config to use for writing/reading pixel data to/from a surface with * config surfaceConfig. The returned config must have at least as many bits per channel as the @@ -442,9 +435,6 @@ private: virtual void onGpuDrawPaths(size_t, const GrPath**, const SkMatrix*, SkPath::FillType, SkStrokeRec::Style) = 0; - // overridden by backend-specific derived class to perform flush - virtual void onForceRenderTargetFlush() = 0; - // overridden by backend-specific derived class to perform the read pixels. virtual bool onReadPixels(GrRenderTarget* target, int left, int top, int width, int height, diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index 8c6145a567..dc2ef7d84e 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -1351,10 +1351,6 @@ void GrGpuGL::clearStencilClip(const SkIRect& rect, bool insideClip) { fHWStencilSettings.invalidate(); } -void GrGpuGL::onForceRenderTargetFlush() { - this->flushRenderTarget(&SkIRect::EmptyIRect()); -} - bool GrGpuGL::readPixelsWillPayForYFlip(GrRenderTarget* renderTarget, int left, int top, int width, int height, diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h index 574bf24c09..600b345c4d 100644 --- a/src/gpu/gl/GrGpuGL.h +++ b/src/gpu/gl/GrGpuGL.h @@ -136,8 +136,6 @@ private: virtual void onClear(const SkIRect* rect, GrColor color, bool canIgnoreRect) SK_OVERRIDE; - virtual void onForceRenderTargetFlush() SK_OVERRIDE; - virtual bool onReadPixels(GrRenderTarget* target, int left, int top, int width, int height, -- cgit v1.2.3