From 154b5b6ded4461b241b60ce00b75fa779ecdaf3e Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sat, 1 Jan 2022 20:44:29 -0600 Subject: [PATCH] Fix fallback to SDL read-back for DRM contexts when !HAVE_EGL --- app/streaming/video/ffmpeg-renderers/drm.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/streaming/video/ffmpeg-renderers/drm.cpp b/app/streaming/video/ffmpeg-renderers/drm.cpp index 2abe0645..04c0d816 100644 --- a/app/streaming/video/ffmpeg-renderers/drm.cpp +++ b/app/streaming/video/ffmpeg-renderers/drm.cpp @@ -131,14 +131,11 @@ bool DrmRenderer::initialize(PDECODER_PARAMETERS params) return false; } -#ifdef HAVE_EGL // Still return true if we fail to initialize DRM direct rendering - // stuff, since we have EGL that we can use for indirect rendering. + // stuff, since we have EGLRenderer and SDLRenderer that we can use + // for indirect rendering. Our FFmpeg renderer selection code will + // handle the case where those also fail to render the test frame. const bool DIRECT_RENDERING_INIT_FAILED = true; -#else - // Fail if we can't initialize direct rendering and we don't have EGL. - const bool DIRECT_RENDERING_INIT_FAILED = false; -#endif drmModeRes* resources = drmModeGetResources(m_DrmFd); if (resources == nullptr) {