aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm
diff options
context:
space:
mode:
Diffstat (limited to 'gm')
-rw-r--r--gm/beziereffects.cpp8
-rw-r--r--gm/bigrrectaaeffect.cpp4
-rw-r--r--gm/constcolorprocessor.cpp4
-rw-r--r--gm/convexpolyeffect.cpp4
-rw-r--r--gm/rrects.cpp4
-rw-r--r--gm/texturedomaineffect.cpp4
-rw-r--r--gm/yuvtorgbeffect.cpp6
7 files changed, 17 insertions, 17 deletions
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
index d58e5910b0..f924ee070a 100644
--- a/gm/beziereffects.cpp
+++ b/gm/beziereffects.cpp
@@ -192,8 +192,8 @@ protected:
GrPaint grPaint;
grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc));
- sk_sp<GrDrawBatch> batch = sk_make_sp<BezierCubicOrConicTestBatch>(
- gp, bounds, color, klmEqs, klmSigns[c]);
+ sk_sp<GrDrawOp> batch = sk_make_sp<BezierCubicOrConicTestBatch>(
+ gp, bounds, color, klmEqs, klmSigns[c]);
renderTargetContext->priv().testingOnly_drawBatch(grPaint, batch.get());
}
@@ -324,7 +324,7 @@ protected:
GrPaint grPaint;
grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc));
- sk_sp<GrDrawBatch> batch(
+ sk_sp<GrDrawOp> batch(
new BezierCubicOrConicTestBatch(gp, bounds, color, klmEqs, 1.f));
renderTargetContext->priv().testingOnly_drawBatch(grPaint, batch.get());
@@ -536,7 +536,7 @@ protected:
GrPathUtils::QuadUVMatrix DevToUV(pts);
- sk_sp<GrDrawBatch> batch(new BezierQuadTestBatch(gp, bounds, color, DevToUV));
+ sk_sp<GrDrawOp> batch(new BezierQuadTestBatch(gp, bounds, color, DevToUV));
renderTargetContext->priv().testingOnly_drawBatch(grPaint, batch.get());
}
diff --git a/gm/bigrrectaaeffect.cpp b/gm/bigrrectaaeffect.cpp
index 47e5a73384..b114f49fa4 100644
--- a/gm/bigrrectaaeffect.cpp
+++ b/gm/bigrrectaaeffect.cpp
@@ -10,7 +10,7 @@
#include "GrContext.h"
#include "GrRenderTargetContextPriv.h"
#include "SkRRect.h"
-#include "batches/GrDrawBatch.h"
+#include "batches/GrDrawOp.h"
#include "batches/GrRectBatchFactory.h"
#include "effects/GrRRectEffect.h"
@@ -87,7 +87,7 @@ protected:
SkRect bounds = testBounds;
bounds.offset(SkIntToScalar(x), SkIntToScalar(y));
- sk_sp<GrDrawBatch> batch(
+ sk_sp<GrDrawOp> batch(
GrRectBatchFactory::CreateNonAAFill(0xff000000, SkMatrix::I(), bounds,
nullptr, nullptr));
renderTargetContext->priv().testingOnly_drawBatch(grPaint, batch.get());
diff --git a/gm/constcolorprocessor.cpp b/gm/constcolorprocessor.cpp
index f6a9dae0a5..d70674279c 100644
--- a/gm/constcolorprocessor.cpp
+++ b/gm/constcolorprocessor.cpp
@@ -15,7 +15,7 @@
#include "GrRenderTargetContextPriv.h"
#include "SkGrPriv.h"
#include "SkGradientShader.h"
-#include "batches/GrDrawBatch.h"
+#include "batches/GrDrawOp.h"
#include "batches/GrRectBatchFactory.h"
#include "effects/GrConstColorProcessor.h"
@@ -109,7 +109,7 @@ protected:
grPaint.addColorFragmentProcessor(std::move(fp));
- sk_sp<GrDrawBatch> batch(
+ sk_sp<GrDrawOp> batch(
GrRectBatchFactory::CreateNonAAFill(grPaint.getColor(), viewMatrix,
renderRect, nullptr, nullptr));
renderTargetContext->priv().testingOnly_drawBatch(grPaint, batch.get());
diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp
index 880574217d..68aa9d0396 100644
--- a/gm/convexpolyeffect.cpp
+++ b/gm/convexpolyeffect.cpp
@@ -183,7 +183,7 @@ protected:
grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc));
grPaint.addCoverageFragmentProcessor(std::move(fp));
- sk_sp<GrDrawBatch> batch(new PolyBoundsBatch(p.getBounds(), 0xff000000));
+ sk_sp<GrDrawOp> batch(new PolyBoundsBatch(p.getBounds(), 0xff000000));
renderTargetContext->priv().testingOnly_drawBatch(grPaint, batch.get());
@@ -222,7 +222,7 @@ protected:
grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc));
grPaint.addCoverageFragmentProcessor(std::move(fp));
- sk_sp<GrDrawBatch> batch(new PolyBoundsBatch(rect, 0xff000000));
+ sk_sp<GrDrawOp> batch(new PolyBoundsBatch(rect, 0xff000000));
renderTargetContext->priv().testingOnly_drawBatch(grPaint, batch.get());
diff --git a/gm/rrects.cpp b/gm/rrects.cpp
index 29e81bd298..268e449319 100644
--- a/gm/rrects.cpp
+++ b/gm/rrects.cpp
@@ -9,7 +9,7 @@
#if SK_SUPPORT_GPU
#include "GrContext.h"
#include "GrRenderTargetContextPriv.h"
-#include "batches/GrDrawBatch.h"
+#include "batches/GrDrawOp.h"
#include "batches/GrRectBatchFactory.h"
#include "effects/GrRRectEffect.h"
#endif
@@ -115,7 +115,7 @@ protected:
SkRect bounds = rrect.getBounds();
bounds.outset(2.f, 2.f);
- sk_sp<GrDrawBatch> batch(
+ sk_sp<GrDrawOp> batch(
GrRectBatchFactory::CreateNonAAFill(0xff000000, SkMatrix::I(),
bounds, nullptr, nullptr));
renderTargetContext->priv().testingOnly_drawBatch(grPaint, batch.get());
diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp
index ad192d68eb..e51a9065be 100644
--- a/gm/texturedomaineffect.cpp
+++ b/gm/texturedomaineffect.cpp
@@ -16,7 +16,7 @@
#include "SkBitmap.h"
#include "SkGr.h"
#include "SkGradientShader.h"
-#include "batches/GrDrawBatch.h"
+#include "batches/GrDrawOp.h"
#include "batches/GrRectBatchFactory.h"
#include "effects/GrTextureDomain.h"
@@ -127,7 +127,7 @@ protected:
const SkMatrix viewMatrix = SkMatrix::MakeTrans(x, y);
grPaint.addColorFragmentProcessor(std::move(fp));
- sk_sp<GrDrawBatch> batch(
+ sk_sp<GrDrawOp> batch(
GrRectBatchFactory::CreateNonAAFill(GrColor_WHITE, viewMatrix,
renderRect, nullptr, nullptr));
renderTargetContext->priv().testingOnly_drawBatch(grPaint, batch.get());
diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp
index dcc8b15952..6b90dad9cc 100644
--- a/gm/yuvtorgbeffect.cpp
+++ b/gm/yuvtorgbeffect.cpp
@@ -16,7 +16,7 @@
#include "SkBitmap.h"
#include "SkGr.h"
#include "SkGradientShader.h"
-#include "batches/GrDrawBatch.h"
+#include "batches/GrDrawOp.h"
#include "batches/GrRectBatchFactory.h"
#include "effects/GrYUVEffect.h"
@@ -126,7 +126,7 @@ protected:
SkMatrix viewMatrix;
viewMatrix.setTranslate(x, y);
grPaint.addColorFragmentProcessor(std::move(fp));
- sk_sp<GrDrawBatch> batch(
+ sk_sp<GrDrawOp> batch(
GrRectBatchFactory::CreateNonAAFill(GrColor_WHITE, viewMatrix,
renderRect, nullptr, nullptr));
renderTargetContext->priv().testingOnly_drawBatch(grPaint, batch.get());
@@ -242,7 +242,7 @@ protected:
SkMatrix viewMatrix;
viewMatrix.setTranslate(x, y);
grPaint.addColorFragmentProcessor(fp);
- sk_sp<GrDrawBatch> batch(GrRectBatchFactory::CreateNonAAFill(
+ sk_sp<GrDrawOp> batch(GrRectBatchFactory::CreateNonAAFill(
GrColor_WHITE, viewMatrix, renderRect, nullptr, nullptr));
renderTargetContext->priv().testingOnly_drawBatch(grPaint, batch.get());
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-28 18:30:13 +0000