diff options
author | 2022-02-03 14:48:12 -0500 | |
---|---|---|
committer | 2022-02-08 22:12:36 +0000 | |
commit | bb7c43d184751463b3248b57db3d653e4523dc22 (patch) | |
tree | 2cd7fb24ac7417884c6be13810df2edcba5c9899 | |
parent | f43fc83ff8c16a4911cc2f4856fb268a170c7ab8 (diff) |
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: I673537a9900b5d3219f3914b3b93e0b5e97329db
Test: Removal of unused parameter. Existing tests still pass.
-rw-r--r-- | libs/hwui/effects/StretchEffect.cpp | 2 | ||||
-rw-r--r-- | libs/hwui/jni/Shader.cpp | 2 | ||||
-rw-r--r-- | libs/hwui/pipeline/skia/AnimatedDrawables.h | 2 | ||||
-rw-r--r-- | libs/hwui/pipeline/skia/LayerDrawable.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libs/hwui/effects/StretchEffect.cpp b/libs/hwui/effects/StretchEffect.cpp index 8cb451528396..2757c3952dbb 100644 --- a/libs/hwui/effects/StretchEffect.cpp +++ b/libs/hwui/effects/StretchEffect.cpp @@ -227,7 +227,7 @@ sk_sp<SkShader> StretchEffect::getShader(float width, float height, mBuilder->uniform("viewportWidth").set(&width, 1); mBuilder->uniform("viewportHeight").set(&height, 1); - auto result = mBuilder->makeShader(nullptr, false); + auto result = mBuilder->makeShader(); mBuilder->child(CONTENT_TEXTURE) = nullptr; return result; } diff --git a/libs/hwui/jni/Shader.cpp b/libs/hwui/jni/Shader.cpp index 899c7d4d75e2..0bbd8a8cf97c 100644 --- a/libs/hwui/jni/Shader.cpp +++ b/libs/hwui/jni/Shader.cpp @@ -264,7 +264,7 @@ static jlong RuntimeShader_getNativeFinalizer(JNIEnv*, jobject) { static jlong RuntimeShader_create(JNIEnv* env, jobject, jlong shaderBuilder, jlong matrixPtr) { SkRuntimeShaderBuilder* builder = reinterpret_cast<SkRuntimeShaderBuilder*>(shaderBuilder); const SkMatrix* matrix = reinterpret_cast<const SkMatrix*>(matrixPtr); - sk_sp<SkShader> shader = builder->makeShader(matrix, false); + sk_sp<SkShader> shader = builder->makeShader(matrix); ThrowIAE_IfNull(env, shader); return reinterpret_cast<jlong>(shader.release()); } diff --git a/libs/hwui/pipeline/skia/AnimatedDrawables.h b/libs/hwui/pipeline/skia/AnimatedDrawables.h index d173782fd880..9cf93e66cfbe 100644 --- a/libs/hwui/pipeline/skia/AnimatedDrawables.h +++ b/libs/hwui/pipeline/skia/AnimatedDrawables.h @@ -110,7 +110,7 @@ public: const float rotation3 = turbulencePhase * PI_ROTATE_RIGHT + 2.75 * PI; setUniform2f(effectBuilder, "in_tRotation3", cos(rotation3), sin(rotation3)); - params.paint->value.setShader(effectBuilder.makeShader(nullptr, false)); + params.paint->value.setShader(effectBuilder.makeShader()); canvas->drawCircle(params.x->value, params.y->value, params.radius->value, params.paint->value); } diff --git a/libs/hwui/pipeline/skia/LayerDrawable.cpp b/libs/hwui/pipeline/skia/LayerDrawable.cpp index 7c57bd52d6fe..2fba13c3cfea 100644 --- a/libs/hwui/pipeline/skia/LayerDrawable.cpp +++ b/libs/hwui/pipeline/skia/LayerDrawable.cpp @@ -98,7 +98,7 @@ static 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(); } static bool isHdrDataspace(ui::Dataspace dataspace) { |