piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-22 22:01:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix OpenGL display scaling on high DPI (#1011)

Browse Source 
* Fix OpenGL display scaling on high DPI

* Scale the OSD too

* Fix indent
This commit is contained in:
Nadia Holmquist Pedersen
2021-02-22 18:17:48 +01:00
committed by GitHub
parent 532dc57025
commit 97643586fa
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,6 +59,7 @@ std::deque<Item> ItemQueue;
QOpenGLShaderProgram* Shader; QOpenGLShaderProgram* Shader;
GLint uScreenSize, uOSDPos, uOSDSize; GLint uScreenSize, uOSDPos, uOSDSize;
GLfloat uScaleFactor;
GLuint OSDVertexArray; GLuint OSDVertexArray;
GLuint OSDVertexBuffer; GLuint OSDVertexBuffer;
@ -86,6 +87,7 @@ bool Init(QOpenGLFunctions_3_2_Core* f)
uScreenSize = Shader->uniformLocation("uScreenSize"); uScreenSize = Shader->uniformLocation("uScreenSize");
uOSDPos = Shader->uniformLocation("uOSDPos"); uOSDPos = Shader->uniformLocation("uOSDPos");
uOSDSize = Shader->uniformLocation("uOSDSize"); uOSDSize = Shader->uniformLocation("uOSDSize");
uScaleFactor = Shader->uniformLocation("uScaleFactor");
float vertices[6*2] = float vertices[6*2] =
{ {
@ -430,6 +432,7 @@ void DrawGL(QOpenGLFunctions_3_2_Core* f, float w, float h)
Shader->bind(); Shader->bind();
f->glUniform2f(uScreenSize, w, h); f->glUniform2f(uScreenSize, w, h);
f->glUniform1f(uScaleFactor, mainWindow->devicePixelRatioF());
f->glBindBuffer(GL_ARRAY_BUFFER, OSDVertexBuffer); f->glBindBuffer(GL_ARRAY_BUFFER, OSDVertexBuffer);
f->glBindVertexArray(OSDVertexArray); f->glBindVertexArray(OSDVertexArray);

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

@ -25,6 +25,7 @@ uniform vec2 uScreenSize;
uniform ivec2 uOSDPos; uniform ivec2 uOSDPos;
uniform ivec2 uOSDSize; uniform ivec2 uOSDSize;
uniform float uScaleFactor;
in vec2 vPosition; in vec2 vPosition;
@ -34,11 +35,11 @@ void main()
{ {
vec4 fpos; vec4 fpos;
vec2 osdpos = (vPosition * vec2(uOSDSize)); vec2 osdpos = (vPosition * vec2(uOSDSize * uScaleFactor));
fTexcoord = osdpos; fTexcoord = osdpos;
osdpos += uOSDPos; osdpos += uOSDPos;
fpos.xy = ((osdpos * 2.0) / uScreenSize) - 1.0; fpos.xy = ((osdpos * 2.0) / uScreenSize * uScaleFactor) - 1.0;
fpos.y *= -1; fpos.y *= -1;
fpos.z = 0.0; fpos.z = 0.0;
fpos.w = 1.0; fpos.w = 1.0;

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

@ -1004,7 +1004,8 @@ void ScreenPanelGL::paintGL()
{ {
screenShader->bind(); screenShader->bind();
screenShader->setUniformValue("uScreenSize", (float)w*factor, (float)h*factor); screenShader->setUniformValue("uScreenSize", (float)w, (float)h);
screenShader->setUniformValue("uScaleFactor", factor);
emuThread->FrontBufferLock.lock(); emuThread->FrontBufferLock.lock();
int frontbuf = emuThread->FrontBuffer; int frontbuf = emuThread->FrontBuffer;

5
src/frontend/qt_sdl/main_shaders.h
View File

@ -23,6 +23,7 @@ const char* kScreenVS = R"(#version 140
uniform vec2 uScreenSize; uniform vec2 uScreenSize;
uniform mat2x3 uTransform; uniform mat2x3 uTransform;
uniform float uScaleFactor;
in vec2 vPosition; in vec2 vPosition;
in vec2 vTexcoord; in vec2 vTexcoord;
@ -33,9 +34,9 @@ void main()
{ {
vec4 fpos; vec4 fpos;
fpos.xy = vec3(vPosition, 1.0) * uTransform; fpos.xy = vec3(vPosition, 1.0) * uTransform * uScaleFactor;
fpos.xy = ((fpos.xy * 2.0) / uScreenSize) - 1.0; fpos.xy = ((fpos.xy * 2.0) / (uScreenSize * uScaleFactor)) - 1.0;
fpos.y *= -1; fpos.y *= -1;
fpos.z = 0.0; fpos.z = 0.0;
fpos.w = 1.0; fpos.w = 1.0;