Merge branch 'master' of https://github.com/dolphin-emu/dolphin into dolphin-emu-master

This commit is contained in:
Nayla Hanegan 2024-03-03 19:37:55 -05:00
commit f873d6ff71
No known key found for this signature in database
GPG key ID: 3075216CED0DB01D
239 changed files with 18152 additions and 20748 deletions

View file

@ -21,11 +21,13 @@ constexpr int EFB_SCALE_AUTO_INTEGRAL = 0;
enum class AspectMode : int
{
Auto, // 4:3 or 16:9
ForceWide, // 16:9
ForceStandard, // 4:3
Auto, // ~4:3 or ~16:9 (auto detected)
ForceWide, // ~16:9
ForceStandard, // ~4:3
Stretch,
Custom,
Custom, // Forced relative custom AR
CustomStretch, // Forced absolute custom AR
Raw, // Forced squared pixels
};
enum class StereoMode : int