summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alec Mouri <alecmouri@google.com> 2021-02-24 23:43:02 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-02-24 23:43:02 +0000
commita8bad0e28a3ba92eed11b75d1e18f00b79f70efa (patch)
tree7a75a38b984b80f63e5feb4551e3cc101d13a22e
parentdde1abd1f9551588b69825295005cc8482bbef06 (diff)
parentd354992d1cd148fe628b9478de7cbc3ba9fa49ca (diff)
Merge "Remove sampling usage bit requirement for output buffers" into sc-dev
-rw-r--r--libs/renderengine/skia/SkiaGLRenderEngine.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/libs/renderengine/skia/SkiaGLRenderEngine.cpp b/libs/renderengine/skia/SkiaGLRenderEngine.cpp
index 9f40011411..6c6db46fe4 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:
@@ -606,8 +602,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<AutoBackendTexture::LocalRef> surfaceTextureRef = nullptr;
if (useFramebufferCache) {