aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gm/matrixconvolution.cpp22
-rw-r--r--include/effects/SkMatrixConvolutionImageFilter.h4
-rw-r--r--src/effects/SkMatrixConvolutionImageFilter.cpp319
3 files changed, 338 insertions, 7 deletions
diff --git a/gm/matrixconvolution.cpp b/gm/matrixconvolution.cpp
index 0a0afa492d..6bb7d99cba 100644
--- a/gm/matrixconvolution.cpp
+++ b/gm/matrixconvolution.cpp
@@ -6,7 +6,9 @@
*/
#include "gm.h"
+#include "SkColor.h"
#include "SkMatrixConvolutionImageFilter.h"
+#include "SkGradientShader.h"
namespace skiagm {
@@ -31,6 +33,12 @@ protected:
paint.setAntiAlias(true);
paint.setColor(0xFFFFFFFF);
paint.setTextSize(SkIntToScalar(180));
+ SkPoint pts[2] = { SkPoint::Make(0, 0),
+ SkPoint::Make(0, SkIntToScalar(80)) };
+ SkColor colors[2] = { 0xFFFFFFFF, 0x40404040 };
+ SkScalar pos[2] = { 0, SkIntToScalar(80) };
+ paint.setShader(SkGradientShader::CreateLinear(
+ pts, colors, pos, 2, SkShader::kClamp_TileMode))->unref();
const char* str = "e";
canvas.drawText(str, strlen(str), SkIntToScalar(-10), SkIntToScalar(80), paint);
}
@@ -59,15 +67,17 @@ protected:
fInitialized = true;
}
canvas->clear(0x00000000);
- SkIPoint target = SkIPoint::Make(1, 1);
- for (target.fY = 0; target.fY < 3; ++target.fY) {
- int y = target.fY * 100 + 10;
- draw(canvas, 10, y, target, SkMatrixConvolutionImageFilter::kClamp_TileMode, true);
- draw(canvas, 110, y, target, SkMatrixConvolutionImageFilter::kClampToBlack_TileMode, true);
- draw(canvas, 210, y, target, SkMatrixConvolutionImageFilter::kRepeat_TileMode, true);
+ SkIPoint target = SkIPoint::Make(1, 0);
+ for (int x = 10; x < 310; x += 100) {
+ draw(canvas, x, 10, target, SkMatrixConvolutionImageFilter::kClamp_TileMode, true);
+ draw(canvas, x, 110, target, SkMatrixConvolutionImageFilter::kClampToBlack_TileMode, true);
+ draw(canvas, x, 210, target, SkMatrixConvolutionImageFilter::kRepeat_TileMode, true);
+ target.fY++;
}
target.fY = 1;
draw(canvas, 310, 10, target, SkMatrixConvolutionImageFilter::kClamp_TileMode, false);
+ draw(canvas, 310, 110, target, SkMatrixConvolutionImageFilter::kClampToBlack_TileMode, false);
+ draw(canvas, 310, 210, target, SkMatrixConvolutionImageFilter::kRepeat_TileMode, false);
}
private:
diff --git a/include/effects/SkMatrixConvolutionImageFilter.h b/include/effects/SkMatrixConvolutionImageFilter.h
index a938fd0b26..f6e96f2279 100644
--- a/include/effects/SkMatrixConvolutionImageFilter.h
+++ b/include/effects/SkMatrixConvolutionImageFilter.h
@@ -61,6 +61,10 @@ protected:
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
SkBitmap* result, SkIPoint* loc) SK_OVERRIDE;
+#if SK_SUPPORT_GPU
+ virtual bool asNewCustomStage(GrCustomStage** stage, GrTexture*) const SK_OVERRIDE;
+#endif
+
private:
SkISize fKernelSize;
SkScalar* fKernel;
diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp
index 1c6f980b41..6b8a06d422 100644
--- a/src/effects/SkMatrixConvolutionImageFilter.cpp
+++ b/src/effects/SkMatrixConvolutionImageFilter.cpp
@@ -12,6 +12,10 @@
#include "SkRect.h"
#include "SkUnPreMultiply.h"
+#if SK_SUPPORT_GPU
+#include "gl/GrGLProgramStage.h"
+#endif
+
SkMatrixConvolutionImageFilter::SkMatrixConvolutionImageFilter(const SkISize& kernelSize, const SkScalar* kernel, SkScalar gain, SkScalar bias, const SkIPoint& target, TileMode tileMode, bool convolveAlpha, SkImageFilter* input)
: INHERITED(input),
fKernelSize(kernelSize),
@@ -23,6 +27,7 @@ SkMatrixConvolutionImageFilter::SkMatrixConvolutionImageFilter(const SkISize& ke
uint32_t size = fKernelSize.fWidth * fKernelSize.fHeight;
fKernel = SkNEW_ARRAY(SkScalar, size);
memcpy(fKernel, kernel, size * sizeof(SkScalar));
+ SkASSERT(kernelSize.fWidth >= 1 && kernelSize.fHeight >= 1);
SkASSERT(target.fX >= 0 && target.fX < kernelSize.fWidth);
SkASSERT(target.fY >= 0 && target.fY < kernelSize.fHeight);
}
@@ -121,11 +126,12 @@ void SkMatrixConvolutionImageFilter::filterPixels(const SkBitmap& src, SkBitmap*
}
int a = convolveAlpha
? SkClampMax(SkScalarFloorToInt(SkScalarMul(sumA, fGain) + fBias), 255)
- : SkGetPackedA32(PixelFetcher::fetch(src, x, y));
+ : 255;
int r = SkClampMax(SkScalarFloorToInt(SkScalarMul(sumR, fGain) + fBias), a);
int g = SkClampMax(SkScalarFloorToInt(SkScalarMul(sumG, fGain) + fBias), a);
int b = SkClampMax(SkScalarFloorToInt(SkScalarMul(sumB, fGain) + fBias), a);
if (!convolveAlpha) {
+ a = SkGetPackedA32(PixelFetcher::fetch(src, x, y));
*dptr++ = SkPreMultiplyARGB(a, r, g, b);
} else {
*dptr++ = SkPackARGB32(a, r, g, b);
@@ -225,3 +231,314 @@ bool SkMatrixConvolutionImageFilter::onFilterImage(Proxy* proxy,
filterBorderPixels(src, result, bottom);
return true;
}
+
+#if SK_SUPPORT_GPU
+
+///////////////////////////////////////////////////////////////////////////////
+
+class GrGLMatrixConvolutionEffect;
+
+class GrMatrixConvolutionEffect : public GrSingleTextureEffect {
+public:
+ typedef SkMatrixConvolutionImageFilter::TileMode TileMode;
+ GrMatrixConvolutionEffect(GrTexture*,
+ const SkISize& kernelSize,
+ const SkScalar* kernel,
+ SkScalar gain,
+ SkScalar bias,
+ const SkIPoint& target,
+ TileMode tileMode,
+ bool convolveAlpha);
+ virtual ~GrMatrixConvolutionEffect();
+
+ static const char* Name() { return "MatrixConvolution"; }
+ const SkISize& kernelSize() const { return fKernelSize; }
+ const float* target() const { return fTarget; }
+ const float* kernel() const { return fKernel; }
+ float gain() const { return fGain; }
+ float bias() const { return fBias; }
+ TileMode tileMode() const { return fTileMode; }
+ bool convolveAlpha() const { return fConvolveAlpha; }
+
+ typedef GrGLMatrixConvolutionEffect GLProgramStage;
+
+ virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE;
+ virtual bool isEqual(const GrCustomStage&) const SK_OVERRIDE;
+
+private:
+ SkISize fKernelSize;
+ float *fKernel;
+ float fGain;
+ float fBias;
+ float fTarget[2];
+ TileMode fTileMode;
+ bool fConvolveAlpha;
+
+ GR_DECLARE_CUSTOM_STAGE_TEST;
+
+ typedef GrSingleTextureEffect INHERITED;
+};
+
+class GrGLMatrixConvolutionEffect : public GrGLProgramStage {
+public:
+ GrGLMatrixConvolutionEffect(const GrProgramStageFactory& factory,
+ const GrCustomStage& stage);
+ virtual void setupVariables(GrGLShaderBuilder* builder) SK_OVERRIDE;
+ virtual void emitVS(GrGLShaderBuilder* state,
+ const char* vertexCoords) SK_OVERRIDE {}
+ virtual void emitFS(GrGLShaderBuilder* state,
+ const char* outputColor,
+ const char* inputColor,
+ const TextureSamplerArray&) SK_OVERRIDE;
+
+ static inline StageKey GenKey(const GrCustomStage& s, const GrGLCaps& caps);
+
+ virtual void setData(const GrGLUniformManager&,
+ const GrCustomStage&,
+ const GrRenderTarget*,
+ int stageNum) SK_OVERRIDE;
+
+private:
+ typedef GrGLUniformManager::UniformHandle UniformHandle;
+ typedef SkMatrixConvolutionImageFilter::TileMode TileMode;
+ SkISize fKernelSize;
+ TileMode fTileMode;
+ bool fConvolveAlpha;
+
+ UniformHandle fKernelUni;
+ UniformHandle fImageIncrementUni;
+ UniformHandle fTargetUni;
+ UniformHandle fGainUni;
+ UniformHandle fBiasUni;
+};
+
+GrGLMatrixConvolutionEffect::GrGLMatrixConvolutionEffect(const GrProgramStageFactory& factory,
+ const GrCustomStage& stage)
+ : GrGLProgramStage(factory)
+ , fKernelUni(GrGLUniformManager::kInvalidUniformHandle)
+ , fImageIncrementUni(GrGLUniformManager::kInvalidUniformHandle)
+ , fTargetUni(GrGLUniformManager::kInvalidUniformHandle)
+ , fGainUni(GrGLUniformManager::kInvalidUniformHandle)
+ , fBiasUni(GrGLUniformManager::kInvalidUniformHandle) {
+ const GrMatrixConvolutionEffect& m = static_cast<const GrMatrixConvolutionEffect&>(stage);
+ fKernelSize = m.kernelSize();
+ fTileMode = m.tileMode();
+ fConvolveAlpha = m.convolveAlpha();
+}
+
+void GrGLMatrixConvolutionEffect::setupVariables(GrGLShaderBuilder* builder) {
+ fImageIncrementUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
+ kVec2f_GrSLType, "ImageIncrement");
+ fKernelUni = builder->addUniformArray(GrGLShaderBuilder::kFragment_ShaderType,
+ kFloat_GrSLType, "Kernel", fKernelSize.width() * fKernelSize.height());
+ fTargetUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
+ kVec2f_GrSLType, "Target");
+ fGainUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
+ kFloat_GrSLType, "Gain");
+ fBiasUni = builder->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
+ kFloat_GrSLType, "Bias");
+}
+
+static void appendTextureLookup(GrGLShaderBuilder* builder,
+ const GrGLShaderBuilder::TextureSampler& sampler,
+ const char* coord,
+ SkMatrixConvolutionImageFilter::TileMode tileMode) {
+ SkString* code = &builder->fFSCode;
+ SkString clampedCoord;
+ switch (tileMode) {
+ case SkMatrixConvolutionImageFilter::kClamp_TileMode:
+ clampedCoord.printf("clamp(%s, 0.0, 1.0)", coord);
+ coord = clampedCoord.c_str();
+ break;
+ case SkMatrixConvolutionImageFilter::kRepeat_TileMode:
+ clampedCoord.printf("fract(%s)", coord);
+ coord = clampedCoord.c_str();
+ break;
+ case SkMatrixConvolutionImageFilter::kClampToBlack_TileMode:
+ code->appendf("clamp(%s, 0.0, 1.0) != %s ? vec4(0, 0, 0, 0) : ", coord, coord);
+ break;
+ }
+ builder->appendTextureLookup(code, sampler, coord);
+}
+
+void GrGLMatrixConvolutionEffect::emitFS(GrGLShaderBuilder* builder,
+ const char* outputColor,
+ const char* inputColor,
+ const TextureSamplerArray& samplers) {
+ SkString* code = &builder->fFSCode;
+
+ const char* target = builder->getUniformCStr(fTargetUni);
+ const char* imgInc = builder->getUniformCStr(fImageIncrementUni);
+ const char* kernel = builder->getUniformCStr(fKernelUni);
+ const char* gain = builder->getUniformCStr(fGainUni);
+ const char* bias = builder->getUniformCStr(fBiasUni);
+ int kWidth = fKernelSize.width();
+ int kHeight = fKernelSize.height();
+
+ code->appendf("\t\tvec4 sum = vec4(0, 0, 0, 0);\n");
+ code->appendf("\t\tvec2 coord = %s - %s * %s;\n",
+ builder->defaultTexCoordsName(), target, imgInc);
+ code->appendf("\t\tfor (int y = 0; y < %d; y++) {\n", kHeight);
+ code->appendf("\t\t\tfor (int x = 0; x < %d; x++) {\n", kWidth);
+ code->appendf("\t\t\t\tfloat k = %s[y * %d + x];\n", kernel, kWidth);
+ code->appendf("\t\t\t\tvec2 coord2 = coord + vec2(x, y) * %s;\n", imgInc);
+ code->appendf("\t\t\t\tvec4 c = ");
+ appendTextureLookup(builder, samplers[0], "coord2", fTileMode);
+ code->appendf(";\n");
+ if (!fConvolveAlpha) {
+ code->appendf("\t\t\t\tc.rgb /= c.a;\n");
+ }
+ code->appendf("\t\t\t\tsum += c * k;\n");
+ code->appendf("\t\t\t}\n");
+ code->appendf("\t\t}\n");
+ if (fConvolveAlpha) {
+ code->appendf("\t\t%s = sum * %s + %s;\n", outputColor, gain, bias);
+ code->appendf("\t\t%s.rgb = clamp(%s.rgb, 0.0, %s.a);\n", outputColor, outputColor, outputColor);
+ } else {
+ code->appendf("\t\t%s.a = (", outputColor);
+ appendTextureLookup(builder, samplers[0], builder->defaultTexCoordsName(), fTileMode);
+ code->appendf(").a;\n");
+ code->appendf("\t\t%s.rgb = sum.rgb * %s + %s;\n", outputColor, gain, bias);
+ code->appendf("\t\t%s.rgb *= %s.a;\n", outputColor, outputColor);
+ }
+}
+
+namespace {
+
+int encodeXY(int x, int y) {
+ SkASSERT(x >= 1 && y >= 1 && x * y <= 32);
+ if (y < x)
+ return 0x40 | encodeXY(y, x);
+ else
+ return (0x40 >> x) | (y - x);
+}
+
+};
+
+GrGLProgramStage::StageKey GrGLMatrixConvolutionEffect::GenKey(const GrCustomStage& s,
+ const GrGLCaps& caps) {
+ const GrMatrixConvolutionEffect& m = static_cast<const GrMatrixConvolutionEffect&>(s);
+ StageKey key = encodeXY(m.kernelSize().width(), m.kernelSize().height());
+ key |= m.tileMode() << 7;
+ key |= m.convolveAlpha() ? 1 << 9 : 0;
+ return key;
+}
+
+void GrGLMatrixConvolutionEffect::setData(const GrGLUniformManager& uman,
+ const GrCustomStage& data,
+ const GrRenderTarget*,
+ int stageNum) {
+ const GrMatrixConvolutionEffect& effect =
+ static_cast<const GrMatrixConvolutionEffect&>(data);
+ GrGLTexture& texture =
+ *static_cast<GrGLTexture*>(data.texture(0));
+ // the code we generated was for a specific kernel size
+ GrAssert(effect.kernelSize() == fKernelSize);
+ GrAssert(effect.tileMode() == fTileMode);
+ float imageIncrement[2];
+ imageIncrement[0] = 1.0f / texture.width();
+ imageIncrement[1] = 1.0f / texture.height();
+ uman.set2fv(fImageIncrementUni, 0, 1, imageIncrement);
+ uman.set2fv(fTargetUni, 0, 1, effect.target());
+ uman.set1fv(fKernelUni, 0, fKernelSize.width() * fKernelSize.height(), effect.kernel());
+ uman.set1f(fGainUni, effect.gain());
+ uman.set1f(fBiasUni, effect.bias());
+}
+
+GrMatrixConvolutionEffect::GrMatrixConvolutionEffect(GrTexture* texture,
+ const SkISize& kernelSize,
+ const SkScalar* kernel,
+ SkScalar gain,
+ SkScalar bias,
+ const SkIPoint& target,
+ TileMode tileMode,
+ bool convolveAlpha)
+ : INHERITED(texture),
+ fKernelSize(kernelSize),
+ fGain(SkScalarToFloat(gain)),
+ fBias(SkScalarToFloat(bias) / 255.0f),
+ fTileMode(tileMode),
+ fConvolveAlpha(convolveAlpha) {
+ fKernel = new float[kernelSize.width() * kernelSize.height()];
+ for (int i = 0; i < kernelSize.width() * kernelSize.height(); i++) {
+ fKernel[i] = SkScalarToFloat(kernel[i]);
+ }
+ fTarget[0] = target.x();
+ fTarget[1] = target.y();
+}
+
+GrMatrixConvolutionEffect::~GrMatrixConvolutionEffect() {
+ delete[] fKernel;
+}
+
+const GrProgramStageFactory& GrMatrixConvolutionEffect::getFactory() const {
+ return GrTProgramStageFactory<GrMatrixConvolutionEffect>::getInstance();
+}
+
+bool GrMatrixConvolutionEffect::isEqual(const GrCustomStage& sBase) const {
+ const GrMatrixConvolutionEffect& s =
+ static_cast<const GrMatrixConvolutionEffect&>(sBase);
+ return INHERITED::isEqual(sBase) &&
+ fKernelSize == s.kernelSize() &&
+ !memcmp(fKernel, s.kernel(), fKernelSize.width() * fKernelSize.height() * sizeof(float)) &&
+ fGain == s.gain() &&
+ fBias == s.bias() &&
+ fTarget == s.target() &&
+ fTileMode == s.tileMode() &&
+ fConvolveAlpha == s.convolveAlpha();
+}
+
+GR_DEFINE_CUSTOM_STAGE_TEST(GrMatrixConvolutionEffect);
+
+// A little bit less than the minimum # uniforms required by DX9SM2 (32).
+// Allows for a 5x5 kernel (or 25x1, for that matter).
+#define MAX_KERNEL_SIZE 25
+
+GrCustomStage* GrMatrixConvolutionEffect::TestCreate(SkRandom* random,
+ GrContext* context,
+ GrTexture* textures[]) {
+ int texIdx = random->nextBool() ? GrCustomStageUnitTest::kSkiaPMTextureIdx :
+ GrCustomStageUnitTest::kAlphaTextureIdx;
+ int width = random->nextRangeU(1, MAX_KERNEL_SIZE);
+ int height = random->nextRangeU(1, MAX_KERNEL_SIZE / width);
+ SkISize kernelSize = SkISize::Make(width, height);
+ SkScalar* kernel = new SkScalar[width * height];
+ for (int i = 0; i < width * height; i++) {
+ kernel[i] = random->nextSScalar1();
+ }
+ SkScalar gain = random->nextSScalar1();
+ SkScalar bias = random->nextSScalar1();
+ SkIPoint target = SkIPoint::Make(random->nextRangeU(0, kernelSize.width()),
+ random->nextRangeU(0, kernelSize.height()));
+ TileMode tileMode = static_cast<TileMode>(random->nextRangeU(0, 2));
+ bool convolveAlpha = random->nextBool();
+ return SkNEW_ARGS(GrMatrixConvolutionEffect, (textures[texIdx],
+ kernelSize,
+ kernel,
+ gain,
+ bias,
+ target,
+ tileMode,
+ convolveAlpha));
+
+}
+
+bool SkMatrixConvolutionImageFilter::asNewCustomStage(GrCustomStage** stage,
+ GrTexture* texture) const {
+ bool ok = fKernelSize.width() * fKernelSize.height() <= MAX_KERNEL_SIZE;
+ if (ok && stage) {
+ *stage = SkNEW_ARGS(GrMatrixConvolutionEffect, (texture,
+ fKernelSize,
+ fKernel,
+ fGain,
+ fBias,
+ fTarget,
+ fTileMode,
+ fConvolveAlpha));
+ }
+ return ok;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-10 16:10:38 +0000