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

Commit 174b804e authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Automerger Merge Worker
Browse files

Merge "Update SkRuntimeEffect usage to non-deprecated API." into sc-dev am: 33016d32 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13554983

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ee74f7107033e52b31c8f09dbca629062abc84a
parents eb55a586 33016d32

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) {