Make asFragmentProcessor entry point only take a GrRecordingContext (take 2)
This is split out of: https://skia-review.googlesource.com/c/skia/+/192032 (Switch FP creation over to GrRecordingContext)
TBR=bsalomon@google.com
Change-Id: Iebe8dce00abf09485717f59daae1bfeb8ba6d5bc
Reviewed-on: https://skia-review.googlesource.com/c/193160
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp
index 7b2cc22..6d0108d 100644
--- a/src/core/SkColorFilter.cpp
+++ b/src/core/SkColorFilter.cpp
@@ -37,7 +37,7 @@
#if SK_SUPPORT_GPU
std::unique_ptr<GrFragmentProcessor> SkColorFilter::asFragmentProcessor(
- GrContext*, const GrColorSpaceInfo&) const {
+ GrRecordingContext*, const GrColorSpaceInfo&) const {
return nullptr;
}
#endif
@@ -110,7 +110,7 @@
#if SK_SUPPORT_GPU
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(
- GrContext* context, const GrColorSpaceInfo& dstColorSpaceInfo) const override {
+ GrRecordingContext* context, const GrColorSpaceInfo& dstColorSpaceInfo) const override {
auto innerFP = fInner->asFragmentProcessor(context, dstColorSpaceInfo);
auto outerFP = fOuter->asFragmentProcessor(context, dstColorSpaceInfo);
if (!innerFP || !outerFP) {
@@ -212,7 +212,7 @@
#if SK_SUPPORT_GPU
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(
- GrContext*, const GrColorSpaceInfo&) const override {
+ GrRecordingContext*, const GrColorSpaceInfo&) const override {
// wish our caller would let us know if our input was opaque...
GrSRGBEffect::Alpha alpha = GrSRGBEffect::Alpha::kPremul;
switch (fDir) {
@@ -327,7 +327,7 @@
#if SK_SUPPORT_GPU
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(
- GrContext* context, const GrColorSpaceInfo&) const override {
+ GrRecordingContext* context, const GrColorSpaceInfo&) const override {
return nullptr;
}
#endif
diff --git a/src/core/SkColorMatrixFilterRowMajor255.cpp b/src/core/SkColorMatrixFilterRowMajor255.cpp
index dcf8238..f013f1e 100644
--- a/src/core/SkColorMatrixFilterRowMajor255.cpp
+++ b/src/core/SkColorMatrixFilterRowMajor255.cpp
@@ -288,7 +288,7 @@
#endif
std::unique_ptr<GrFragmentProcessor> SkColorMatrixFilterRowMajor255::asFragmentProcessor(
- GrContext*, const GrColorSpaceInfo&) const {
+ GrRecordingContext*, const GrColorSpaceInfo&) const {
return ColorMatrixEffect::Make(fMatrix);
}
diff --git a/src/core/SkColorMatrixFilterRowMajor255.h b/src/core/SkColorMatrixFilterRowMajor255.h
index 837c630..e4adf97 100644
--- a/src/core/SkColorMatrixFilterRowMajor255.h
+++ b/src/core/SkColorMatrixFilterRowMajor255.h
@@ -25,7 +25,7 @@
#if SK_SUPPORT_GPU
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(
- GrContext*, const GrColorSpaceInfo&) const override;
+ GrRecordingContext*, const GrColorSpaceInfo&) const override;
#endif
protected:
diff --git a/src/core/SkModeColorFilter.cpp b/src/core/SkModeColorFilter.cpp
index 8cf1929..9309d9e 100644
--- a/src/core/SkModeColorFilter.cpp
+++ b/src/core/SkModeColorFilter.cpp
@@ -90,7 +90,7 @@
#include "SkGr.h"
std::unique_ptr<GrFragmentProcessor> SkModeColorFilter::asFragmentProcessor(
- GrContext*, const GrColorSpaceInfo& dstColorSpaceInfo) const {
+ GrRecordingContext*, const GrColorSpaceInfo& dstColorSpaceInfo) const {
if (SkBlendMode::kDst == fMode) {
return nullptr;
}
diff --git a/src/core/SkModeColorFilter.h b/src/core/SkModeColorFilter.h
index ce0b323..03d3fab 100644
--- a/src/core/SkModeColorFilter.h
+++ b/src/core/SkModeColorFilter.h
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "SkColorFilter.h"
-#include "SkFlattenable.h"
-
#ifndef SkModeColorFilter_DEFINED
#define SkModeColorFilter_DEFINED
+#include "SkColorFilter.h"
+#include "SkFlattenable.h"
+
class SkModeColorFilter : public SkColorFilter {
public:
static sk_sp<SkColorFilter> Make(SkColor color, SkBlendMode mode) {
@@ -22,7 +22,7 @@
#if SK_SUPPORT_GPU
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(
- GrContext*, const GrColorSpaceInfo&) const override;
+ GrRecordingContext*, const GrColorSpaceInfo&) const override;
#endif
protected:
diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp
index 7e04f76..1327025 100644
--- a/src/effects/SkColorMatrixFilter.cpp
+++ b/src/effects/SkColorMatrixFilter.cpp
@@ -67,7 +67,7 @@
#if SK_SUPPORT_GPU
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(
- GrContext* ctx, const GrColorSpaceInfo& csi) const override {
+ GrRecordingContext* ctx, const GrColorSpaceInfo& csi) const override {
return fMatrixFilter->asFragmentProcessor(ctx, csi);
}
#endif
diff --git a/src/effects/SkHighContrastFilter.cpp b/src/effects/SkHighContrastFilter.cpp
index a922545..cbeb290 100644
--- a/src/effects/SkHighContrastFilter.cpp
+++ b/src/effects/SkHighContrastFilter.cpp
@@ -36,7 +36,7 @@
#if SK_SUPPORT_GPU
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(
- GrContext*, const GrColorSpaceInfo&) const override;
+ GrRecordingContext*, const GrColorSpaceInfo&) const override;
#endif
void onAppendStages(SkRasterPipeline* p,
@@ -353,7 +353,7 @@
}
std::unique_ptr<GrFragmentProcessor> SkHighContrast_Filter::asFragmentProcessor(
- GrContext*, const GrColorSpaceInfo& csi) const {
+ GrRecordingContext*, const GrColorSpaceInfo& csi) const {
bool linearize = !csi.isLinearlyBlended();
return HighContrastFilterEffect::Make(fConfig, linearize);
}
diff --git a/src/effects/SkLumaColorFilter.cpp b/src/effects/SkLumaColorFilter.cpp
index a53d69b..2f4912b 100644
--- a/src/effects/SkLumaColorFilter.cpp
+++ b/src/effects/SkLumaColorFilter.cpp
@@ -38,7 +38,7 @@
#if SK_SUPPORT_GPU
std::unique_ptr<GrFragmentProcessor> SkLumaColorFilter::asFragmentProcessor(
- GrContext*, const GrColorSpaceInfo&) const {
+ GrRecordingContext*, const GrColorSpaceInfo&) const {
return GrLumaColorFilterEffect::Make();
}
#endif
diff --git a/src/effects/SkOverdrawColorFilter.cpp b/src/effects/SkOverdrawColorFilter.cpp
index 6eead48..9f345a3 100644
--- a/src/effects/SkOverdrawColorFilter.cpp
+++ b/src/effects/SkOverdrawColorFilter.cpp
@@ -86,8 +86,10 @@
}
#if SK_SUPPORT_GPU
+#include "GrRecordingContext.h"
+
std::unique_ptr<GrFragmentProcessor> SkOverdrawColorFilter::asFragmentProcessor(
- GrContext* context, const GrColorSpaceInfo&) const {
+ GrRecordingContext* context, const GrColorSpaceInfo&) const {
static int overdrawIndex = GrSkSLFP::NewIndex();
return GrSkSLFP::Make(context, overdrawIndex, "Overdraw", SKSL_OVERDRAW_SRC, fColors,
sizeof(fColors));
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp
index c8ebb1e..0c265da 100644
--- a/src/effects/SkTableColorFilter.cpp
+++ b/src/effects/SkTableColorFilter.cpp
@@ -88,7 +88,7 @@
#if SK_SUPPORT_GPU
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(
- GrContext*, const GrColorSpaceInfo&) const override;
+ GrRecordingContext*, const GrColorSpaceInfo&) const override;
#endif
enum {
@@ -283,9 +283,9 @@
#if SK_SUPPORT_GPU
#include "GrColorSpaceInfo.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
#include "GrFragmentProcessor.h"
+#include "GrRecordingContext.h"
+#include "GrRecordingContextPriv.h"
#include "SkGr.h"
#include "glsl/GrGLSLFragmentProcessor.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
@@ -294,7 +294,8 @@
class ColorTableEffect : public GrFragmentProcessor {
public:
- static std::unique_ptr<GrFragmentProcessor> Make(GrContext* context, const SkBitmap& bitmap);
+ static std::unique_ptr<GrFragmentProcessor> Make(GrRecordingContext* context,
+ const SkBitmap& bitmap);
~ColorTableEffect() override {}
@@ -384,7 +385,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-std::unique_ptr<GrFragmentProcessor> ColorTableEffect::Make(GrContext* context,
+std::unique_ptr<GrFragmentProcessor> ColorTableEffect::Make(GrRecordingContext* context,
const SkBitmap& bitmap) {
SkASSERT(kPremul_SkAlphaType == bitmap.alphaType());
SkASSERT(bitmap.isImmutable());
@@ -421,6 +422,9 @@
GR_DEFINE_FRAGMENT_PROCESSOR_TEST(ColorTableEffect);
#if GR_TEST_UTILS
+
+#include "GrContext.h"
+
std::unique_ptr<GrFragmentProcessor> ColorTableEffect::TestCreate(GrProcessorTestData* d) {
int flags = 0;
uint8_t luts[256][4];
@@ -451,7 +455,7 @@
#endif
std::unique_ptr<GrFragmentProcessor> SkTable_ColorFilter::asFragmentProcessor(
- GrContext* context, const GrColorSpaceInfo&) const {
+ GrRecordingContext* context, const GrColorSpaceInfo&) const {
SkBitmap bitmap;
this->asComponentTable(&bitmap);
diff --git a/src/effects/SkToSRGBColorFilter.cpp b/src/effects/SkToSRGBColorFilter.cpp
index 913bdbc..1b98db7 100644
--- a/src/effects/SkToSRGBColorFilter.cpp
+++ b/src/effects/SkToSRGBColorFilter.cpp
@@ -51,7 +51,7 @@
#if SK_SUPPORT_GPU
std::unique_ptr<GrFragmentProcessor> SkToSRGBColorFilter::asFragmentProcessor(
- GrContext*, const GrColorSpaceInfo&) const {
+ GrRecordingContext*, const GrColorSpaceInfo&) const {
return GrColorSpaceXformEffect::Make(fSrcColorSpace.get(), kPremul_SkAlphaType,
sk_srgb_singleton(), kPremul_SkAlphaType);
}
diff --git a/src/gpu/GrFPArgs.h b/src/gpu/GrFPArgs.h
index e67c638..cbc0420 100644
--- a/src/gpu/GrFPArgs.h
+++ b/src/gpu/GrFPArgs.h
@@ -11,8 +11,8 @@
#include "SkFilterQuality.h"
#include "SkMatrix.h"
-class GrContext;
class GrColorSpaceInfo;
+class GrContext;
struct GrFPArgs {
GrFPArgs(GrContext* context,
@@ -30,7 +30,7 @@
class WithPreLocalMatrix;
class WithPostLocalMatrix;
- GrContext* fContext;
+ GrContext* fContext;
const SkMatrix* fViewMatrix;
// We track both pre and post local matrix adjustments. For a given FP:
diff --git a/src/gpu/GrTestUtils.cpp b/src/gpu/GrTestUtils.cpp
index ded7383..845ee77 100644
--- a/src/gpu/GrTestUtils.cpp
+++ b/src/gpu/GrTestUtils.cpp
@@ -6,7 +6,9 @@
*/
#include "GrTestUtils.h"
+
#include "GrColorSpaceInfo.h"
+#include "GrContext.h"
#include "GrProcessorUnitTest.h"
#include "GrStyle.h"
#include "SkDashPathPriv.h"
diff --git a/src/gpu/effects/GrSkSLFP.cpp b/src/gpu/effects/GrSkSLFP.cpp
index 3b2b43c..d8dbba6 100644
--- a/src/gpu/effects/GrSkSLFP.cpp
+++ b/src/gpu/effects/GrSkSLFP.cpp
@@ -6,13 +6,15 @@
*/
#include "GrSkSLFP.h"
+
+#include "GrContext_Base.h"
+#include "GrBaseContextPriv.h"
+#include "GrTexture.h"
+#include "SkSLUtil.h"
+
#include "glsl/GrGLSLFragmentProcessor.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
#include "glsl/GrGLSLProgramBuilder.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrTexture.h"
-#include "SkSLUtil.h"
GrSkSLFPFactory::GrSkSLFPFactory(const char* name, const GrShaderCaps* shaderCaps, const char* sksl)
: fName(name) {
@@ -231,7 +233,7 @@
std::vector<UniformHandle> fUniformHandles;
};
-std::unique_ptr<GrSkSLFP> GrSkSLFP::Make(GrContext* context, int index, const char* name,
+std::unique_ptr<GrSkSLFP> GrSkSLFP::Make(GrContext_Base* context, int index, const char* name,
const char* sksl, const void* inputs,
size_t inputSize) {
return std::unique_ptr<GrSkSLFP>(new GrSkSLFP(context->priv().fpFactoryCache(),
@@ -397,6 +399,7 @@
#if GR_TEST_UTILS
#include "GrConstColorProcessor.h"
+#include "GrContext.h"
#include "SkArithmeticImageFilter.h"
extern const char* SKSL_ARITHMETIC_SRC;
diff --git a/src/gpu/effects/GrSkSLFP.h b/src/gpu/effects/GrSkSLFP.h
index 912ba23..f143f53 100644
--- a/src/gpu/effects/GrSkSLFP.h
+++ b/src/gpu/effects/GrSkSLFP.h
@@ -24,7 +24,7 @@
#define GR_FP_SRC_STRING static const char*
#endif
-class GrContext;
+class GrContext_Base;
class GrSkSLFPFactory;
class GrSkSLFP : public GrFragmentProcessor {
@@ -68,7 +68,7 @@
* associated with it.
*/
static std::unique_ptr<GrSkSLFP> Make(
- GrContext* context,
+ GrContext_Base* context,
int index,
const char* name,
const char* sksl,
diff --git a/src/gpu/gradients/GrGradientShader.cpp b/src/gpu/gradients/GrGradientShader.cpp
index 7bf1866..9f3916f 100644
--- a/src/gpu/gradients/GrGradientShader.cpp
+++ b/src/gpu/gradients/GrGradientShader.cpp
@@ -21,10 +21,14 @@
#include "GrUnrolledBinaryGradientColorizer.h"
#include "GrGradientBitmapCache.h"
-#include "SkGr.h"
+#include "GrCaps.h"
#include "GrColor.h"
+#include "GrColorSpaceInfo.h"
#include "GrContext.h"
#include "GrContextPriv.h"
+#include "GrRecordingContext.h"
+#include "GrRecordingContextPriv.h"
+#include "SkGr.h"
// Intervals smaller than this (that aren't hard stops) on low-precision-only devices force us to
// use the textured gradient
diff --git a/src/shaders/SkColorFilterShader.cpp b/src/shaders/SkColorFilterShader.cpp
index 16bf565..9bad350 100644
--- a/src/shaders/SkColorFilterShader.cpp
+++ b/src/shaders/SkColorFilterShader.cpp
@@ -54,6 +54,8 @@
#if SK_SUPPORT_GPU
/////////////////////////////////////////////////////////////////////
+#include "GrContext.h"
+
std::unique_ptr<GrFragmentProcessor> SkColorFilterShader::asFragmentProcessor(
const GrFPArgs& args) const {
auto fp1 = as_SB(fShader)->asFragmentProcessor(args);
diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp
index c1d14d8..bb4aed2 100644
--- a/src/shaders/SkImageShader.cpp
+++ b/src/shaders/SkImageShader.cpp
@@ -158,9 +158,12 @@
#if SK_SUPPORT_GPU
+#include "GrCaps.h"
#include "GrColorSpaceInfo.h"
#include "GrContext.h"
#include "GrContextPriv.h"
+#include "GrRecordingContext.h"
+#include "GrRecordingContextPriv.h"
#include "SkGr.h"
#include "effects/GrBicubicEffect.h"
#include "effects/GrSimpleTextureEffect.h"
diff --git a/src/shaders/SkPerlinNoiseShader.cpp b/src/shaders/SkPerlinNoiseShader.cpp
index 5dd8090..e81bc0e 100644
--- a/src/shaders/SkPerlinNoiseShader.cpp
+++ b/src/shaders/SkPerlinNoiseShader.cpp
@@ -20,6 +20,8 @@
#include "GrContext.h"
#include "GrContextPriv.h"
#include "GrCoordTransform.h"
+#include "GrRecordingContext.h"
+#include "GrRecordingContextPriv.h"
#include "SkGr.h"
#include "effects/GrConstColorProcessor.h"
#include "glsl/GrGLSLFragmentProcessor.h"
diff --git a/src/shaders/SkPictureShader.cpp b/src/shaders/SkPictureShader.cpp
index d14d5a4..a71f1fa 100644
--- a/src/shaders/SkPictureShader.cpp
+++ b/src/shaders/SkPictureShader.cpp
@@ -23,9 +23,9 @@
#if SK_SUPPORT_GPU
#include "GrCaps.h"
#include "GrColorSpaceInfo.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
#include "GrFragmentProcessor.h"
+#include "GrRecordingContext.h"
+#include "GrRecordingContextPriv.h"
#include "SkGr.h"
#endif
@@ -328,6 +328,9 @@
}
#if SK_SUPPORT_GPU
+#include "GrContext.h"
+#include "GrContextPriv.h"
+
std::unique_ptr<GrFragmentProcessor> SkPictureShader::asFragmentProcessor(
const GrFPArgs& args) const {
int maxTextureSize = 0;
diff --git a/src/utils/SkShadowUtils.cpp b/src/utils/SkShadowUtils.cpp
index a382d53..ffa7e28 100644
--- a/src/utils/SkShadowUtils.cpp
+++ b/src/utils/SkShadowUtils.cpp
@@ -41,7 +41,7 @@
#if SK_SUPPORT_GPU
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(
- GrContext*, const GrColorSpaceInfo&) const override;
+ GrRecordingContext*, const GrColorSpaceInfo&) const override;
#endif
protected:
@@ -65,7 +65,7 @@
#if SK_SUPPORT_GPU
std::unique_ptr<GrFragmentProcessor> SkGaussianColorFilter::asFragmentProcessor(
- GrContext*, const GrColorSpaceInfo&) const {
+ GrRecordingContext*, const GrColorSpaceInfo&) const {
return GrBlurredEdgeFragmentProcessor::Make(GrBlurredEdgeFragmentProcessor::Mode::kGaussian);
}
#endif