Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30b34405 authored Feb 03, 2022 by Brian Osman

Remove the (deprecated) isOpaque parameter when making SkSL shaders

SkSL now deduces this, so the parameter does nothing, and is going away.

Bug: 217753125
Change-Id: I38f21d65f1e6fb8ebfb7c992a031b50e1fa7d2c9
Test: Removal of unused parameter. Existing tests still pass.

parent b220dae9

libs/renderengine/skia/filters/BlurFilter.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ static sk_sp<SkRuntimeEffect> createMixEffect() {
		uniform float mixFactor;

		half4 main(float2 xy) {
		return half4(mix(originalInput.eval(xy), blurredInput.eval(xy), mixFactor));
		return half4(mix(originalInput.eval(xy), blurredInput.eval(xy), mixFactor)).rgb1;
		}
		)");

		@@ -103,7 +103,7 @@ void BlurFilter::drawBlurRegion(SkCanvas* canvas, const SkRRect& effectRegion,
		inputMatrix);
		blurBuilder.uniform("mixFactor") = blurRadius / mMaxCrossFadeRadius;

		paint.setShader(blurBuilder.makeShader(nullptr, true));
		paint.setShader(blurBuilder.makeShader());
		} else {
		paint.setShader(blurShader);
		}

libs/renderengine/skia/filters/LinearEffect.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ sk_sp<SkShader> createLinearEffectShader(sk_sp<SkShader> shader,
		effectBuilder.uniform(uniform.name.c_str()).set(uniform.value.data(), uniform.value.size());
		}

		return effectBuilder.makeShader(nullptr, false);
		return effectBuilder.makeShader();
		}

		} // namespace skia

libs/renderengine/skia/filters/StretchShaderFactory.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -238,7 +238,7 @@ sk_sp<SkShader> StretchShaderFactory::createSkShader(const sk_sp<SkShader>& inpu
		mBuilder->uniform("viewportWidth").set(&viewportWidth, 1);
		mBuilder->uniform("viewportHeight").set(&viewportHeight, 1);

		return mBuilder->makeShader(nullptr, false);
		return mBuilder->makeShader();
		}

		} // namespace skia