ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Rachel Bryk 2013-04-05 17:13:48 -04:00
parent 3e8ba3f3e8
commit e531970052
24 changed files with 43 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Data/User/GameConfig/GALE01.ini
View File

@ -214,5 +214,5 @@ PH_ExtraParam = 0
PH_ZNear = PH_ZNear =
PH_ZFar = PH_ZFar =
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1
[Gecko] [Gecko]

2
Data/User/GameConfig/GALJ01.ini
View File

@ -13,5 +13,5 @@ PH_ExtraParam = 0
PH_ZNear = PH_ZNear =
PH_ZFar = PH_ZFar =
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1
[Gecko] [Gecko]

2
Data/User/GameConfig/GALP01.ini
View File

@ -105,6 +105,6 @@ PH_ExtraParam = 0
PH_ZNear = PH_ZNear =
PH_ZFar = PH_ZFar =
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1
[Gecko] [Gecko]

2
Data/User/GameConfig/GC6E01.ini
View File

@ -14,5 +14,5 @@ PH_ZNear =
PH_ZFar = PH_ZFar =
[Gecko] [Gecko]
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1
SafeTextureCacheColorSamples = 0 SafeTextureCacheColorSamples = 0

2
Data/User/GameConfig/GC6P01.ini
View File

@ -14,5 +14,5 @@ PH_ZNear =
PH_ZFar = PH_ZFar =
[Gecko] [Gecko]
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1
SafeTextureCacheColorSamples = 0 SafeTextureCacheColorSamples = 0

2
Data/User/GameConfig/GF7E01.ini
View File

@ -77,7 +77,7 @@ PH_ZNear =
PH_ZFar = PH_ZFar =
[Gecko] [Gecko]
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1
SafeTextureCacheColorSamples = 512 SafeTextureCacheColorSamples = 512
[Video_Hacks] [Video_Hacks]
EFBToTextureEnable = False EFBToTextureEnable = False

2
Data/User/GameConfig/GF7P01.ini
View File

@ -74,7 +74,7 @@ PH_ZNear =
PH_ZFar = PH_ZFar =
[Gecko] [Gecko]
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1
SafeTextureCacheColorSamples = 512 SafeTextureCacheColorSamples = 512
[Video_Hacks] [Video_Hacks]
EFBToTextureEnable = False EFBToTextureEnable = False

2
Data/User/GameConfig/GXXE01.ini
View File

@ -15,5 +15,5 @@ PH_ZNear =
PH_ZFar = PH_ZFar =
[Gecko] [Gecko]
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1
SafeTextureCacheColorSamples = 0 SafeTextureCacheColorSamples = 0

2
Data/User/GameConfig/GXXP01.ini
View File

@ -15,5 +15,5 @@ PH_ZNear =
PH_ZFar = PH_ZFar =
[Gecko] [Gecko]
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1
SafeTextureCacheColorSamples = 0 SafeTextureCacheColorSamples = 0

2
Data/User/GameConfig/RSFE7U.ini
View File

@ -14,4 +14,4 @@ PH_ZNear =
PH_ZFar = PH_ZFar =
[Gecko] [Gecko]
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1

2
Data/User/GameConfig/RSFJ99.ini
View File

@ -14,4 +14,4 @@ PH_ZNear =
PH_ZFar = PH_ZFar =
[Gecko] [Gecko]
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1

2
Data/User/GameConfig/RSFP99.ini
View File

@ -14,4 +14,4 @@ PH_ZNear =
PH_ZFar = PH_ZFar =
[Gecko] [Gecko]
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1

2
Data/User/GameConfig/S75E69.ini
View File

@ -14,6 +14,6 @@ PH_ZNear =
PH_ZFar = PH_ZFar =
[Gecko] [Gecko]
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1
SafeTextureCacheColorSamples = 512 SafeTextureCacheColorSamples = 512

2
Data/User/GameConfig/S75P69.ini
View File

@ -14,4 +14,4 @@ PH_ZNear =
PH_ZFar = PH_ZFar =
[Gecko] [Gecko]
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1

2
Data/User/GameConfig/SEMJ01.ini
View File

@ -14,7 +14,7 @@ PH_ZNear =
PH_ZFar = PH_ZFar =
[Gecko] [Gecko]
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1
SafeTextureCacheColorSamples = 0 SafeTextureCacheColorSamples = 0
[Video_Enhancements] [Video_Enhancements]
ForceFiltering = False ForceFiltering = False

2
Data/User/GameConfig/SEMY4Q.ini
View File

@ -14,7 +14,7 @@ PH_ZNear =
PH_ZFar = PH_ZFar =
[Gecko] [Gecko]
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1
SafeTextureCacheColorSamples = 0 SafeTextureCacheColorSamples = 0
[Video_Enhancements] [Video_Enhancements]
ForceFiltering = False ForceFiltering = False

2
Data/User/GameConfig/SEMZ4Q.ini
View File

@ -14,7 +14,7 @@ PH_ZNear =
PH_ZFar = PH_ZFar =
[Gecko] [Gecko]
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1
SafeTextureCacheColorSamples = 0 SafeTextureCacheColorSamples = 0
[Video_Enhancements] [Video_Enhancements]
ForceFiltering = False ForceFiltering = False

2
Data/User/GameConfig/SERE4Q.ini
View File

@ -14,6 +14,6 @@ PH_ZNear =
PH_ZFar = PH_ZFar =
[Gecko] [Gecko]
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1
SafeTextureCacheColorSamples = 0 SafeTextureCacheColorSamples = 0
[Wii] [Wii]

2
Data/User/GameConfig/SERF4Q.ini
View File

@ -14,6 +14,6 @@ PH_ZNear =
PH_ZFar = PH_ZFar =
[Gecko] [Gecko]
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1
SafeTextureCacheColorSamples = 0 SafeTextureCacheColorSamples = 0
[Wii] [Wii]

2
Data/User/GameConfig/SERP4Q.ini
View File

@ -14,6 +14,6 @@ PH_ZNear =
PH_ZFar = PH_ZFar =
[Gecko] [Gecko]
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1
SafeTextureCacheColorSamples = 0 SafeTextureCacheColorSamples = 0
[Wii] [Wii]

2
Data/User/GameConfig/SNCE8P.ini
View File

@ -14,6 +14,6 @@ PH_ZNear =
PH_ZFar = 0.01 PH_ZFar = 0.01
[Gecko] [Gecko]
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1
[Video_Hacks] [Video_Hacks]
EFBAccessEnable = False EFBAccessEnable = False

2
Data/User/GameConfig/SNCJ8P.ini
View File

@ -14,6 +14,6 @@ PH_ZNear =
PH_ZFar = 0.01 PH_ZFar = 0.01
[Gecko] [Gecko]
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1
[Video_Hacks] [Video_Hacks]
EFBAccessEnable = False EFBAccessEnable = False

2
Data/User/GameConfig/SNCP8P.ini
View File

@ -14,6 +14,6 @@ PH_ZNear =
PH_ZFar = 0.01 PH_ZFar = 0.01
[Gecko] [Gecko]
[Video_Settings] [Video_Settings]
EFBScale = 1 EFBScale = -1
[Video_Hacks] [Video_Hacks]
EFBAccessEnable = False EFBAccessEnable = False

21
Source/Core/VideoCommon/Src/VideoConfig.cpp
View File

@ -137,7 +137,26 @@ void VideoConfig::GameIniLoad(const char *ini_file)
iniFile.GetIfExists("Video_Settings", "EnablePixelLighting", &bEnablePixelLighting); iniFile.GetIfExists("Video_Settings", "EnablePixelLighting", &bEnablePixelLighting);
iniFile.GetIfExists("Video_Settings", "HackedBufferUpload", &bHackedBufferUpload); iniFile.GetIfExists("Video_Settings", "HackedBufferUpload", &bHackedBufferUpload);
iniFile.GetIfExists("Video_Settings", "MSAA", &iMultisampleMode); 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", "DstAlphaPass", &bDstAlphaPass);
iniFile.GetIfExists("Video_Settings", "DisableFog", &bDisableFog); iniFile.GetIfExists("Video_Settings", "DisableFog", &bDisableFog);
iniFile.GetIfExists("Video_Settings", "EnableOpenCL", &bEnableOpenCL); iniFile.GetIfExists("Video_Settings", "EnableOpenCL", &bEnableOpenCL);