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

Commit a8bad0e2 authored by Alec Mouri's avatar Alec Mouri Committed by Android (Google) Code Review
Browse files

Merge "Remove sampling usage bit requirement for output buffers" into sc-dev

parents dde1abd1 d354992d

libs/renderengine/skia/SkiaGLRenderEngine.cpp

+0 −6
Original line number Original line Diff line number Diff line
@@ -404,10 +404,6 @@ bool SkiaGLRenderEngine::waitFence(base::unique_fd fenceFd) { 
    return true;

    return true;

}

}





static bool hasUsage(const AHardwareBuffer_Desc& desc, uint64_t usage) {

    return !!(desc.usage & usage);

}



static float toDegrees(uint32_t transform) {

static float toDegrees(uint32_t transform) {

    switch (transform) {

    switch (transform) {

        case ui::Transform::ROT_90:

        case ui::Transform::ROT_90:
@@ -606,8 +602,6 @@ status_t SkiaGLRenderEngine::drawLayers(const DisplaySettings& display, 
    auto& cache = mInProtectedContext ? mProtectedTextureCache : mTextureCache;

    auto& cache = mInProtectedContext ? mProtectedTextureCache : mTextureCache;

    AHardwareBuffer_Desc bufferDesc;

    AHardwareBuffer_Desc bufferDesc;

    AHardwareBuffer_describe(buffer->toAHardwareBuffer(), &bufferDesc);

    AHardwareBuffer_describe(buffer->toAHardwareBuffer(), &bufferDesc);

    LOG_ALWAYS_FATAL_IF(!hasUsage(bufferDesc, AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE),

                        "missing usage");





    std::shared_ptr<AutoBackendTexture::LocalRef> surfaceTextureRef = nullptr;

    std::shared_ptr<AutoBackendTexture::LocalRef> surfaceTextureRef = nullptr;

    if (useFramebufferCache) {

    if (useFramebufferCache) {