aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/effects
diff options
context:
space:
mode:
Diffstat (limited to 'src/effects')
-rw-r--r--src/effects/GrCircleBlurFragmentProcessor.h2
-rw-r--r--src/effects/SkArithmeticMode_gpu.cpp2
-rw-r--r--src/effects/SkArithmeticMode_gpu.h2
-rw-r--r--src/effects/SkBlurMaskFilter.cpp16
-rw-r--r--src/effects/SkLightingImageFilter.cpp12
-rw-r--r--src/effects/SkMagnifierImageFilter.cpp6
6 files changed, 20 insertions, 20 deletions
diff --git a/src/effects/GrCircleBlurFragmentProcessor.h b/src/effects/GrCircleBlurFragmentProcessor.h
index 7754a2eda4..66072887da 100644
--- a/src/effects/GrCircleBlurFragmentProcessor.h
+++ b/src/effects/GrCircleBlurFragmentProcessor.h
@@ -22,7 +22,7 @@ class GrTextureProvider;
// profile that is just rotated about the origin of the circle.
class GrCircleBlurFragmentProcessor : public GrFragmentProcessor {
public:
- ~GrCircleBlurFragmentProcessor() override {};
+ ~GrCircleBlurFragmentProcessor() override {}
const char* name() const override { return "CircleBlur"; }
diff --git a/src/effects/SkArithmeticMode_gpu.cpp b/src/effects/SkArithmeticMode_gpu.cpp
index 50c46ad243..d20ebbe42b 100644
--- a/src/effects/SkArithmeticMode_gpu.cpp
+++ b/src/effects/SkArithmeticMode_gpu.cpp
@@ -219,7 +219,7 @@ private:
const ArithmeticXP& arith = processor.cast<ArithmeticXP>();
pdman.set4f(fKUni, arith.k1(), arith.k2(), arith.k3(), arith.k4());
fEnforcePMColor = arith.enforcePMColor();
- };
+ }
GrGLSLProgramDataManager::UniformHandle fKUni;
bool fEnforcePMColor;
diff --git a/src/effects/SkArithmeticMode_gpu.h b/src/effects/SkArithmeticMode_gpu.h
index 98cbaf90a5..4704399d24 100644
--- a/src/effects/SkArithmeticMode_gpu.h
+++ b/src/effects/SkArithmeticMode_gpu.h
@@ -37,7 +37,7 @@ public:
std::move(dst)));
}
- ~GrArithmeticFP() override {};
+ ~GrArithmeticFP() override {}
const char* name() const override { return "Arithmetic"; }
diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp
index 9d6600fe2f..c32e111f29 100644
--- a/src/effects/SkBlurMaskFilter.cpp
+++ b/src/effects/SkBlurMaskFilter.cpp
@@ -125,7 +125,7 @@ private:
const SkScalar SkBlurMaskFilterImpl::kMAX_BLUR_SIGMA = SkIntToScalar(128);
-sk_sp<SkMaskFilter> SkBlurMaskFilter::Make(SkBlurStyle style, SkScalar sigma,
+sk_sp<SkMaskFilter> SkBlurMaskFilter::Make(SkBlurStyle style, SkScalar sigma,
const SkRect& occluder, uint32_t flags) {
if (!SkScalarIsFinite(sigma) || sigma <= 0) {
return nullptr;
@@ -184,7 +184,7 @@ static uint32_t insert_into_arrays(SkScalar* array1, SkScalar* array2,
(*num)++;
}
break;
- }
+ }
}
return skipMask;
@@ -1072,7 +1072,7 @@ public:
float sigma, float xformedSigma,
const SkRRect& srcRRect, const SkRRect& devRRect);
- virtual ~GrRRectBlurEffect() {};
+ virtual ~GrRRectBlurEffect() {}
const char* name() const override { return "GrRRectBlur"; }
const SkRRect& getRRect() const { return fRRect; }
@@ -1128,7 +1128,7 @@ static sk_sp<GrTexture> find_or_create_rrect_blur_mask(GrContext* context,
if (!dc) {
return nullptr;
}
-
+
GrPaint grPaint;
grPaint.setAntiAlias(doAA);
@@ -1175,13 +1175,13 @@ sk_sp<GrFragmentProcessor> GrRRectBlurEffect::Make(GrContext* context,
int ignoredSize;
uint32_t ignored32;
- bool ninePatchable = SkBlurMaskFilter::ComputeBlurredRRectParams(srcRRect, devRRect,
+ bool ninePatchable = SkBlurMaskFilter::ComputeBlurredRRectParams(srcRRect, devRRect,
SkRect::MakeEmpty(),
sigma, xformedSigma,
&rrectToDraw, &size,
ignored, ignored,
- ignored, ignored,
- &ignoredSize, &ignoredSize,
+ ignored, ignored,
+ &ignoredSize, &ignoredSize,
&ignored32);
if (!ninePatchable) {
return nullptr;
@@ -1423,7 +1423,7 @@ bool SkBlurMaskFilterImpl::directFilterRRectMaskGPU(GrContext* context,
static const uint16_t fullI[6] = { 0, 1, 2, 0, 2, 3 };
memcpy(indices, fullI, sizeof(fullI));
numIndices = 6;
- }
+ }
drawContext->drawVertices(clip, newPaint, viewMatrix, kTriangles_GrPrimitiveType,
numPoints, points, nullptr, nullptr, indices, numIndices);
diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp
index 66d3a17883..56275743d7 100644
--- a/src/effects/SkLightingImageFilter.cpp
+++ b/src/effects/SkLightingImageFilter.cpp
@@ -357,7 +357,7 @@ protected:
}
#if SK_SUPPORT_GPU
- sk_sp<SkSpecialImage> filterImageGPU(SkSpecialImage* source,
+ sk_sp<SkSpecialImage> filterImageGPU(SkSpecialImage* source,
SkSpecialImage* input,
const SkIRect& bounds,
const SkMatrix& matrix,
@@ -802,7 +802,7 @@ public:
SkPoint3 surfaceToLight(int x, int y, int z, SkScalar surfaceScale) const {
return fDirection;
- };
+ }
const SkPoint3& lightColor(const SkPoint3&) const { return this->color(); }
LightType type() const override { return kDistant_LightType; }
const SkPoint3& direction() const { return fDirection; }
@@ -861,7 +861,7 @@ public:
surfaceScale));
fast_normalize(&direction);
return direction;
- };
+ }
const SkPoint3& lightColor(const SkPoint3&) const { return this->color(); }
LightType type() const override { return kPoint_LightType; }
const SkPoint3& location() const { return fLocation; }
@@ -966,7 +966,7 @@ public:
surfaceScale));
fast_normalize(&direction);
return direction;
- };
+ }
SkPoint3 lightColor(const SkPoint3& surfaceToLight) const {
SkScalar cosAngle = -surfaceToLight.dot(fS);
SkScalar scale = 0;
@@ -1118,7 +1118,7 @@ sk_sp<SkImageFilter> SkLightingImageFilter::MakeDistantLitDiffuse(const SkPoint3
sk_sp<SkImageFilter> input,
const CropRect* cropRect) {
sk_sp<SkImageFilterLight> light(new SkDistantLight(direction, lightColor));
- return SkDiffuseLightingImageFilter::Make(std::move(light), surfaceScale, kd,
+ return SkDiffuseLightingImageFilter::Make(std::move(light), surfaceScale, kd,
std::move(input), cropRect);
}
@@ -1212,7 +1212,7 @@ sk_sp<SkImageFilter> SkDiffuseLightingImageFilter::Make(sk_sp<SkImageFilterLight
if (kd < 0) {
return nullptr;
}
- return sk_sp<SkImageFilter>(new SkDiffuseLightingImageFilter(std::move(light), surfaceScale,
+ return sk_sp<SkImageFilter>(new SkDiffuseLightingImageFilter(std::move(light), surfaceScale,
kd, std::move(input), cropRect));
}
diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp
index 4b03125739..c546730e80 100644
--- a/src/effects/SkMagnifierImageFilter.cpp
+++ b/src/effects/SkMagnifierImageFilter.cpp
@@ -42,7 +42,7 @@ public:
xInvInset, yInvInset));
}
- ~GrMagnifierEffect() override {};
+ ~GrMagnifierEffect() override {}
const char* name() const override { return "Magnifier"; }
@@ -311,9 +311,9 @@ sk_sp<SkSpecialImage> SkMagnifierImageFilter::onFilterImage(SkSpecialImage* sour
offset->fY = bounds.top();
bounds.offset(-inputOffset);
- SkScalar yOffset = inputTexture->origin() == kTopLeft_GrSurfaceOrigin
+ SkScalar yOffset = inputTexture->origin() == kTopLeft_GrSurfaceOrigin
? fSrcRect.y()
- : inputTexture->height() -
+ : inputTexture->height() -
fSrcRect.height() * inputTexture->height() / bounds.height() - fSrcRect.y();
int boundsY = inputTexture->origin() == kTopLeft_GrSurfaceOrigin
? bounds.y()
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 02:12:19 +0000