339b84e78c
Re-enable the code to test the emboss mask filter, updating it to use the new emboss mask filter factory. Add a test to ensure that embossed text is drawn correctly, as before glyphs did not allocate the proper amount of memory for the k3D_Format which the emboss mask filter produces. Fixes SkEmbossMask::Emboss to write the whole of the mul and add planes to avoid pixel differences and MemorySanitizer errors. Update the GPU to understand the k3D_Format and use just the alpha plane, ignoring the mul and add plane which it currently cannot support. Change-Id: I90edf34a918c06b0c6b24bfc43ce7031419eca41 Reviewed-on: https://skia-review.googlesource.com/70260 Reviewed-on: https://skia-review.googlesource.com/70962 Reviewed-on: https://skia-review.googlesource.com/71282 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
81 lines
2.3 KiB
C++
81 lines
2.3 KiB
C++
/*
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "gm.h"
|
|
#include "SkBlurMask.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkColorFilter.h"
|
|
#include "SkEmbossMaskFilter.h"
|
|
|
|
static SkBitmap make_bm() {
|
|
SkBitmap bm;
|
|
bm.allocN32Pixels(100, 100);
|
|
|
|
SkCanvas canvas(bm);
|
|
canvas.clear(0);
|
|
SkPaint paint;
|
|
paint.setAntiAlias(true);
|
|
canvas.drawCircle(50, 50, 50, paint);
|
|
return bm;
|
|
}
|
|
|
|
class EmbossGM : public skiagm::GM {
|
|
public:
|
|
EmbossGM() {
|
|
}
|
|
|
|
protected:
|
|
SkString onShortName() override {
|
|
return SkString("emboss");
|
|
}
|
|
|
|
SkISize onISize() override {
|
|
return SkISize::Make(600, 120);
|
|
}
|
|
|
|
void onDraw(SkCanvas* canvas) override {
|
|
SkPaint paint;
|
|
SkBitmap bm = make_bm();
|
|
canvas->drawBitmap(bm, 10, 10, &paint);
|
|
canvas->translate(bm.width() + SkIntToScalar(10), 0);
|
|
|
|
paint.setMaskFilter(SkEmbossMaskFilter::Make(
|
|
SkBlurMask::ConvertRadiusToSigma(3),
|
|
{ { SK_Scalar1, SK_Scalar1, SK_Scalar1 }, 0, 128, 16*2 }));
|
|
canvas->drawBitmap(bm, 10, 10, &paint);
|
|
canvas->translate(bm.width() + SkIntToScalar(10), 0);
|
|
|
|
// this combination of emboss+colorfilter used to crash -- so we exercise it to
|
|
// confirm that we have a fix.
|
|
paint.setColorFilter(SkColorFilter::MakeModeFilter(0xFFFF0000, SkBlendMode::kSrcATop));
|
|
canvas->drawBitmap(bm, 10, 10, &paint);
|
|
canvas->translate(bm.width() + SkIntToScalar(10), 0);
|
|
|
|
paint.setAntiAlias(true);
|
|
paint.setStyle(SkPaint::kStroke_Style);
|
|
paint.setStrokeWidth(SkIntToScalar(10));
|
|
paint.setMaskFilter(SkEmbossMaskFilter::Make(
|
|
SkBlurMask::ConvertRadiusToSigma(4),
|
|
{ { SK_Scalar1, SK_Scalar1, SK_Scalar1 }, 0, 128, 16*2 }));
|
|
paint.setColorFilter(nullptr);
|
|
paint.setShader(SkShader::MakeColorShader(SK_ColorBLUE));
|
|
paint.setDither(true);
|
|
canvas->drawCircle(SkIntToScalar(50), SkIntToScalar(50),
|
|
SkIntToScalar(30), paint);
|
|
canvas->translate(SkIntToScalar(100), 0);
|
|
|
|
paint.setStyle(SkPaint::kFill_Style);
|
|
paint.setTextSize(50);
|
|
canvas->drawText("Hello", 5, 0, 50, paint);
|
|
}
|
|
|
|
private:
|
|
typedef skiagm::GM INHERITED;
|
|
};
|
|
|
|
DEF_GM(return new EmbossGM;)
|