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

Commit 924d8227 authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Fix shadow radius too large for RS" into nyc-dev

parents 28d9c9f7 f3754a84

libs/hwui/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ LOCAL_SRC_FILES += \ 
    tests/unit/DamageAccumulatorTests.cpp \

    tests/unit/DeviceInfoTests.cpp \

    tests/unit/FatVectorTests.cpp \

    tests/unit/FontRendererTests.cpp \

    tests/unit/GlopBuilderTests.cpp \

    tests/unit/GpuMemoryTrackerTests.cpp \

    tests/unit/GradientCacheTests.cpp \

libs/hwui/FontRenderer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ bool FontRenderer::renderTextOnPath(const SkPaint* paint, const Rect* clip, cons 
void FontRenderer::blurImage(uint8_t** image, int32_t width, int32_t height, float radius) {

    uint32_t intRadius = Blur::convertRadiusToInt(radius);

#ifdef ANDROID_ENABLE_RENDERSCRIPT

    if (width * height * intRadius >= RS_MIN_INPUT_CUTOFF) {

    if (width * height * intRadius >= RS_MIN_INPUT_CUTOFF && radius <= 25.0f) {

        uint8_t* outImage = (uint8_t*) memalign(RS_CPU_ALLOCATION_ALIGNMENT, width * height);



        if (mRs == nullptr) {

libs/hwui/tests/unit/FontRendererTests.cpp

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

 * Copyright (C) 2016 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 "GammaFontRenderer.h"

#include "tests/common/TestUtils.h"



using namespace android::uirenderer;



static bool isZero(uint8_t* data, int size) {

    for (int i = 0; i < size; i++) {

        if (data[i]) return false;

    }

    return true;

}



RENDERTHREAD_TEST(FontRenderer, renderDropShadow) {

    SkPaint paint;

    paint.setTextSize(10);

    paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);

    GammaFontRenderer gammaFontRenderer;

    FontRenderer& fontRenderer = gammaFontRenderer.getFontRenderer();

    fontRenderer.setFont(&paint, SkMatrix::I());



    std::vector<glyph_t> glyphs;

    std::vector<float> positions;

    float totalAdvance;

    Rect bounds;

    TestUtils::layoutTextUnscaled(paint, "This is a test",

            &glyphs, &positions, &totalAdvance, &bounds);



    for (int radius : {28, 20, 2}) {

        auto result = fontRenderer.renderDropShadow(&paint, glyphs.data(), glyphs.size(),

                radius, positions.data());

        ASSERT_NE(nullptr, result.image);

        EXPECT_FALSE(isZero(result.image, result.width * result.height));

        EXPECT_LE(bounds.getWidth() + radius * 2, (int) result.width);

        EXPECT_LE(bounds.getHeight() + radius * 2, (int) result.height);

        delete result.image;

    }

}