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

Commit b0c9cf5c authored by Leon Scroggins III's avatar Leon Scroggins III
Browse files

Treat AHARDWAREBUFFER_FORMAT_R8_UNORM as kAlpha_8_SkAlphaType 

I4846327b29736ee811672801a683deb287342a8e added
AHARDWAREBUFFER_FORMAT_R8_UNORM. Treat it as kAlpha_8_SkAlphaType, since
we'll be using it as an alpha mask.

Bug: 193170859
Test: TODO

Change-Id: I24bebaff63bb1e98ec8a8178797ec25d2f6bc89a
parent 21684a25

libs/hwui/utils/Color.cpp

+6 −0
Original line number Diff line number Diff line
@@ -57,6 +57,10 @@ static inline SkImageInfo createImageInfo(int32_t width, int32_t height, int32_t 
            colorType = kRGBA_F16_SkColorType;

            alphaType = kPremul_SkAlphaType;

            break;

        case AHARDWAREBUFFER_FORMAT_R8_UNORM:

            colorType = kAlpha_8_SkColorType;

            alphaType = kPremul_SkAlphaType;

            break;

        default:

            ALOGV("Unsupported format: %d, return unknown by default", format);

            break;
@@ -90,6 +94,8 @@ uint32_t ColorTypeToBufferFormat(SkColorType colorType) { 
            // Hardcoding the value from android::PixelFormat

            static constexpr uint64_t kRGBA4444 = 7;

            return kRGBA4444;

        case kAlpha_8_SkColorType:

              return AHARDWAREBUFFER_FORMAT_R8_UNORM;

        default:

            ALOGV("Unsupported colorType: %d, return RGBA_8888 by default", (int)colorType);

            return AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM;