From cce3a31af05346bb540206dc72fde7a95def1c0b Mon Sep 17 00:00:00 2001
From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com>
Date: Sun, 30 May 2021 20:37:38 +0100
Subject: [PATCH] Fix OSD

---
 src/frontend/qt_sdl/OSD.cpp       | 2 +-
 src/frontend/qt_sdl/OSD_shaders.h | 2 +-
 src/frontend/qt_sdl/main.cpp      | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/frontend/qt_sdl/OSD.cpp b/src/frontend/qt_sdl/OSD.cpp
index 9a3b527c..1c704799 100644
--- a/src/frontend/qt_sdl/OSD.cpp
+++ b/src/frontend/qt_sdl/OSD.cpp
@@ -460,7 +460,7 @@ void DrawGL(QOpenGLExtraFunctions* f, float w, float h)
 
         f->glBindTexture(GL_TEXTURE_2D, item.GLTexture);
         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);
 
         y += item.Height;
diff --git a/src/frontend/qt_sdl/OSD_shaders.h b/src/frontend/qt_sdl/OSD_shaders.h
index 5c62fdfb..1ab18ccf 100644
--- a/src/frontend/qt_sdl/OSD_shaders.h
+++ b/src/frontend/qt_sdl/OSD_shaders.h
@@ -26,7 +26,7 @@ const char* kScreenVS_OSD = kShaderHeader R"(
 uniform vec2 uScreenSize;
 
 uniform ivec2 uOSDPos;
-uniform ivec2 uOSDSize;
+uniform vec2 uOSDSize;
 uniform float uScaleFactor;
 
 in vec2 vPosition;
diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index d2cbc55f..639d497c 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -534,7 +534,7 @@ void EmuThread::run()
             {
                 FrontBufferLock.lock();
                 if (FrontBufferReverseSyncs[FrontBuffer ^ 1])
-                    glWaitSync(FrontBufferReverseSyncs[FrontBuffer ^ 1], 0, GL_TIMEOUT_IGNORED);
+                    epoxy_glWaitSync(FrontBufferReverseSyncs[FrontBuffer ^ 1], 0, GL_TIMEOUT_IGNORED);
                 FrontBufferLock.unlock();
             }
 #endif
@@ -548,8 +548,8 @@ void EmuThread::run()
             if (videoRenderer == 1)
             {
                 if (FrontBufferSyncs[FrontBuffer])
-                    glDeleteSync(FrontBufferSyncs[FrontBuffer]);
-                FrontBufferSyncs[FrontBuffer] = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+                    epoxy_glDeleteSync(FrontBufferSyncs[FrontBuffer]);
+                FrontBufferSyncs[FrontBuffer] = epoxy_glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
                 // this is hacky but this is the easiest way to call
                 // this function without dealling with a ton of
                 // macro mess