Mirrors/moonlight-qt
2
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt synced 2024-12-15 13:52:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Partially revert e64b15d and b85d5b8

Browse source 
These changes cause excessive window recreation using the Flatpak on Nvidia with Wayland
This commit is contained in:
Cameron Gutman 2022-03-19 14:50:38 -05:00
parent 99495cff90
commit 2fc1dda232
2 changed files with 15 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
app/streaming/video/ffmpeg-renderers/eglvid.cpp
View file

@ -88,6 +88,11 @@ EGLRenderer::EGLRenderer(IFFmpegRenderer *backendRenderer)
{
SDL_assert(backendRenderer);
SDL_assert(backendRenderer->canExportEGL());
// Save these global parameters so we can restore them in our destructor
SDL_GL_GetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, &m_OldContextProfileMask);
SDL_GL_GetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, &m_OldContextMajorVersion);
SDL_GL_GetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, &m_OldContextMinorVersion);
}
EGLRenderer::~EGLRenderer()
@ -129,15 +134,9 @@ EGLRenderer::~EGLRenderer()
// Reset the global properties back to what they were before
SDL_SetHint(SDL_HINT_OPENGL_ES_DRIVER, "0");
// We avoid restoring GL profile and version on purpose. SDL
// renderers use that internally to determine what GL version
// the window is using. If we reset it, it may not properly
// reset back to desktop GL if we have to fall back to the
// SDL renderer.
SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, m_OldContextProfileMask);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, m_OldContextMajorVersion);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, m_OldContextMinorVersion);
}
bool EGLRenderer::prepareDecoderContext(AVCodecContext*, AVDictionary**)
@ -472,24 +471,9 @@ bool EGLRenderer::initialize(PDECODER_PARAMETERS params)
// to avoid a crash in Mesa.
// https://gitlab.freedesktop.org/mesa/mesa/issues/1011
SDL_SetHint(SDL_HINT_OPENGL_ES_DRIVER, "1");
// Change our GL context to use 10-bit colors for 10-bit content
if (params->videoFormat == VIDEO_FORMAT_H265_MAIN10) {
// FIXME: We should try to do this only once per window.
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
"Changing GL context to 10-bit color");
// Initialize our GL attributes to defaults (desktop GL).
// This ensures we will always hit the SDL_RecreateWindow()
// path which will ensure our color buffer changes below
// take effect.
SDL_GL_ResetAttributes();
// Request 10-bit color for Main10
SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 10);
SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 10);
SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 10);
}
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
int renderIndex;
int maxRenderers = SDL_GetNumRenderDrivers();

4
app/streaming/video/ffmpeg-renderers/eglvid.h
View file

@ -63,6 +63,10 @@ private:
#define OVERLAY_PARAM_TEXTURE 0
int m_OverlayShaderProgramParams[1];
int m_OldContextProfileMask;
int m_OldContextMajorVersion;
int m_OldContextMinorVersion;
SDL_Renderer *m_DummyRenderer;
// HACK: Work around bug where renderer will repeatedly fail with: