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

Commit 6ab0ff72 authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Automerger Merge Worker
Browse files

Merge "Update shader declarations to use 'uniform' instead of 'in'" into sc-dev am: 667ddf53

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

Change-Id: Ifd4a4502e6f325da806f23d8fab203fc41b01748
parents f291b8ff 667ddf53
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ namespace skia {

BlurFilter::BlurFilter() {
    SkString blurString(R"(
        in shader input;
        uniform shader input;
        uniform float2 in_blurOffset;
        uniform float2 in_maxSizeXY;

@@ -60,8 +60,8 @@ BlurFilter::BlurFilter() {
    mBlurEffect = std::move(blurEffect);

    SkString mixString(R"(
        in shader blurredInput;
        in shader originalInput;
        uniform shader blurredInput;
        uniform shader originalInput;
        uniform float mixFactor;

        half4 main(float2 xy) {