commit a8bad0e28a3ba92eed11b75d1e18f00b79f70efa
author Alec Mouri <alecmouri@google.com> Wed Feb 24 23:43:02 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 24 23:43:02 2021 +0000
tree 7a75a38b984b80f63e5feb4551e3cc101d13a22e
parent dde1abd1f9551588b69825295005cc8482bbef06
parent d354992d1cd148fe628b9478de7cbc3ba9fa49ca

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

libs/renderengine/skia/SkiaGLRenderEngine.cpp

diff --git a/libs/renderengine/skia/SkiaGLRenderEngine.cpp b/libs/renderengine/skia/SkiaGLRenderEngine.cpp
index 9f40011..6c6db46 100644
--- a/libs/renderengine/skia/SkiaGLRenderEngine.cpp
+++ b/libs/renderengine/skia/SkiaGLRenderEngine.cpp
@@ -404,10 +404,6 @@
     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:
@@ -606,8 +602,6 @@
     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<AutoBackendTexture::LocalRef> surfaceTextureRef = nullptr;
     if (useFramebufferCache) {