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

Force GL to block after the current frame instead during the next frame

Browse Source
This commit is contained in:
Cameron Gutman
2020-05-16 16:25:13 -07:00
parent 5f25e0d4e2
commit 994312c212
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/streaming/video/ffmpeg-renderers/eglvid.cpp
+17 -1
View File
@@ -70,6 +70,7 @@ EGLRenderer::EGLRenderer(IFFmpegRenderer *backendRenderer)
m_VAO(0), m_VAO(0),
m_ColorSpace(AVCOL_SPC_NB), m_ColorSpace(AVCOL_SPC_NB),
m_ColorFull(false), m_ColorFull(false),
m_BlockingSwapBuffers(false),
m_glEGLImageTargetTexture2DOES(nullptr), m_glEGLImageTargetTexture2DOES(nullptr),
m_glGenVertexArraysOES(nullptr), m_glGenVertexArraysOES(nullptr),
m_glBindVertexArrayOES(nullptr), m_glBindVertexArrayOES(nullptr),
@@ -404,8 +405,10 @@ bool EGLRenderer::initialize(PDECODER_PARAMETERS params)
// Try to use adaptive VSYNC unless we're using frame pacing. // Try to use adaptive VSYNC unless we're using frame pacing.
// Frame pacing relies on us blocking in renderFrame() to // Frame pacing relies on us blocking in renderFrame() to
// match the display refresh rate. // match the display refresh rate.
if (params->enableFramePacing || SDL_GL_SetSwapInterval(-1)) if (params->enableFramePacing || SDL_GL_SetSwapInterval(-1)) {
SDL_GL_SetSwapInterval(1); SDL_GL_SetSwapInterval(1);
m_BlockingSwapBuffers = true;
}
} else { } else {
SDL_GL_SetSwapInterval(0); SDL_GL_SetSwapInterval(0);
} }
@@ -606,6 +609,19 @@ void EGLRenderer::renderFrame(AVFrame* frame)
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0); glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, 0);
SDL_GL_SwapWindow(m_Window); SDL_GL_SwapWindow(m_Window);
if (m_BlockingSwapBuffers) {
// This glClear() forces us to block until the buffer swap is
// complete to continue rendering. Mesa won't actually wait
// for the swap with just glFinish() alone. Waiting here keeps us
// in lock step with the display refresh rate. If we don't wait
// here, we'll stall on the first GL call next frame. Doing the
// wait here instead allows more time for a newer frame to arrive
// for next renderFrame() call.
glClear(GL_COLOR_BUFFER_BIT);
glFinish();
}
if (frame->hw_frames_ctx != nullptr) if (frame->hw_frames_ctx != nullptr)
m_Backend->freeEGLImages(m_EGLDisplay, imgs); m_Backend->freeEGLImages(m_EGLDisplay, imgs);
} }
app/streaming/video/ffmpeg-renderers/eglvid.h
+1
View File
@@ -33,6 +33,7 @@ private:
unsigned int m_VAO; unsigned int m_VAO;
int m_ColorSpace; int m_ColorSpace;
bool m_ColorFull; bool m_ColorFull;
bool m_BlockingSwapBuffers;
PFNGLEGLIMAGETARGETTEXTURE2DOESPROC m_glEGLImageTargetTexture2DOES; PFNGLEGLIMAGETARGETTEXTURE2DOESPROC m_glEGLImageTargetTexture2DOES;
PFNGLGENVERTEXARRAYSOESPROC m_glGenVertexArraysOES; PFNGLGENVERTEXARRAYSOESPROC m_glGenVertexArraysOES;
PFNGLBINDVERTEXARRAYOESPROC m_glBindVertexArrayOES; PFNGLBINDVERTEXARRAYOESPROC m_glBindVertexArrayOES;