7c0273f107
Reason for revert: Looks like this change is causing layout test failures which is blocking Skia's DEPS roll into Chromium: https://codereview.chromium.org/1050563002/ https://codereview.chromium.org/1043133005/ https://codereview.chromium.org/1048273002/ Reverting to see if this fixes the DEPS roll. Original issue's description: > Implement approx-match support in image filter saveLayer() offscreen. > > Currently, the GPU-side image filter implementation creates > exact-match textures for the offscreen backing stores for > saveLayer(). This is because several filters have GPU > implementations which depend on the texture coordinates > being 0..1. > > The fix is three-fold: > > 1) Store the actual requested size in the SkGpuDevice, so > that when wrapping it in an SkBitmap for passing to > filterImage(), we can give it the original size. > 2) Fix the filters (SkMagnifierImageFilter, > SkLightingImageFilter) whose GPU implementation depends on > 0..1 texture coordinates. > 3) Remove the exception for GPU-side image filters in > SkCanvas::internalSaveLayer(). > > For the lighting filters, there were two bugs which were > cancelling each other out: the sobel filter matrix was > being computed upside down, but then we'd negate the > resulting normal. This worked fine in the exact-match case, > but in the approx-match case we'd sample garbage along > the edge pixels. Also, we never implemented the edge pixels > according to spec in the GPU case. It requires a > different fragment shader for each edge of the nine-patch, > which meant we couldn't use asFragmentProcessor(), and had > to implement the drawing via a filterImageGPU() override. > In order to avoid polluting the public API, I inserted a > new base class, SkLightingImageFilterInternal above > Sk[Diffuse|Specular]LightingImageFilter to handle the > implementation. > > N.B.: this change will cause some minor pixel diffs in the > GPU results of the following GMs (and possibly more): > matriximagefilter, matrixconvolution, imagefiltersscaled, > lighting, imagemagnifier, filterfastbounds, > complexclip_aa_Layer_invert, complexclip_aa_layer, > complexclip_bw_layer_invert, complexclip_bw_layer. > > BUG=skia:3532 > > Committed: https://skia.googlesource.com/skia/+/b97dafefe63ea0a1bbce8e8b209f4920983fb8b9 > > Committed: https://skia.googlesource.com/skia/+/f5f8518fe0bbd2703e4ffc1b11ad7b4312ff7641 TBR=bsalomon@google.com,reed@chromium.org,senorblanco@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:3532 Review URL: https://codereview.chromium.org/1057443003
129 lines
4.7 KiB
C++
129 lines
4.7 KiB
C++
/*
|
|
* Copyright 2012 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 "SkLightingImageFilter.h"
|
|
|
|
#define WIDTH 330
|
|
#define HEIGHT 440
|
|
|
|
namespace skiagm {
|
|
|
|
class ImageLightingGM : public GM {
|
|
public:
|
|
ImageLightingGM() : fInitialized(false) {
|
|
this->setBGColor(0xFF000000);
|
|
}
|
|
|
|
protected:
|
|
|
|
SkString onShortName() override {
|
|
return SkString("lighting");
|
|
}
|
|
|
|
void make_bitmap() {
|
|
fBitmap.allocN32Pixels(100, 100);
|
|
SkCanvas canvas(fBitmap);
|
|
canvas.clear(0x00000000);
|
|
SkPaint paint;
|
|
paint.setAntiAlias(true);
|
|
sk_tool_utils::set_portable_typeface(&paint);
|
|
paint.setColor(0xFFFFFFFF);
|
|
paint.setTextSize(SkIntToScalar(96));
|
|
const char* str = "e";
|
|
canvas.drawText(str, strlen(str), SkIntToScalar(20), SkIntToScalar(70), paint);
|
|
}
|
|
|
|
SkISize onISize() override {
|
|
return SkISize::Make(WIDTH, HEIGHT);
|
|
}
|
|
|
|
void drawClippedBitmap(SkCanvas* canvas, const SkPaint& paint, int x, int y) {
|
|
canvas->save();
|
|
canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
|
|
canvas->clipRect(SkRect::MakeWH(
|
|
SkIntToScalar(fBitmap.width()), SkIntToScalar(fBitmap.height())));
|
|
canvas->drawBitmap(fBitmap, 0, 0, &paint);
|
|
canvas->restore();
|
|
}
|
|
|
|
void onDraw(SkCanvas* canvas) override {
|
|
if (!fInitialized) {
|
|
make_bitmap();
|
|
fInitialized = true;
|
|
}
|
|
canvas->clear(0xFF101010);
|
|
SkPaint checkPaint;
|
|
checkPaint.setColor(0xFF202020);
|
|
for (int y = 0; y < HEIGHT; y += 16) {
|
|
for (int x = 0; x < WIDTH; x += 16) {
|
|
canvas->save();
|
|
canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
|
|
canvas->drawRect(SkRect::MakeXYWH(8, 0, 8, 8), checkPaint);
|
|
canvas->drawRect(SkRect::MakeXYWH(0, 8, 8, 8), checkPaint);
|
|
canvas->restore();
|
|
}
|
|
}
|
|
SkPoint3 pointLocation(0, 0, SkIntToScalar(10));
|
|
SkScalar azimuthRad = SkDegreesToRadians(SkIntToScalar(225));
|
|
SkScalar elevationRad = SkDegreesToRadians(SkIntToScalar(5));
|
|
SkPoint3 distantDirection(SkScalarMul(SkScalarCos(azimuthRad), SkScalarCos(elevationRad)),
|
|
SkScalarMul(SkScalarSin(azimuthRad), SkScalarCos(elevationRad)),
|
|
SkScalarSin(elevationRad));
|
|
SkPoint3 spotLocation(SkIntToScalar(-10), SkIntToScalar(-10), SkIntToScalar(20));
|
|
SkPoint3 spotTarget(SkIntToScalar(40), SkIntToScalar(40), 0);
|
|
SkScalar spotExponent = SK_Scalar1;
|
|
SkScalar cutoffAngle = SkIntToScalar(15);
|
|
SkScalar kd = SkIntToScalar(2);
|
|
SkScalar ks = SkIntToScalar(1);
|
|
SkScalar shininess = SkIntToScalar(8);
|
|
SkScalar surfaceScale = SkIntToScalar(1);
|
|
SkColor white(0xFFFFFFFF);
|
|
SkPaint paint;
|
|
|
|
SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(20, 10, 60, 65));
|
|
|
|
int y = 0;
|
|
for (int i = 0; i < 2; i++) {
|
|
const SkImageFilter::CropRect* cr = (i == 0) ? NULL : &cropRect;
|
|
paint.setImageFilter(SkLightingImageFilter::CreatePointLitDiffuse(pointLocation, white, surfaceScale, kd, NULL, cr))->unref();
|
|
drawClippedBitmap(canvas, paint, 0, y);
|
|
|
|
paint.setImageFilter(SkLightingImageFilter::CreateDistantLitDiffuse(distantDirection, white, surfaceScale, kd, NULL, cr))->unref();
|
|
drawClippedBitmap(canvas, paint, 110, y);
|
|
|
|
paint.setImageFilter(SkLightingImageFilter::CreateSpotLitDiffuse(spotLocation, spotTarget, spotExponent, cutoffAngle, white, surfaceScale, kd, NULL, cr))->unref();
|
|
drawClippedBitmap(canvas, paint, 220, y);
|
|
|
|
y += 110;
|
|
|
|
paint.setImageFilter(SkLightingImageFilter::CreatePointLitSpecular(pointLocation, white, surfaceScale, ks, shininess, NULL, cr))->unref();
|
|
drawClippedBitmap(canvas, paint, 0, y);
|
|
|
|
paint.setImageFilter(SkLightingImageFilter::CreateDistantLitSpecular(distantDirection, white, surfaceScale, ks, shininess, NULL, cr))->unref();
|
|
drawClippedBitmap(canvas, paint, 110, y);
|
|
|
|
paint.setImageFilter(SkLightingImageFilter::CreateSpotLitSpecular(spotLocation, spotTarget, spotExponent, cutoffAngle, white, surfaceScale, ks, shininess, NULL, cr))->unref();
|
|
drawClippedBitmap(canvas, paint, 220, y);
|
|
|
|
y += 110;
|
|
}
|
|
}
|
|
|
|
private:
|
|
typedef GM INHERITED;
|
|
SkBitmap fBitmap;
|
|
bool fInitialized;
|
|
};
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
static GM* MyFactory(void*) { return new ImageLightingGM; }
|
|
static GMRegistry reg(MyFactory);
|
|
|
|
}
|