File 0002-libtaskmanager-Don-t-request-dmabuf-if-not... of Package plasma5-workspace

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-libtaskmanager-Don-t-request-dmabuf-if-not-supported.patch of Package plasma5-workspace (Revision a9e033efafaf4e28a9e6450fcd175dc9)

Currently displaying revision a9e033efafaf4e28a9e6450fcd175dc9 , Show latest

From a65b7f2bf9a95f981c75437a30af9b39a67f283a Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Fri, 24 Sep 2021 08:32:59 +0200
Subject: [PATCH 2/2] libtaskmanager: Don't request dmabuf if not supported

Previously, it specified invalid modifiers on failure, but that means that
everything is accepted.

BUG: 428284
(cherry picked from commit 059993c56b9b26139e5021175f5e7dde00d4e015)
---
 libtaskmanager/declarative/pipewiresourcestream.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/libtaskmanager/declarative/pipewiresourcestream.cpp b/libtaskmanager/declarative/pipewiresourcestream.cpp
index b4c2fdc4f..aeee03b40 100644
--- a/libtaskmanager/declarative/pipewiresourcestream.cpp
+++ b/libtaskmanager/declarative/pipewiresourcestream.cpp
@@ -66,7 +66,7 @@ static std::vector<uint64_t> queryDmaBufModifiers(EGLDisplay display, uint32_t f
     uint32_t drm_format = SpaPixelFormatToDrmFormat(format);
     if (drm_format == DRM_FORMAT_INVALID) {
         qCDebug(PIPEWIRE_LOGGING) << "Failed to find matching DRM format." << format;
-        return {DRM_FORMAT_MOD_INVALID};
+        return {};
     }
 
     EGLint count = 0;
@@ -74,14 +74,14 @@ static std::vector<uint64_t> queryDmaBufModifiers(EGLDisplay display, uint32_t f
 
     if (!success || count == 0) {
         qCWarning(PIPEWIRE_LOGGING) << "Failed to query DMA-BUF format count.";
-        return {DRM_FORMAT_MOD_INVALID};
+        return {};
     }
 
     std::vector<uint32_t> formats(count);
     if (!eglQueryDmaBufFormatsEXT(display, count, reinterpret_cast<EGLint *>(formats.data()), &count)) {
         if (!success)
             qCWarning(PIPEWIRE_LOGGING) << "Failed to query DMA-BUF formats.";
-        return {DRM_FORMAT_MOD_INVALID};
+        return {};
     }
 
     if (std::find(formats.begin(), formats.end(), drm_format) == formats.end()) {
@@ -93,7 +93,7 @@ static std::vector<uint64_t> queryDmaBufModifiers(EGLDisplay display, uint32_t f
     if (!success || count == 0) {
         if (!success)
             qCWarning(PIPEWIRE_LOGGING) << "Failed to query DMA-BUF modifier count.";
-        return {DRM_FORMAT_MOD_INVALID};
+        return {};
     }
 
     std::vector<uint64_t> modifiers(count);
@@ -268,7 +268,10 @@ bool PipeWireSourceStream::createStream(uint nodeid)
     params.reserve(formats.size() * 2);
     const EGLDisplay display = static_cast<EGLDisplay>(QGuiApplication::platformNativeInterface()->nativeResourceForIntegration("egldisplay"));
     for (spa_video_format format : formats) {
-        params += buildFormat(&podBuilder, format, queryDmaBufModifiers(display, format));
+        if (auto modifiers = queryDmaBufModifiers(display, format); modifiers.size() > 0) {
+            params += buildFormat(&podBuilder, format, modifiers);
+        }
+
         params += buildFormat(&podBuilder, format, {});
     }
 
-- 
2.33.0

Places

File 0002-libtaskmanager-Don-t-request-dmabuf-if-not-supported.patch of Package plasma5-workspace (Revision a9e033efafaf4e28a9e6450fcd175dc9)

Places