moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-06-18 14:40:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't hardcode /dev/dri/card0 and /dev/dri/renderD128

Browse Source
This commit is contained in:
Cameron Gutman
2022-06-30 19:25:33 -05:00
parent be2f4433db
commit 36218b54f8
1 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/streaming/video/ffmpeg-renderers/drm.cpp
+31 -5
View File
@@ -29,8 +29,15 @@ extern "C" {
#include <Limelight.h> #include <Limelight.h>
// HACK: Avoid including X11 headers which conflict with QDir
#ifdef SDL_VIDEO_DRIVER_X11
#undef SDL_VIDEO_DRIVER_X11
#endif
#include <SDL_syswm.h> #include <SDL_syswm.h>
#include <QDir>
DrmRenderer::DrmRenderer(IFFmpegRenderer *backendRenderer) DrmRenderer::DrmRenderer(IFFmpegRenderer *backendRenderer)
: m_BackendRenderer(backendRenderer), : m_BackendRenderer(backendRenderer),
m_HwContext(nullptr), m_HwContext(nullptr),
@@ -145,17 +152,36 @@ bool DrmRenderer::initialize(PDECODER_PARAMETERS params)
m_DrmFd = open(userDevice, O_RDWR | O_CLOEXEC); m_DrmFd = open(userDevice, O_RDWR | O_CLOEXEC);
} }
else { else {
const char* defaultDevices[] = {"/dev/dri/renderD128", "/dev/dri/card0"}; QDir driDir("/dev/dri");
for (unsigned int i = 0; i < SDL_arraysize(defaultDevices); i++) { // We have to explicitly ask for devices to be returned
m_DrmFd = open(defaultDevices[i], O_RDWR | O_CLOEXEC); driDir.setFilter(QDir::Files | QDir::System);
// Try a render node first since we aren't using DRM for output in this codepath
for (QFileInfo& node : driDir.entryInfoList(QStringList("renderD*"))) {
QByteArray absolutePath = node.absoluteFilePath().toUtf8();
m_DrmFd = open(absolutePath.constData(), O_RDWR | O_CLOEXEC);
if (m_DrmFd >= 0) { if (m_DrmFd >= 0) {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
"Opened DRM device: %s", "Opened DRM render node: %s",
defaultDevices[i]); absolutePath.constData());
break; break;
} }
} }
// If that fails, try to use a primary node and hope for the best
if (m_DrmFd < 0) {
for (QFileInfo& node : driDir.entryInfoList(QStringList("card*"))) {
QByteArray absolutePath = node.absoluteFilePath().toUtf8();
m_DrmFd = open(absolutePath.constData(), O_RDWR | O_CLOEXEC);
if (m_DrmFd >= 0) {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
"Opened DRM primary node: %s",
absolutePath.constData());
break;
}
}
}
} }
if (m_DrmFd < 0) { if (m_DrmFd < 0) {