AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

converted ConstColorProcessor to SkSL

Browse Source 
Bug: skia:
Change-Id: Ic3b18f82c1ab940637fb26dec1cf376dd859b35d
Reviewed-on: https://skia-review.googlesource.com/73720
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
This commit is contained in:
Ethan Nicholas 2017-11-20 12:12:24 -05:00 committed by Skia Commit-Bot
parent 53d863c18c
commit e9d172af84
23 changed files with 283 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gn/sksl.gni
View File

@ -33,6 +33,7 @@ skia_gpu_processor_sources = [
"$_src/gpu/effects/GrBlurredEdgeFragmentProcessor.fp",
"$_src/gpu/effects/GrCircleEffect.fp",
"$_src/gpu/effects/GrConfigConversionEffect.fp",
"$_src/gpu/effects/GrConstColorProcessor.fp",
"$_src/gpu/effects/GrDitherEffect.fp",
"$_src/gpu/effects/GrEllipseEffect.fp",
"$_src/gpu/effects/GrLumaColorFilterEffect.fp",

2
src/core/SkModeColorFilter.cpp
View File

@ -104,7 +104,7 @@ std::unique_ptr<GrFragmentProcessor> SkModeColorFilter::asFragmentProcessor(
}
auto constFP = GrConstColorProcessor::Make(SkColorToPremulGrColor4f(fColor, dstColorSpaceInfo),
GrConstColorProcessor::kIgnore_InputMode);
GrConstColorProcessor::InputMode::kIgnore);
auto fp = GrXfermodeFragmentProcessor::MakeFromSrcProcessor(std::move(constFP), fMode);
if (!fp) {
return nullptr;

2
src/effects/SkArithmeticImageFilter.cpp
View File

@ -316,7 +316,7 @@ sk_sp<SkSpecialImage> ArithmeticImageFilterImpl::filterImageGPU(
bgConfig, outputProperties.colorSpace());
} else {
bgFP = GrConstColorProcessor::Make(GrColor4f::TransparentBlack(),
GrConstColorProcessor::kIgnore_InputMode);
GrConstColorProcessor::InputMode::kIgnore);
}
if (foregroundProxy) {

2
src/effects/SkXfermodeImageFilter.cpp
View File

@ -305,7 +305,7 @@ sk_sp<SkSpecialImage> SkXfermodeImageFilter_Base::filterImageGPU(
bgConfig, outputProperties.colorSpace());
} else {
bgFP = GrConstColorProcessor::Make(GrColor4f::TransparentBlack(),
GrConstColorProcessor::kIgnore_InputMode);
GrConstColorProcessor::InputMode::kIgnore);
}
if (foregroundProxy) {

2
src/gpu/GrFragmentProcessor.cpp
View File

@ -450,7 +450,7 @@ std::unique_ptr<GrFragmentProcessor> GrFragmentProcessor::RunInSeries(
int leadingFPsToEliminate = info.initialProcessorsToEliminate(&knownColor);
if (leadingFPsToEliminate) {
std::unique_ptr<GrFragmentProcessor> colorFP(
GrConstColorProcessor::Make(knownColor, GrConstColorProcessor::kIgnore_InputMode));
GrConstColorProcessor::Make(knownColor, GrConstColorProcessor::InputMode::kIgnore));
if (leadingFPsToEliminate == cnt) {
return colorFP;
}

6
src/gpu/SkGr.cpp
View File

@ -479,7 +479,7 @@ static inline bool skpaint_to_grpaint_impl(GrContext* context,
// color channels. It's value should be treated as the same in ANY color space.
grPaint->addColorFragmentProcessor(GrConstColorProcessor::Make(
GrColor4f::FromGrColor(paintAlpha),
GrConstColorProcessor::kModulateRGBA_InputMode));
GrConstColorProcessor::InputMode::kModulateRGBA));
}
} else {
// The shader's FP sees the paint unpremul color
@ -491,7 +491,7 @@ static inline bool skpaint_to_grpaint_impl(GrContext* context,
// There is a blend between the primitive color and the paint color. The blend considers
// the opaque paint color. The paint's alpha is applied to the post-blended color.
auto processor = GrConstColorProcessor::Make(origColor.opaque(),
GrConstColorProcessor::kIgnore_InputMode);
GrConstColorProcessor::InputMode::kIgnore);
processor = GrXfermodeFragmentProcessor::MakeFromSrcProcessor(std::move(processor),
*primColorMode);
if (processor) {
@ -507,7 +507,7 @@ static inline bool skpaint_to_grpaint_impl(GrContext* context,
// color channels. It's value should be treated as the same in ANY color space.
grPaint->addColorFragmentProcessor(GrConstColorProcessor::Make(
GrColor4f::FromGrColor(paintAlpha),
GrConstColorProcessor::kModulateRGBA_InputMode));
GrConstColorProcessor::InputMode::kModulateRGBA));
}
} else {
// No shader, no primitive color.

2
src/gpu/effects/GrAARectEffect.cpp
View File

@ -74,7 +74,7 @@ private:
prevRect = newRect;
}
}
SkRect prevRect;
SkRect prevRect = float4(0);
UniformHandle fRectUniformVar;
};
GrGLSLFragmentProcessor* GrAARectEffect::onCreateGLSLInstance() const {

4
src/gpu/effects/GrCircleEffect.cpp
View File

@ -75,8 +75,8 @@ private:
prevRadius = radius;
}
}
SkPoint prevCenter;
float prevRadius;
SkPoint prevCenter = half2(0);
float prevRadius = 0;
UniformHandle fCircleVar;
};
GrGLSLFragmentProcessor* GrCircleEffect::onCreateGLSLInstance() const {

147
src/gpu/effects/GrConstColorProcessor.cpp
View File

@ -1,102 +1,88 @@
/*
* Copyright 2015 Google Inc.
* Copyright 2017 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "effects/GrConstColorProcessor.h"
/*
* This file was autogenerated from GrConstColorProcessor.fp; do not modify.
*/
#include "GrConstColorProcessor.h"
#if SK_SUPPORT_GPU
#include "glsl/GrGLSLFragmentProcessor.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
#include "glsl/GrGLSLProgramDataManager.h"
#include "glsl/GrGLSLUniformHandler.h"
class GLConstColorProcessor : public GrGLSLFragmentProcessor {
#include "glsl/GrGLSLProgramBuilder.h"
#include "SkSLCPP.h"
#include "SkSLUtil.h"
class GrGLSLConstColorProcessor : public GrGLSLFragmentProcessor {
public:
GLConstColorProcessor() : fPrevColor(GrColor4f::kIllegalConstructor) {}
GrGLSLConstColorProcessor() {}
void emitCode(EmitArgs& args) override {
GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
const char* colorUni;
fColorUniform = args.fUniformHandler->addUniform(kFragment_GrShaderFlag,
kHalf4_GrSLType,
"constantColor",
&colorUni);
GrConstColorProcessor::InputMode mode = args.fFp.cast<GrConstColorProcessor>().inputMode();
if (!args.fInputColor) {
mode = GrConstColorProcessor::kIgnore_InputMode;
}
switch (mode) {
case GrConstColorProcessor::kIgnore_InputMode:
fragBuilder->codeAppendf("%s = %s;", args.fOutputColor, colorUni);
break;
case GrConstColorProcessor::kModulateRGBA_InputMode:
fragBuilder->codeAppendf("%s = %s * %s;", args.fOutputColor, args.fInputColor,
colorUni);
break;
case GrConstColorProcessor::kModulateA_InputMode:
fragBuilder->codeAppendf("%s = %s.a * %s;", args.fOutputColor, args.fInputColor,
colorUni);
break;
}
}
protected:
void onSetData(const GrGLSLProgramDataManager& pdm,
const GrFragmentProcessor& processor) override {
GrColor4f color = processor.cast<GrConstColorProcessor>().color();
// We use the "illegal" color value as an uninit sentinel. With GrColor4f, the "illegal"
// color is *really* illegal (not just unpremultiplied), so this check is simple.
if (fPrevColor != color) {
pdm.set4fv(fColorUniform, 1, color.fRGBA);
fPrevColor = color;
}
const GrConstColorProcessor& _outer = args.fFp.cast<GrConstColorProcessor>();
(void)_outer;
auto color = _outer.color();
(void)color;
auto mode = _outer.mode();
(void)mode;
fColorUniformVar = args.fUniformHandler->addUniform(kFragment_GrShaderFlag, kHalf4_GrSLType,
kDefault_GrSLPrecision, "colorUniform");
fragBuilder->codeAppendf(
"half4 prevColor;\n@switch (%d) {\n case 0:\n %s = %s;\n break;\n "
" case 1:\n %s = %s * %s;\n break;\n case 2:\n %s = %s.w "
"* %s;\n break;\n}\n",
(int)_outer.mode(), args.fOutputColor,
args.fUniformHandler->getUniformCStr(fColorUniformVar), args.fOutputColor,
args.fInputColor ? args.fInputColor : "half4(1)",
args.fUniformHandler->getUniformCStr(fColorUniformVar), args.fOutputColor,
args.fInputColor ? args.fInputColor : "half4(1)",
args.fUniformHandler->getUniformCStr(fColorUniformVar));
}
private:
GrGLSLProgramDataManager::UniformHandle fColorUniform;
GrColor4f fPrevColor;
void onSetData(const GrGLSLProgramDataManager& pdman,
const GrFragmentProcessor& _proc) override {
const GrConstColorProcessor& _outer = _proc.cast<GrConstColorProcessor>();
auto color = _outer.color();
(void)color;
UniformHandle& colorUniform = fColorUniformVar;
(void)colorUniform;
auto mode = _outer.mode();
(void)mode;
typedef GrGLSLFragmentProcessor INHERITED;
};
///////////////////////////////////////////////////////////////////////////////
std::unique_ptr<GrFragmentProcessor> GrConstColorProcessor::clone() const {
return Make(fColor, fMode);
}
GrColor4f GrConstColorProcessor::constantOutputForConstantInput(GrColor4f input) const {
switch (fMode) {
case kIgnore_InputMode:
return fColor;
case kModulateA_InputMode:
return fColor.mulByScalar(input.fRGBA[3]);
case kModulateRGBA_InputMode:
return fColor.modulate(input);
// We use the "illegal" color value as an uninit sentinel. With GrColor4f, the "illegal"
// color is *really* illegal (not just unpremultiplied), so this check is simple.
if (prevColor != color) {
pdman.set4fv(colorUniform, 1, color.fRGBA);
prevColor = color;
}
SK_ABORT("Unexpected mode");
return GrColor4f::TransparentBlack();
}
void GrConstColorProcessor::onGetGLSLProcessorKey(const GrShaderCaps&,
GrProcessorKeyBuilder* b) const {
b->add32(fMode);
}
}
GrColor4f prevColor = GrColor4f::kIllegalConstructor;
UniformHandle fColorUniformVar;
};
GrGLSLFragmentProcessor* GrConstColorProcessor::onCreateGLSLInstance() const {
return new GLConstColorProcessor;
return new GrGLSLConstColorProcessor();
}
void GrConstColorProcessor::onGetGLSLProcessorKey(const GrShaderCaps& caps,
GrProcessorKeyBuilder* b) const {
b->add32((int32_t)fMode);
}
bool GrConstColorProcessor::onIsEqual(const GrFragmentProcessor& other) const {
const GrConstColorProcessor& that = other.cast<GrConstColorProcessor>();
return fMode == that.fMode && fColor == that.fColor;
(void)that;
if (fColor != that.fColor) return false;
if (fMode != that.fMode) return false;
return true;
}
GrConstColorProcessor::GrConstColorProcessor(const GrConstColorProcessor& src)
: INHERITED(kGrConstColorProcessor_ClassID, src.optimizationFlags())
, fColor(src.fColor)
, fMode(src.fMode) {}
std::unique_ptr<GrFragmentProcessor> GrConstColorProcessor::clone() const {
return std::unique_ptr<GrFragmentProcessor>(new GrConstColorProcessor(*this));
}
///////////////////////////////////////////////////////////////////////////////
GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrConstColorProcessor);
#if GR_TEST_UTILS
std::unique_ptr<GrFragmentProcessor> GrConstColorProcessor::TestCreate(GrProcessorTestData* d) {
GrColor4f color;
@ -104,9 +90,9 @@ std::unique_ptr<GrFragmentProcessor> GrConstColorProcessor::TestCreate(GrProcess
switch (colorPicker) {
case 0: {
uint32_t a = d->fRandom->nextULessThan(0x100);
uint32_t r = d->fRandom->nextULessThan(a+1);
uint32_t g = d->fRandom->nextULessThan(a+1);
uint32_t b = d->fRandom->nextULessThan(a+1);
uint32_t r = d->fRandom->nextULessThan(a + 1);
uint32_t g = d->fRandom->nextULessThan(a + 1);
uint32_t b = d->fRandom->nextULessThan(a + 1);
color = GrColor4f::FromGrColor(GrColorPackRGBA(r, g, b, a));
break;
}
@ -122,3 +108,4 @@ std::unique_ptr<GrFragmentProcessor> GrConstColorProcessor::TestCreate(GrProcess
return GrConstColorProcessor::Make(color, mode);
}
#endif
#endif

91
src/gpu/effects/GrConstColorProcessor.fp Normal file
View File

@ -0,0 +1,91 @@
enum class InputMode {
kIgnore,
kModulateRGBA,
kModulateA,
kLast = kModulateA
};
layout(ctype=GrColor4f) in half4 color;
uniform half4 colorUniform;
layout(ctype=GrColor4f) half4 prevColor;
layout(key) in InputMode mode;
@optimizationFlags {
OptFlags(color, mode)
}
void main() {
@switch (mode) {
case InputMode::kIgnore:
sk_OutColor = colorUniform;
break;
case InputMode::kModulateRGBA:
sk_OutColor = sk_InColor * colorUniform;
break;
case InputMode::kModulateA:
sk_OutColor = sk_InColor.a * colorUniform;
break;
}
}
@setData(pdman) {
// We use the "illegal" color value as an uninit sentinel. With GrColor4f, the "illegal"
// color is *really* illegal (not just unpremultiplied), so this check is simple.
if (prevColor != color) {
pdman.set4fv(colorUniform, 1, color.fRGBA);
prevColor = color;
}
}
@class {
static const int kInputModeCnt = (int) InputMode::kLast + 1;
static OptimizationFlags OptFlags(GrColor4f color, InputMode mode) {
OptimizationFlags flags = kConstantOutputForConstantInput_OptimizationFlag;
if (mode != InputMode::kIgnore) {
flags |= kCompatibleWithCoverageAsAlpha_OptimizationFlag;
}
if (color.isOpaque()) {
flags |= kPreservesOpaqueInput_OptimizationFlag;
}
return flags;
}
GrColor4f constantOutputForConstantInput(GrColor4f input) const override {
switch (fMode) {
case InputMode::kIgnore:
return fColor;
case InputMode::kModulateA:
return fColor.mulByScalar(input.fRGBA[3]);
case InputMode::kModulateRGBA:
return fColor.modulate(input);
}
SK_ABORT("Unexpected mode");
return GrColor4f::TransparentBlack();
}
}
@test(d) {
GrColor4f color;
int colorPicker = d->fRandom->nextULessThan(3);
switch (colorPicker) {
case 0: {
uint32_t a = d->fRandom->nextULessThan(0x100);
uint32_t r = d->fRandom->nextULessThan(a+1);
uint32_t g = d->fRandom->nextULessThan(a+1);
uint32_t b = d->fRandom->nextULessThan(a+1);
color = GrColor4f::FromGrColor(GrColorPackRGBA(r, g, b, a));
break;
}
case 1:
color = GrColor4f::TransparentBlack();
break;
case 2:
uint32_t c = d->fRandom->nextULessThan(0x100);
color = GrColor4f::FromGrColor(c | (c << 8) | (c << 16) | (c << 24));
break;
}
InputMode mode = static_cast<InputMode>(d->fRandom->nextULessThan(kInputModeCnt));
return GrConstColorProcessor::Make(color, mode);
}

87
src/gpu/effects/GrConstColorProcessor.h
View File

@ -1,53 +1,28 @@
/*
* Copyright 2015 Google Inc.
* Copyright 2017 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#ifndef GrColorProcessor_DEFINED
#define GrColorProcessor_DEFINED
#include "GrFragmentProcessor.h"
/**
* This is a simple GrFragmentProcessor that outputs a constant color. It may do one of the
* following with its input color: ignore it, or multiply it by the constant color, multiply its
* alpha by the constant color and ignore the input color's r, g, and b.
/*
* This file was autogenerated from GrConstColorProcessor.fp; do not modify.
*/
#ifndef GrConstColorProcessor_DEFINED
#define GrConstColorProcessor_DEFINED
#include "SkTypes.h"
#if SK_SUPPORT_GPU
#include "GrFragmentProcessor.h"
#include "GrCoordTransform.h"
class GrConstColorProcessor : public GrFragmentProcessor {
public:
enum InputMode {
kIgnore_InputMode,
kModulateRGBA_InputMode,
kModulateA_InputMode,
enum class InputMode { kLast = 2, kModulateA = 2, kModulateRGBA = 1, kIgnore = 0 };
kLastInputMode = kModulateA_InputMode
};
static const int kInputModeCnt = kLastInputMode + 1;
static const int kInputModeCnt = (int)InputMode::kLast + 1;
static std::unique_ptr<GrFragmentProcessor> Make(GrColor4f color, InputMode mode) {
return std::unique_ptr<GrFragmentProcessor>(new GrConstColorProcessor(color, mode));
}
const char* name() const override { return "Color"; }
SkString dumpInfo() const override {
SkString str;
str.appendf("Color: 0x%08x", fColor.toGrColor());
return str;
}
std::unique_ptr<GrFragmentProcessor> clone() const override;
GrColor4f color() const { return fColor; }
InputMode inputMode() const { return fMode; }
private:
static OptimizationFlags OptFlags(GrColor4f color, InputMode mode) {
OptimizationFlags flags = kConstantOutputForConstantInput_OptimizationFlag;
if (mode != kIgnore_InputMode) {
if (mode != InputMode::kIgnore) {
flags |= kCompatibleWithCoverageAsAlpha_OptimizationFlag;
}
if (color.isOpaque()) {
@ -56,27 +31,39 @@ private:
return flags;
}
GrConstColorProcessor(GrColor4f color, InputMode mode)
: INHERITED(kGrConstColorProcessor_ClassID
, OptFlags(color, mode))
, fColor(color)
, fMode(mode) {
GrColor4f constantOutputForConstantInput(GrColor4f input) const override {
switch (fMode) {
case InputMode::kIgnore:
return fColor;
case InputMode::kModulateA:
return fColor.mulByScalar(input.fRGBA[3]);
case InputMode::kModulateRGBA:
return fColor.modulate(input);
}
SK_ABORT("Unexpected mode");
return GrColor4f::TransparentBlack();
}
GrColor4f color() const { return fColor; }
InputMode mode() const { return fMode; }
static std::unique_ptr<GrFragmentProcessor> Make(GrColor4f color, InputMode mode) {
return std::unique_ptr<GrFragmentProcessor>(new GrConstColorProcessor(color, mode));
}
GrConstColorProcessor(const GrConstColorProcessor& src);
std::unique_ptr<GrFragmentProcessor> clone() const override;
const char* name() const override { return "ConstColorProcessor"; }
private:
GrConstColorProcessor(GrColor4f color, InputMode mode)
: INHERITED(kGrConstColorProcessor_ClassID, (OptimizationFlags)OptFlags(color, mode))
, fColor(color)
, fMode(mode) {}
GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
void onGetGLSLProcessorKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
bool onIsEqual(const GrFragmentProcessor&) const override;
GrColor4f constantOutputForConstantInput(GrColor4f input) const override;
GR_DECLARE_FRAGMENT_PROCESSOR_TEST
GrColor4f fColor;
InputMode fMode;
typedef GrFragmentProcessor INHERITED;
};
#endif
#endif

4
src/gpu/effects/GrConvexPolyEffect.cpp
View File

@ -105,14 +105,14 @@ std::unique_ptr<GrFragmentProcessor> GrConvexPolyEffect::Make(GrClipEdgeType typ
if (!SkPathPriv::CheapComputeFirstDirection(path, &dir)) {
if (GrProcessorEdgeTypeIsInverseFill(type)) {
return GrConstColorProcessor::Make(GrColor4f::OpaqueWhite(),
GrConstColorProcessor::kModulateRGBA_InputMode);
GrConstColorProcessor::InputMode::kModulateRGBA);
}
// This could use kIgnore instead of kModulateRGBA but it would trigger a debug print
// about a coverage processor not being compatible with the alpha-as-coverage optimization.
// We don't really care about this unlikely case so we just use kModulateRGBA to suppress
// the print.
return GrConstColorProcessor::Make(GrColor4f::TransparentBlack(),
GrConstColorProcessor::kModulateRGBA_InputMode);
GrConstColorProcessor::InputMode::kModulateRGBA);
}
SkScalar edges[3 * kMaxEdges];

6
src/gpu/effects/GrEllipseEffect.cpp
View File

@ -98,9 +98,9 @@ private:
prevRadii = radii;
}
}
SkPoint prevCenter;
SkPoint prevRadii;
bool useScale;
SkPoint prevCenter = float2(0);
SkPoint prevRadii = float2(0);
bool useScale = false;
UniformHandle fEllipseVar;
UniformHandle fScaleVar;
};

2
src/gpu/effects/GrRectBlurEffect.cpp
View File

@ -124,7 +124,7 @@ private:
pdman.set1f(profileSize, SkScalarCeilToScalar(6 * sigma));
}
bool highPrecision;
bool highPrecision = false;
UniformHandle fProxyRectHalfVar;
UniformHandle fProxyRectFloatVar;
UniformHandle fProfileSizeVar;

6
src/gpu/effects/GrXfermodeFragmentProcessor.cpp
View File

@ -249,7 +249,7 @@ std::unique_ptr<GrFragmentProcessor> GrXfermodeFragmentProcessor::MakeFromTwoPro
switch (mode) {
case SkBlendMode::kClear:
return GrConstColorProcessor::Make(GrColor4f::TransparentBlack(),
GrConstColorProcessor::kIgnore_InputMode);
GrConstColorProcessor::InputMode::kIgnore);
case SkBlendMode::kSrc:
return src;
case SkBlendMode::kDst:
@ -516,7 +516,7 @@ std::unique_ptr<GrFragmentProcessor> GrXfermodeFragmentProcessor::MakeFromDstPro
switch (mode) {
case SkBlendMode::kClear:
return GrConstColorProcessor::Make(GrColor4f::TransparentBlack(),
GrConstColorProcessor::kIgnore_InputMode);
GrConstColorProcessor::InputMode::kIgnore);
case SkBlendMode::kSrc:
return nullptr;
default:
@ -530,7 +530,7 @@ std::unique_ptr<GrFragmentProcessor> GrXfermodeFragmentProcessor::MakeFromSrcPro
switch (mode) {
case SkBlendMode::kClear:
return GrConstColorProcessor::Make(GrColor4f::TransparentBlack(),
GrConstColorProcessor::kIgnore_InputMode);
GrConstColorProcessor::InputMode::kIgnore);
case SkBlendMode::kDst:
return nullptr;
default:

5
src/shaders/SkColorShader.cpp
View File

@ -92,7 +92,7 @@ SkShader::GradientType SkColorShader::asAGradient(GradientInfo* info) const {
std::unique_ptr<GrFragmentProcessor> SkColorShader::asFragmentProcessor(
const AsFPArgs& args) const {
GrColor4f color = SkColorToPremulGrColor4f(fColor, *args.fDstColorSpaceInfo);
return GrConstColorProcessor::Make(color, GrConstColorProcessor::kModulateA_InputMode);
return GrConstColorProcessor::Make(color, GrConstColorProcessor::InputMode::kModulateA);
}
#endif
@ -219,7 +219,8 @@ std::unique_ptr<GrFragmentProcessor> SkColor4Shader::asFragmentProcessor(
if (colorSpaceXform) {
color = colorSpaceXform->clampedXform(color);
}
return GrConstColorProcessor::Make(color.premul(), GrConstColorProcessor::kModulateA_InputMode);
return GrConstColorProcessor::Make(color.premul(),
GrConstColorProcessor::InputMode::kModulateA);
}
#endif

2
src/shaders/SkComposeShader.cpp
View File

@ -129,7 +129,7 @@ std::unique_ptr<GrFragmentProcessor> SkComposeShader::asFragmentProcessor(
SkASSERT(fMode != SkBlendMode::kSrc && fMode != SkBlendMode::kDst); // caught in factory
if (fMode == SkBlendMode::kClear) {
return GrConstColorProcessor::Make(GrColor4f::TransparentBlack(),
GrConstColorProcessor::kIgnore_InputMode);
GrConstColorProcessor::InputMode::kIgnore);
}
}

4
src/shaders/SkPerlinNoiseShader.cpp
View File

@ -1426,12 +1426,12 @@ std::unique_ptr<GrFragmentProcessor> SkPerlinNoiseShaderImpl::asFragmentProcesso
// the destination.
auto inner =
GrConstColorProcessor::Make(GrColor4f::FromGrColor(0x80404040),
GrConstColorProcessor::kModulateRGBA_InputMode);
GrConstColorProcessor::InputMode::kModulateRGBA);
return GrFragmentProcessor::MulOutputByInputAlpha(std::move(inner));
}
// Emit zero.
return GrConstColorProcessor::Make(GrColor4f::TransparentBlack(),
GrConstColorProcessor::kIgnore_InputMode);
GrConstColorProcessor::InputMode::kIgnore);
}
sk_sp<GrTextureProxy> permutationsProxy = GrMakeCachedBitmapProxy(

30
src/sksl/SkSLCPP.h
View File

@ -15,6 +15,28 @@
using std::abs;
struct Float4 {
Float4(float x, float y, float z, float w)
: fX(x)
, fY(y)
, fZ(z)
, fW(w) {}
operator SkRect() const {
return SkRect::MakeLTRB(fX, fY, fZ, fW);
}
operator GrColor4f() const {
return GrColor4f(fX, fY, fZ, fW);
}
private:
float fX;
float fY;
float fZ;
float fW;
};
// macros to make sk_Caps.<cap name> work from C++ code
#define sk_Caps (*args.fShaderCaps)
@ -25,10 +47,14 @@ inline SkPoint float2(float xy) { return SkPoint::Make(xy, xy); }
inline SkPoint float2(float x, float y) { return SkPoint::Make(x, y); }
inline SkRect float4(float ltrb) { return SkRect::MakeLTRB(ltrb, ltrb, ltrb, ltrb); }
inline Float4 float4(float xyzw) { return Float4(xyzw, xyzw, xyzw, xyzw); }
inline SkRect float4(float l, float t, float r, float b) { return SkRect::MakeLTRB(l, t, r, b); }
inline Float4 float4(float x, float y, float z, float w) { return Float4(x, y, z, w); }
#define half2 float2
#define half3 float3
#define half4 float4
#endif

20
src/sksl/SkSLCPPCodeGenerator.cpp
View File

@ -115,6 +115,9 @@ void CPPCodeGenerator::writeIndexExpression(const IndexExpression& i) {
}
static String default_value(const Type& type) {
if (type.fName == "bool") {
return "false";
}
switch (type.kind()) {
case Type::kScalar_Kind: return "0";
case Type::kVector_Kind: return type.name() + "(0)";
@ -123,6 +126,13 @@ static String default_value(const Type& type) {
}
}
static String default_value(const Variable& var) {
if (var.fModifiers.fLayout.fCType == "GrColor4f") {
return "GrColor4f::kIllegalConstructor";
}
return default_value(var.fType);
}
static bool is_private(const Variable& var) {
return !(var.fModifiers.fFlags & Modifiers::kUniform_Flag) &&
!(var.fModifiers.fFlags & Modifiers::kIn_Flag) &&
@ -152,6 +162,11 @@ void CPPCodeGenerator::writeRuntimeValue(const Type& type, const Layout& layout,
fFormatArgs.push_back("SkGetPackedG32(" + cppCode + ") / 255.0");
fFormatArgs.push_back("SkGetPackedB32(" + cppCode + ") / 255.0");
fFormatArgs.push_back("SkGetPackedA32(" + cppCode + ") / 255.0");
} else if (layout.fCType == "GrColor4f") {
fFormatArgs.push_back(cppCode + ".fRGBA[0]");
fFormatArgs.push_back(cppCode + ".fRGBA[1]");
fFormatArgs.push_back(cppCode + ".fRGBA[2]");
fFormatArgs.push_back(cppCode + ".fRGBA[3]");
} else {
fFormatArgs.push_back(cppCode + ".left()");
fFormatArgs.push_back(cppCode + ".top()");
@ -424,10 +439,11 @@ void CPPCodeGenerator::writePrivateVars() {
"fragmentProcessor variables must be declared 'in'");
return;
}
this->writef("%s %s;\n",
this->writef("%s %s = %s;\n",
HCodeGenerator::FieldType(fContext, decl.fVar->fType,
decl.fVar->fModifiers.fLayout).c_str(),
String(decl.fVar->fName).c_str());
String(decl.fVar->fName).c_str(),
default_value(*decl.fVar).c_str());
}
}
}

2
src/sksl/SkSLHCodeGenerator.cpp
View File

@ -266,12 +266,12 @@ bool HCodeGenerator::generateCode() {
this->writef("class %s : public GrFragmentProcessor {\n"
"public:\n",
fFullName.c_str());
this->writeSection(CLASS_SECTION);
for (const auto& p : fProgram.fElements) {
if (ProgramElement::kEnum_Kind == p->fKind && !((Enum&) *p).fBuiltin) {
this->writef("%s\n", p->description().c_str());
}
}
this->writeSection(CLASS_SECTION);
for (const auto& param : fSectionAndParameterHelper.getParameters()) {
if (param->fType.kind() == Type::kSampler_Kind ||
param->fType.kind() == Type::kOther_Kind) {

14
src/sksl/SkSLString.cpp
View File

@ -148,11 +148,21 @@ bool StringFragment::operator!=(StringFragment s) const {
}
bool StringFragment::operator==(const char* s) const {
return !strncmp(fChars, s, fLength);
for (size_t i = 0; i < fLength; ++i) {
if (fChars[i] != s[i]) {
return false;
}
}
return 0 == s[fLength];
}
bool StringFragment::operator!=(const char* s) const {
return strncmp(fChars, s, fLength);
for (size_t i = 0; i < fLength; ++i) {
if (fChars[i] != s[i]) {
return true;
}
}
return 0 != s[fLength];
}
bool operator==(const char* s1, StringFragment s2) {

4
tests/DefaultPathRendererTest.cpp
View File

@ -76,7 +76,7 @@ static void run_test(GrContext* ctx, skiatest::Reporter* reporter) {
GrPaint paint;
const GrColor4f color = { 1.0f, 0.0f, 0.0f, 1.0f };
auto fp = GrConstColorProcessor::Make(color, GrConstColorProcessor::kIgnore_InputMode);
auto fp = GrConstColorProcessor::Make(color, GrConstColorProcessor::InputMode::kIgnore);
paint.addColorFragmentProcessor(std::move(fp));
rtc->drawPath(GrNoClip(), std::move(paint), GrAA::kNo,
@ -94,7 +94,7 @@ static void run_test(GrContext* ctx, skiatest::Reporter* reporter) {
GrPaint paint;
const GrColor4f color = { 0.0f, 1.0f, 0.0f, 1.0f };
auto fp = GrConstColorProcessor::Make(color, GrConstColorProcessor::kIgnore_InputMode);
auto fp = GrConstColorProcessor::Make(color, GrConstColorProcessor::InputMode::kIgnore);
paint.addColorFragmentProcessor(std::move(fp));
rtc->drawPath(GrNoClip(), std::move(paint), GrAA::kNo,