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

Commit c401b235 authored by Nader Jawad's avatar Nader Jawad
Browse files

Fixed issue where layers were not always used 

Fixed issue where requiresLayer logic was filtering
on the type of stretch behavior when it should no
longer be the case in order to maintain consistent
rendering behavior across stretch behaviors

Fixes: 188923672
Test: Added HWUI StretchEffect test
Change-Id: Ief4f010949b97302bd2d71f26f0f892c8e7f374f
parent e4cc52ac

libs/hwui/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -671,6 +671,7 @@ cc_test { 
        "tests/unit/SkiaPipelineTests.cpp",

        "tests/unit/SkiaRenderPropertiesTests.cpp",

        "tests/unit/SkiaCanvasTests.cpp",

        "tests/unit/StretchEffectTests.cpp",

        "tests/unit/StringUtilsTests.cpp",

        "tests/unit/TestUtilsTests.cpp",

        "tests/unit/ThreadBaseTests.cpp",

libs/hwui/effects/StretchEffect.h

+1 −2
Original line number Diff line number Diff line
@@ -110,8 +110,7 @@ public: 
    }



    bool requiresLayer() const {

        return !(isEmpty() ||

                 Properties::getStretchEffectBehavior() == StretchEffectBehavior::UniformScale);

        return !isEmpty();

    }



private:

libs/hwui/tests/unit/StretchEffectTests.cpp

0 → 100644
+61 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <gtest/gtest.h>

#include <effects/StretchEffect.h>

#include "tests/common/TestUtils.h"

#include "Properties.h"



using namespace android;

using namespace android::uirenderer;



TEST(StretchEffect, noStretchDirectionDoesNotRequireLayer) {

  Properties::setStretchEffectBehavior(StretchEffectBehavior::ShaderHWUI);

  auto stretchEffect = StretchEffect({.fX = 0.f, .fY = 0.f}, 100.f, 100.f);

  ASSERT_FALSE(stretchEffect.requiresLayer());



  Properties::setStretchEffectBehavior(StretchEffectBehavior::UniformScale);

  ASSERT_FALSE(stretchEffect.requiresLayer());

}



TEST(StretchEffect, horizontalStretchRequiresLayer) {

  Properties::setStretchEffectBehavior(StretchEffectBehavior::ShaderHWUI);

  auto stretchEffect = StretchEffect({.fX = 1.f, .fY = 0.f}, 100.f, 100.f);

  ASSERT_TRUE(stretchEffect.requiresLayer());



  Properties::setStretchEffectBehavior(StretchEffectBehavior::UniformScale);

  ASSERT_TRUE(stretchEffect.requiresLayer());

}



TEST(StretchEffect, verticalStretchRequiresLayer) {

  Properties::setStretchEffectBehavior(StretchEffectBehavior::ShaderHWUI);



  auto stretchEffect = StretchEffect({.fX = 0.f, .fY = 1.f}, 100.f, 100.f);

  ASSERT_TRUE(stretchEffect.requiresLayer());



  Properties::setStretchEffectBehavior(StretchEffectBehavior::UniformScale);

  ASSERT_TRUE(stretchEffect.requiresLayer());

}



TEST(StretchEffect, bidirectionalStretchRequiresLayer) {

  Properties::setStretchEffectBehavior(StretchEffectBehavior::ShaderHWUI);



  auto stretchEffect = StretchEffect({.fX = 1.f, .fY = 1.f}, 100.f, 100.f);

  ASSERT_TRUE(stretchEffect.requiresLayer());



  Properties::setStretchEffectBehavior(StretchEffectBehavior::UniformScale);

  ASSERT_TRUE(stretchEffect.requiresLayer());

}
 
 No newline at end of file