From 1119dc366e15ef737d05d3a087410ea40c508101 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Tue, 11 Apr 2017 12:54:57 -0400 Subject: Remove discard from GrRenderTarget & force it to always go through a RenderTargetContext This is a bit sloppy in that it ignores some instances where discards were being issued before. The creation of the temp RTContext in the RenderTarget's discard method was causing an extra split in the opLists. This is split out of: https://skia-review.googlesource.com/c/10284/ (Omnibus: Remove GrSurface-derived classes from ops) Change-Id: Ic366d303280635763b0fae238c4df37c04fb8503 Reviewed-on: https://skia-review.googlesource.com/11125 Commit-Queue: Robert Phillips Reviewed-by: Brian Salomon --- tests/RenderTargetContextTest.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tests/RenderTargetContextTest.cpp') diff --git a/tests/RenderTargetContextTest.cpp b/tests/RenderTargetContextTest.cpp index 3db0473b62..760b258d07 100644 --- a/tests/RenderTargetContextTest.cpp +++ b/tests/RenderTargetContextTest.cpp @@ -9,6 +9,11 @@ #include "Test.h" +// MDB TODO: With the move of the discard calls to the RenderTargetContext, deferred RTCs are being +// instantiated early. This test can be re-enabled once discards do not force an instantiation +// (i.e., when renderTargetProxies carry the op IORefs) +#if 0 + #if SK_SUPPORT_GPU #include "GrTextureProxy.h" #include "GrRenderTargetContext.h" @@ -85,3 +90,4 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(RenderTargetContextTest, reporter, ctxInfo) { // GrRenderTargetContext } #endif +#endif -- cgit v1.2.3