commit e40495da3db1805897aeae4931e8c09c3065cbe5
author Robert Phillips <robertphillips@google.com> Tue Jul 20 09:40:13 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 20 17:09:21 2021 +0000
tree 5dcfdd12793d786a7f8eee53ad84a949bc102a58
parent f4bb3d41d3d09b8ead5b9ee4e340530fdf70b75a

Untangle GrSurfaceDrawContext.h, GrTextureOp.h and GrFillRectOp.h

The dependencies between these headers made modifying the SDC and Ops separately somewhat difficult.

Bug: skia:11837
Change-Id: I0c3ca118ce206bf8db5b6753be1ef46531ae1f58
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/430041
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

bench/BulkRectBench.cpp

diff --git a/bench/BulkRectBench.cpp b/bench/BulkRectBench.cpp
index 0941c17..88bf70c 100644
--- a/bench/BulkRectBench.cpp
+++ b/bench/BulkRectBench.cpp
@@ -13,6 +13,7 @@
 #include "include/gpu/GrDirectContext.h"
 #include "include/utils/SkRandom.h"
 #include "src/core/SkCanvasPriv.h"
+#include "src/gpu/GrOpsTypes.h"
 #include "src/gpu/GrSurfaceDrawContext.h"
 #include "src/gpu/SkGr.h"
 
@@ -133,7 +134,7 @@
         auto context = canvas->recordingContext();
         SkASSERT(context);
 
-        GrSurfaceDrawContext::QuadSetEntry batch[kRectCount];
+        GrQuadSetEntry batch[kRectCount];
         for (int i = 0; i < kRectCount; ++i) {
             batch[i].fRect = fRects[i];
             batch[i].fColor = fColors[i].premul();