Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Round IR scale down to whole number if using 1.5x/2.5x IR, if game in… 
…i specifies -1 for EFBScale.

Fixes issue 6210.
  • Loading branch information
@RachelBryk
RachelBryk committed Apr 5, 2013
1 parent 3e8ba3f commit e531970
Show file tree
Hide file tree
Showing 24 changed files with 43 additions and 24 deletions.
2 changes: 1 addition & 1 deletion Data/User/GameConfig/GALE01.ini
View file
Expand Up @@ -214,5 +214,5 @@ PH_ExtraParam = 0
PH_ZNear =
PH_ZFar =
[Video_Settings]
EFBScale = 1
EFBScale = -1
[Gecko]
2 changes: 1 addition & 1 deletion Data/User/GameConfig/GALJ01.ini
View file
Expand Up @@ -13,5 +13,5 @@ PH_ExtraParam = 0
PH_ZNear =
PH_ZFar =
[Video_Settings]
EFBScale = 1
EFBScale = -1
[Gecko]
2 changes: 1 addition & 1 deletion Data/User/GameConfig/GALP01.ini
View file
Expand Up @@ -105,6 +105,6 @@ PH_ExtraParam = 0
PH_ZNear =
PH_ZFar =
[Video_Settings]
EFBScale = 1
EFBScale = -1
[Gecko]
2 changes: 1 addition & 1 deletion Data/User/GameConfig/GC6E01.ini
View file
Expand Up @@ -14,5 +14,5 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Video_Settings]
EFBScale = 1
EFBScale = -1
SafeTextureCacheColorSamples = 0
Expand Down
2 changes: 1 addition & 1 deletion Data/User/GameConfig/GC6P01.ini
View file
Expand Up @@ -14,5 +14,5 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Video_Settings]
EFBScale = 1
EFBScale = -1
SafeTextureCacheColorSamples = 0
Expand Down
2 changes: 1 addition & 1 deletion Data/User/GameConfig/GF7E01.ini
View file
Expand Up @@ -77,7 +77,7 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Video_Settings]
EFBScale = 1
EFBScale = -1
SafeTextureCacheColorSamples = 512
[Video_Hacks]
EFBToTextureEnable = False
Expand Down
2 changes: 1 addition & 1 deletion Data/User/GameConfig/GF7P01.ini
View file
Expand Up @@ -74,7 +74,7 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Video_Settings]
EFBScale = 1
EFBScale = -1
SafeTextureCacheColorSamples = 512
[Video_Hacks]
EFBToTextureEnable = False
Expand Down
2 changes: 1 addition & 1 deletion Data/User/GameConfig/GXXE01.ini
View file
Expand Up @@ -15,5 +15,5 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Video_Settings]
EFBScale = 1
EFBScale = -1
SafeTextureCacheColorSamples = 0
Expand Down
2 changes: 1 addition & 1 deletion Data/User/GameConfig/GXXP01.ini
View file
Expand Up @@ -15,5 +15,5 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Video_Settings]
EFBScale = 1
EFBScale = -1
SafeTextureCacheColorSamples = 0
Expand Down
2 changes: 1 addition & 1 deletion Data/User/GameConfig/RSFE7U.ini
View file
Expand Up @@ -14,4 +14,4 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Video_Settings]
EFBScale = 1
EFBScale = -1
2 changes: 1 addition & 1 deletion Data/User/GameConfig/RSFJ99.ini
View file
Expand Up @@ -14,4 +14,4 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Video_Settings]
EFBScale = 1
EFBScale = -1
2 changes: 1 addition & 1 deletion Data/User/GameConfig/RSFP99.ini
View file
Expand Up @@ -14,4 +14,4 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Video_Settings]
EFBScale = 1
EFBScale = -1
2 changes: 1 addition & 1 deletion Data/User/GameConfig/S75E69.ini
View file
Expand Up @@ -14,6 +14,6 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Video_Settings]
EFBScale = 1
EFBScale = -1
SafeTextureCacheColorSamples = 512

Expand Down
2 changes: 1 addition & 1 deletion Data/User/GameConfig/S75P69.ini
View file
Expand Up @@ -14,4 +14,4 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Video_Settings]
EFBScale = 1
EFBScale = -1
Expand Down
2 changes: 1 addition & 1 deletion Data/User/GameConfig/SEMJ01.ini
View file
Expand Up @@ -14,7 +14,7 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Video_Settings]
EFBScale = 1
EFBScale = -1
SafeTextureCacheColorSamples = 0
[Video_Enhancements]
ForceFiltering = False
Expand Down
2 changes: 1 addition & 1 deletion Data/User/GameConfig/SEMY4Q.ini
View file
Expand Up @@ -14,7 +14,7 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Video_Settings]
EFBScale = 1
EFBScale = -1
SafeTextureCacheColorSamples = 0
[Video_Enhancements]
ForceFiltering = False
Expand Down
2 changes: 1 addition & 1 deletion Data/User/GameConfig/SEMZ4Q.ini
View file
Expand Up @@ -14,7 +14,7 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Video_Settings]
EFBScale = 1
EFBScale = -1
SafeTextureCacheColorSamples = 0
[Video_Enhancements]
ForceFiltering = False
Expand Down
2 changes: 1 addition & 1 deletion Data/User/GameConfig/SERE4Q.ini
View file
Expand Up @@ -14,6 +14,6 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Video_Settings]
EFBScale = 1
EFBScale = -1
SafeTextureCacheColorSamples = 0
[Wii]
Expand Down
2 changes: 1 addition & 1 deletion Data/User/GameConfig/SERF4Q.ini
View file
Expand Up @@ -14,6 +14,6 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Video_Settings]
EFBScale = 1
EFBScale = -1
SafeTextureCacheColorSamples = 0
[Wii]
Expand Down
2 changes: 1 addition & 1 deletion Data/User/GameConfig/SERP4Q.ini
View file
Expand Up @@ -14,6 +14,6 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Video_Settings]
EFBScale = 1
EFBScale = -1
SafeTextureCacheColorSamples = 0
[Wii]
Expand Down
2 changes: 1 addition & 1 deletion Data/User/GameConfig/SNCE8P.ini
View file
Expand Up @@ -14,6 +14,6 @@ PH_ZNear =
PH_ZFar = 0.01
[Gecko]
[Video_Settings]
EFBScale = 1
EFBScale = -1
[Video_Hacks]
EFBAccessEnable = False
2 changes: 1 addition & 1 deletion Data/User/GameConfig/SNCJ8P.ini
View file
Expand Up @@ -14,6 +14,6 @@ PH_ZNear =
PH_ZFar = 0.01
[Gecko]
[Video_Settings]
EFBScale = 1
EFBScale = -1
[Video_Hacks]
EFBAccessEnable = False
2 changes: 1 addition & 1 deletion Data/User/GameConfig/SNCP8P.ini
View file
Expand Up @@ -14,6 +14,6 @@ PH_ZNear =
PH_ZFar = 0.01
[Gecko]
[Video_Settings]
EFBScale = 1
EFBScale = -1
[Video_Hacks]
EFBAccessEnable = False
21 changes: 20 additions & 1 deletion Source/Core/VideoCommon/Src/VideoConfig.cpp
View file
Expand Up @@ -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);
Expand Down

0 comments on commit e531970

Please sign in to comment.