aboutsummaryrefslogtreecommitdiff
path: root/src/frontend/qt_sdl/main_shaders.h
diff options
context:
space:
mode:
authorRSDuck <RSDuck@users.noreply.github.com>2022-10-17 22:55:11 +0200
committerGitHub <noreply@github.com>2022-10-17 22:55:11 +0200
commitac3118cbc54715da55856958b42817fbd1eed666 (patch)
tree717e66ec7df79171821f46e02b47d1357256ace2 /src/frontend/qt_sdl/main_shaders.h
parent31ba585d392c9745917a141c72b3349d029586f0 (diff)
No more context mess (#1531)
* WIP: use Duckstation's context code to directly render into QT Widget from separate thread without two OpenGL contexts currently only works on Windows * reenable gay OSD * add back vsync * make it atleast a little more thread safe * linux support * don't segfault on closing * reorganise and cleanup build system it's still not good, but better than before * macos? * try to get it working on Ubuntu CI also update instructions * let's try this * ok how about this * try creating an OGL 4.3 context first (https://i.kym-cdn.com/photos/images/original/001/264/842/220.png) * fix Ubuntu * hm * try again for Windows * let's try this * make the OpenGL renderer work again that was stupid * do OGL surface resizing from the mainthread * Fix small mistake in GL context creation on macOS causing version 3.2 to be considered invalid * C stupidness * cleanup * don't let the emuthread deinit OGL if there's no OGL * reset lastScreenWidth/Height when deiniting OpenGL * disable stencil test while drawing framebuffers * macOS: Link Cocoa framework explicitly when not building with Qt6 Seems to be needed for the classes used by DuckStation's GL context code. * Set ScreenPanelGL's minimum size immediately Fixes GL context creation for OpenGL display on macOS using the wrong size as the underlying window was not resized to the correct size by Qt yet. * don't emit window updates when OGL display is used * stuff Arisotura said Co-authored-by: Nadia Holmquist Pedersen <nadia@nhp.sh>
Diffstat (limited to 'src/frontend/qt_sdl/main_shaders.h')
-rw-r--r--src/frontend/qt_sdl/main_shaders.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/frontend/qt_sdl/main_shaders.h b/src/frontend/qt_sdl/main_shaders.h
index ca835c0..37b964d 100644
--- a/src/frontend/qt_sdl/main_shaders.h
+++ b/src/frontend/qt_sdl/main_shaders.h
@@ -23,7 +23,6 @@ const char* kScreenVS = R"(#version 140
uniform vec2 uScreenSize;
uniform mat2x3 uTransform;
-uniform float uScaleFactor;
in vec2 vPosition;
in vec2 vTexcoord;
@@ -34,9 +33,9 @@ void main()
{
vec4 fpos;
- fpos.xy = vec3(vPosition, 1.0) * uTransform * uScaleFactor;
+ fpos.xy = vec3(vPosition, 1.0) * uTransform;
- fpos.xy = ((fpos.xy * 2.0) / (uScreenSize * uScaleFactor)) - 1.0;
+ fpos.xy = ((fpos.xy * 2.0) / uScreenSize) - 1.0;
fpos.y *= -1;
fpos.z = 0.0;
fpos.w = 1.0;