ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix OSD

This commit is contained in:
WaluigiWare64 2021-05-30 20:37:38 +01:00 committed by Rayyan Ansari
parent 10044d53a4
commit cce3a31af0
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/qt_sdl/OSD.cpp
View File

@ -460,7 +460,7 @@ void DrawGL(QOpenGLExtraFunctions* f, float w, float h)
f->glBindTexture(GL_TEXTURE_2D, item.GLTexture); f->glBindTexture(GL_TEXTURE_2D, item.GLTexture);
f->glUniform2i(uOSDPos, kOSDMargin, y); f->glUniform2i(uOSDPos, kOSDMargin, y);
f->glUniform2i(uOSDSize, item.Width, item.Height); f->glUniform2f(uOSDSize, item.Width, item.Height);
f->glDrawArrays(GL_TRIANGLES, 0, 2*3); f->glDrawArrays(GL_TRIANGLES, 0, 2*3);
y += item.Height; y += item.Height;

2
src/frontend/qt_sdl/OSD_shaders.h
View File

@ -26,7 +26,7 @@ const char* kScreenVS_OSD = kShaderHeader R"(
uniform vec2 uScreenSize; uniform vec2 uScreenSize;
uniform ivec2 uOSDPos; uniform ivec2 uOSDPos;
uniform ivec2 uOSDSize; uniform vec2 uOSDSize;
uniform float uScaleFactor; uniform float uScaleFactor;
in vec2 vPosition; in vec2 vPosition;

6
src/frontend/qt_sdl/main.cpp
View File

@ -534,7 +534,7 @@ void EmuThread::run()
{ {
FrontBufferLock.lock(); FrontBufferLock.lock();
if (FrontBufferReverseSyncs[FrontBuffer ^ 1]) if (FrontBufferReverseSyncs[FrontBuffer ^ 1])
glWaitSync(FrontBufferReverseSyncs[FrontBuffer ^ 1], 0, GL_TIMEOUT_IGNORED); epoxy_glWaitSync(FrontBufferReverseSyncs[FrontBuffer ^ 1], 0, GL_TIMEOUT_IGNORED);
FrontBufferLock.unlock(); FrontBufferLock.unlock();
} }
#endif #endif
@ -548,8 +548,8 @@ void EmuThread::run()
if (videoRenderer == 1) if (videoRenderer == 1)
{ {
if (FrontBufferSyncs[FrontBuffer]) if (FrontBufferSyncs[FrontBuffer])
glDeleteSync(FrontBufferSyncs[FrontBuffer]); epoxy_glDeleteSync(FrontBufferSyncs[FrontBuffer]);
FrontBufferSyncs[FrontBuffer] = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0); FrontBufferSyncs[FrontBuffer] = epoxy_glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
// this is hacky but this is the easiest way to call // this is hacky but this is the easiest way to call
// this function without dealling with a ton of // this function without dealling with a ton of
// macro mess // macro mess