diff options
| author | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2020-06-03 13:54:28 +0200 |
|---|---|---|
| committer | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2020-06-03 13:54:28 +0200 |
| commit | f9f366e296a68be0aa2eb7bfd0552da31896a18c (patch) | |
| tree | f52760d5505b84074a9c1b50b4fe16e40035ba06 /src/frontend/qt_sdl/PlatformConfig.h | |
| parent | b746c0b7279d1f5b4bcfd02c115b09d583e9df4f (diff) | |
| parent | d6332f96f162849ad0dde2738cacd3fae6e76e5d (diff) | |
Merge remote-tracking branch 'remotes/upstream/master' into feature/qt-platform
# Conflicts:
# src/frontend/qt_sdl/CMakeLists.txt
# src/frontend/qt_sdl/Platform.cpp
# src/frontend/qt_sdl/main.cpp
Diffstat (limited to 'src/frontend/qt_sdl/PlatformConfig.h')
| -rw-r--r-- | src/frontend/qt_sdl/PlatformConfig.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/frontend/qt_sdl/PlatformConfig.h b/src/frontend/qt_sdl/PlatformConfig.h index d0f765b..791bb07 100644 --- a/src/frontend/qt_sdl/PlatformConfig.h +++ b/src/frontend/qt_sdl/PlatformConfig.h @@ -53,16 +53,24 @@ extern int ScreenRotation; extern int ScreenGap; extern int ScreenLayout; extern int ScreenSizing; +extern int IntegerScaling; extern int ScreenFilter; extern int ScreenUseGL; extern int ScreenVSync; -extern int ScreenRatio; +extern int ScreenVSyncInterval; + +extern int _3DRenderer; +extern int Threaded3D; + +extern int GL_ScaleFactor; +extern int GL_Antialias; extern int LimitFPS; extern int AudioSync; extern int ShowOSD; +extern int ConsoleType; extern int DirectBoot; extern int SocketBindAnyAddr; @@ -73,9 +81,9 @@ extern int SavestateRelocSRAM; extern int AudioVolume; extern int MicInputType; -extern char MicWavPath[512]; +extern char MicWavPath[1024]; -extern char LastROMFolder[512]; +extern char LastROMFolder[1024]; } |