From e63ffef6248bd103b5f7827f1e4bc75e47ca9e20 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Fri, 5 Feb 2016 07:17:34 -0800 Subject: Remove deferred clear from SkGpuDevice Add combining to GrClearBatch Fix issue with state tracking in GrGLGpu::createTestingOnlyBackendTexture Add tests for clearing GPU SkSurfaces and add tests for GrDrawContext::clear(). Add comment that SkCanvas::flush will resolve the RT in the GPU case. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1658823002 Review URL: https://codereview.chromium.org/1658823002 --- src/gpu/gl/GrGLGpu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gpu/gl/GrGLGpu.h') diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/gl/GrGLGpu.h index 6f194dcd6c..62330480e6 100644 --- a/src/gpu/gl/GrGLGpu.h +++ b/src/gpu/gl/GrGLGpu.h @@ -126,9 +126,9 @@ public: int height) override; GrBackendObject createTestingOnlyBackendTexture(void* pixels, int w, int h, - GrPixelConfig config) const override; + GrPixelConfig config) override; bool isTestingOnlyBackendTexture(GrBackendObject) const override; - void deleteTestingOnlyBackendTexture(GrBackendObject, bool abandonTexture) const override; + void deleteTestingOnlyBackendTexture(GrBackendObject, bool abandonTexture) override; void resetShaderCacheForTesting() const override; -- cgit v1.2.3