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

Commit 8e61de53 authored by John Stiles's avatar John Stiles
Browse files

Update SkRuntimeEffect usage to non-deprecated API. 

Bug: 180042963
Change-Id: I85dd84e3de136ab815ae81b9bf6f5455eb5df441
(cherry picked from commit 5f2f3e40)
parent 8033b081

libs/hwui/jni/Shader.cpp

+4 −6
Original line number Diff line number Diff line
@@ -239,14 +239,12 @@ static jlong ComposeShader_create(JNIEnv* env, jobject o, jlong matrixPtr, 


static jlong RuntimeShader_createShaderBuilder(JNIEnv* env, jobject, jstring sksl) {

    ScopedUtfChars strSksl(env, sksl);

    auto result = SkRuntimeEffect::Make(SkString(strSksl.c_str()));

    sk_sp<SkRuntimeEffect> effect = std::get<0>(result);

    if (effect.get() == nullptr) {

        const auto& err = std::get<1>(result);

        doThrowIAE(env, err.c_str());

    auto result = SkRuntimeEffect::Make(SkString(strSksl.c_str()), SkRuntimeEffect::Options{});

    if (result.effect.get() == nullptr) {

        doThrowIAE(env, result.errorText.c_str());

        return 0;

    }

    return reinterpret_cast<jlong>(new SkRuntimeShaderBuilder(std::move(effect)));

    return reinterpret_cast<jlong>(new SkRuntimeShaderBuilder(std::move(result.effect)));

}



static void SkRuntimeShaderBuilder_delete(SkRuntimeShaderBuilder* builder) {