jyapayne/moonlight-qt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restore the original GL attributes after EGLRenderer is destroyed

Browse source
This commit is contained in:
Cameron Gutman 2020-05-15 20:22:11 -07:00
commit 42ced309d3
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -66,6 +66,11 @@ EGLRenderer::EGLRenderer(IFFmpegRenderer *backendRenderer)
{ {
SDL_assert(backendRenderer); SDL_assert(backendRenderer);
SDL_assert(backendRenderer->canExportEGL()); 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() EGLRenderer::~EGLRenderer()
@ -85,6 +90,12 @@ EGLRenderer::~EGLRenderer()
} }
SDL_GL_DeleteContext(m_Context); SDL_GL_DeleteContext(m_Context);
} }
// Reset the global properties back to what they were before
SDL_SetHint(SDL_HINT_OPENGL_ES_DRIVER, "0");
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**) bool EGLRenderer::prepareDecoderContext(AVCodecContext*, AVDictionary**)

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

@ -37,5 +37,9 @@ private:
PFNGLBINDVERTEXARRAYOESPROC m_glBindVertexArrayOES; PFNGLBINDVERTEXARRAYOESPROC m_glBindVertexArrayOES;
PFNGLDELETEVERTEXARRAYSOESPROC m_glDeleteVertexArraysOES; PFNGLDELETEVERTEXARRAYSOESPROC m_glDeleteVertexArraysOES;
int m_OldContextProfileMask;
int m_OldContextMajorVersion;
int m_OldContextMinorVersion;
SDL_Renderer *m_DummyRenderer; SDL_Renderer *m_DummyRenderer;
}; };