mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-14 13:27:45 -07:00
Round IR scale down to whole number if using 1.5x/2.5x IR, if game ini specifies -1 for EFBScale.
Fixes issue 6210.
This commit is contained in:
parent
3e8ba3f3e8
commit
e531970052
@ -214,5 +214,5 @@ PH_ExtraParam = 0
|
||||
PH_ZNear =
|
||||
PH_ZFar =
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
[Gecko]
|
||||
|
@ -13,5 +13,5 @@ PH_ExtraParam = 0
|
||||
PH_ZNear =
|
||||
PH_ZFar =
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
[Gecko]
|
||||
|
@ -105,6 +105,6 @@ PH_ExtraParam = 0
|
||||
PH_ZNear =
|
||||
PH_ZFar =
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
[Gecko]
|
||||
|
||||
|
@ -14,5 +14,5 @@ PH_ZNear =
|
||||
PH_ZFar =
|
||||
[Gecko]
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
SafeTextureCacheColorSamples = 0
|
||||
|
@ -14,5 +14,5 @@ PH_ZNear =
|
||||
PH_ZFar =
|
||||
[Gecko]
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
SafeTextureCacheColorSamples = 0
|
||||
|
@ -77,7 +77,7 @@ PH_ZNear =
|
||||
PH_ZFar =
|
||||
[Gecko]
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
SafeTextureCacheColorSamples = 512
|
||||
[Video_Hacks]
|
||||
EFBToTextureEnable = False
|
||||
|
@ -74,7 +74,7 @@ PH_ZNear =
|
||||
PH_ZFar =
|
||||
[Gecko]
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
SafeTextureCacheColorSamples = 512
|
||||
[Video_Hacks]
|
||||
EFBToTextureEnable = False
|
||||
|
@ -15,5 +15,5 @@ PH_ZNear =
|
||||
PH_ZFar =
|
||||
[Gecko]
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
SafeTextureCacheColorSamples = 0
|
||||
|
@ -15,5 +15,5 @@ PH_ZNear =
|
||||
PH_ZFar =
|
||||
[Gecko]
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
SafeTextureCacheColorSamples = 0
|
||||
|
@ -14,4 +14,4 @@ PH_ZNear =
|
||||
PH_ZFar =
|
||||
[Gecko]
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
|
@ -14,4 +14,4 @@ PH_ZNear =
|
||||
PH_ZFar =
|
||||
[Gecko]
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
|
@ -14,4 +14,4 @@ PH_ZNear =
|
||||
PH_ZFar =
|
||||
[Gecko]
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
|
@ -14,6 +14,6 @@ PH_ZNear =
|
||||
PH_ZFar =
|
||||
[Gecko]
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
SafeTextureCacheColorSamples = 512
|
||||
|
||||
|
@ -14,4 +14,4 @@ PH_ZNear =
|
||||
PH_ZFar =
|
||||
[Gecko]
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
|
@ -14,7 +14,7 @@ PH_ZNear =
|
||||
PH_ZFar =
|
||||
[Gecko]
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
SafeTextureCacheColorSamples = 0
|
||||
[Video_Enhancements]
|
||||
ForceFiltering = False
|
||||
|
@ -14,7 +14,7 @@ PH_ZNear =
|
||||
PH_ZFar =
|
||||
[Gecko]
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
SafeTextureCacheColorSamples = 0
|
||||
[Video_Enhancements]
|
||||
ForceFiltering = False
|
||||
|
@ -14,7 +14,7 @@ PH_ZNear =
|
||||
PH_ZFar =
|
||||
[Gecko]
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
SafeTextureCacheColorSamples = 0
|
||||
[Video_Enhancements]
|
||||
ForceFiltering = False
|
||||
|
@ -14,6 +14,6 @@ PH_ZNear =
|
||||
PH_ZFar =
|
||||
[Gecko]
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
SafeTextureCacheColorSamples = 0
|
||||
[Wii]
|
||||
|
@ -14,6 +14,6 @@ PH_ZNear =
|
||||
PH_ZFar =
|
||||
[Gecko]
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
SafeTextureCacheColorSamples = 0
|
||||
[Wii]
|
||||
|
@ -14,6 +14,6 @@ PH_ZNear =
|
||||
PH_ZFar =
|
||||
[Gecko]
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
SafeTextureCacheColorSamples = 0
|
||||
[Wii]
|
||||
|
@ -14,6 +14,6 @@ PH_ZNear =
|
||||
PH_ZFar = 0.01
|
||||
[Gecko]
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
[Video_Hacks]
|
||||
EFBAccessEnable = False
|
||||
|
@ -14,6 +14,6 @@ PH_ZNear =
|
||||
PH_ZFar = 0.01
|
||||
[Gecko]
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
[Video_Hacks]
|
||||
EFBAccessEnable = False
|
||||
|
@ -14,6 +14,6 @@ PH_ZNear =
|
||||
PH_ZFar = 0.01
|
||||
[Gecko]
|
||||
[Video_Settings]
|
||||
EFBScale = 1
|
||||
EFBScale = -1
|
||||
[Video_Hacks]
|
||||
EFBAccessEnable = False
|
||||
|
@ -137,7 +137,26 @@ void VideoConfig::GameIniLoad(const char *ini_file)
|
||||
iniFile.GetIfExists("Video_Settings", "EnablePixelLighting", &bEnablePixelLighting);
|
||||
iniFile.GetIfExists("Video_Settings", "HackedBufferUpload", &bHackedBufferUpload);
|
||||
iniFile.GetIfExists("Video_Settings", "MSAA", &iMultisampleMode);
|
||||
iniFile.GetIfExists("Video_Settings", "EFBScale", &iEFBScale); // integral
|
||||
int tmp = 0;
|
||||
iniFile.GetIfExists("Video_Settings", "EFBScale", &tmp); // integral
|
||||
if (tmp != -1)
|
||||
iEFBScale = tmp;
|
||||
// Round down to multiple of native IR
|
||||
else
|
||||
{
|
||||
switch (iEFBScale)
|
||||
{
|
||||
case 3: // 1.5x
|
||||
iEFBScale = 2;
|
||||
break;
|
||||
case 5: // 2.5x
|
||||
iEFBScale = 4;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
iniFile.GetIfExists("Video_Settings", "DstAlphaPass", &bDstAlphaPass);
|
||||
iniFile.GetIfExists("Video_Settings", "DisableFog", &bDisableFog);
|
||||
iniFile.GetIfExists("Video_Settings", "EnableOpenCL", &bEnableOpenCL);
|
||||
|
Loading…
Reference in New Issue
Block a user