From d354992d1cd148fe628b9478de7cbc3ba9fa49ca Mon Sep 17 00:00:00 2001 From: Alec Mouri Date: Wed, 24 Feb 2021 10:53:16 -0800 Subject: Remove sampling usage bit requirement for output buffers Skia RenderEngine hits a different path for creating SkSurfaces that does not enforce presence of the sampling bit, so we don't really need to enforce it here. Note that in practice the sampling bit may still be provided in anticipation of SF caching, so this is really just for tests/cleanup. Bug: 180650640 Test: First, patch out sampling usage bit in RenderSurface Test: boots Test: simulate secondary displays Test: force GPU composition Change-Id: I35558beec60b1c228e1fa0ad6382482869e1719c --- libs/renderengine/skia/SkiaGLRenderEngine.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libs/renderengine/skia/SkiaGLRenderEngine.cpp b/libs/renderengine/skia/SkiaGLRenderEngine.cpp index 327b04c699..b676a3571a 100644 --- a/libs/renderengine/skia/SkiaGLRenderEngine.cpp +++ b/libs/renderengine/skia/SkiaGLRenderEngine.cpp @@ -404,10 +404,6 @@ bool SkiaGLRenderEngine::waitFence(base::unique_fd fenceFd) { return true; } -static bool hasUsage(const AHardwareBuffer_Desc& desc, uint64_t usage) { - return !!(desc.usage & usage); -} - static float toDegrees(uint32_t transform) { switch (transform) { case ui::Transform::ROT_90: @@ -586,8 +582,6 @@ status_t SkiaGLRenderEngine::drawLayers(const DisplaySettings& display, auto& cache = mInProtectedContext ? mProtectedTextureCache : mTextureCache; AHardwareBuffer_Desc bufferDesc; AHardwareBuffer_describe(buffer->toAHardwareBuffer(), &bufferDesc); - LOG_ALWAYS_FATAL_IF(!hasUsage(bufferDesc, AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE), - "missing usage"); std::shared_ptr surfaceTextureRef = nullptr; if (useFramebufferCache) { -- cgit v1.2.3-59-g8ed1b