diff --git a/Data/User/GameConfig/GALE01.ini b/Data/User/GameConfig/GALE01.ini index 0b2aee3d48..66924cd847 100644 --- a/Data/User/GameConfig/GALE01.ini +++ b/Data/User/GameConfig/GALE01.ini @@ -214,5 +214,5 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Video_Settings] -EFBScale = 1 +EFBScale = -1 [Gecko] diff --git a/Data/User/GameConfig/GALJ01.ini b/Data/User/GameConfig/GALJ01.ini index 06f866ebdb..f50aa54642 100644 --- a/Data/User/GameConfig/GALJ01.ini +++ b/Data/User/GameConfig/GALJ01.ini @@ -13,5 +13,5 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Video_Settings] -EFBScale = 1 +EFBScale = -1 [Gecko] diff --git a/Data/User/GameConfig/GALP01.ini b/Data/User/GameConfig/GALP01.ini index 991c10e0f5..226cd4d9da 100644 --- a/Data/User/GameConfig/GALP01.ini +++ b/Data/User/GameConfig/GALP01.ini @@ -105,6 +105,6 @@ PH_ExtraParam = 0 PH_ZNear = PH_ZFar = [Video_Settings] -EFBScale = 1 +EFBScale = -1 [Gecko] diff --git a/Data/User/GameConfig/GC6E01.ini b/Data/User/GameConfig/GC6E01.ini index b745ef89b2..66fb0df6db 100644 --- a/Data/User/GameConfig/GC6E01.ini +++ b/Data/User/GameConfig/GC6E01.ini @@ -14,5 +14,5 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Settings] -EFBScale = 1 +EFBScale = -1 SafeTextureCacheColorSamples = 0 diff --git a/Data/User/GameConfig/GC6P01.ini b/Data/User/GameConfig/GC6P01.ini index 4ebad29a0f..73709894da 100644 --- a/Data/User/GameConfig/GC6P01.ini +++ b/Data/User/GameConfig/GC6P01.ini @@ -14,5 +14,5 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Settings] -EFBScale = 1 +EFBScale = -1 SafeTextureCacheColorSamples = 0 diff --git a/Data/User/GameConfig/GF7E01.ini b/Data/User/GameConfig/GF7E01.ini index f2107ac50e..c45903999d 100644 --- a/Data/User/GameConfig/GF7E01.ini +++ b/Data/User/GameConfig/GF7E01.ini @@ -77,7 +77,7 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Settings] -EFBScale = 1 +EFBScale = -1 SafeTextureCacheColorSamples = 512 [Video_Hacks] EFBToTextureEnable = False diff --git a/Data/User/GameConfig/GF7P01.ini b/Data/User/GameConfig/GF7P01.ini index c7da03cff4..4fef9f4188 100644 --- a/Data/User/GameConfig/GF7P01.ini +++ b/Data/User/GameConfig/GF7P01.ini @@ -74,7 +74,7 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Settings] -EFBScale = 1 +EFBScale = -1 SafeTextureCacheColorSamples = 512 [Video_Hacks] EFBToTextureEnable = False diff --git a/Data/User/GameConfig/GXXE01.ini b/Data/User/GameConfig/GXXE01.ini index ad0e45abdf..f18d342d29 100644 --- a/Data/User/GameConfig/GXXE01.ini +++ b/Data/User/GameConfig/GXXE01.ini @@ -15,5 +15,5 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Settings] -EFBScale = 1 +EFBScale = -1 SafeTextureCacheColorSamples = 0 diff --git a/Data/User/GameConfig/GXXP01.ini b/Data/User/GameConfig/GXXP01.ini index 16c64c1fa6..96db3fdd6a 100644 --- a/Data/User/GameConfig/GXXP01.ini +++ b/Data/User/GameConfig/GXXP01.ini @@ -15,5 +15,5 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Settings] -EFBScale = 1 +EFBScale = -1 SafeTextureCacheColorSamples = 0 diff --git a/Data/User/GameConfig/RSFE7U.ini b/Data/User/GameConfig/RSFE7U.ini index bf6e9e87c4..2a73e4c057 100644 --- a/Data/User/GameConfig/RSFE7U.ini +++ b/Data/User/GameConfig/RSFE7U.ini @@ -14,4 +14,4 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Settings] -EFBScale = 1 +EFBScale = -1 diff --git a/Data/User/GameConfig/RSFJ99.ini b/Data/User/GameConfig/RSFJ99.ini index 1113f6e7e9..07277538a3 100644 --- a/Data/User/GameConfig/RSFJ99.ini +++ b/Data/User/GameConfig/RSFJ99.ini @@ -14,4 +14,4 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Settings] -EFBScale = 1 +EFBScale = -1 diff --git a/Data/User/GameConfig/RSFP99.ini b/Data/User/GameConfig/RSFP99.ini index ec07d38569..a5d15c4adc 100644 --- a/Data/User/GameConfig/RSFP99.ini +++ b/Data/User/GameConfig/RSFP99.ini @@ -14,4 +14,4 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Settings] -EFBScale = 1 +EFBScale = -1 diff --git a/Data/User/GameConfig/S75E69.ini b/Data/User/GameConfig/S75E69.ini index 77dde099c5..314bf62a62 100644 --- a/Data/User/GameConfig/S75E69.ini +++ b/Data/User/GameConfig/S75E69.ini @@ -14,6 +14,6 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Settings] -EFBScale = 1 +EFBScale = -1 SafeTextureCacheColorSamples = 512 diff --git a/Data/User/GameConfig/S75P69.ini b/Data/User/GameConfig/S75P69.ini index 00225d65fe..edbfd2b746 100644 --- a/Data/User/GameConfig/S75P69.ini +++ b/Data/User/GameConfig/S75P69.ini @@ -14,4 +14,4 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Settings] -EFBScale = 1 +EFBScale = -1 diff --git a/Data/User/GameConfig/SEMJ01.ini b/Data/User/GameConfig/SEMJ01.ini index f0740ca7a3..280438a489 100644 --- a/Data/User/GameConfig/SEMJ01.ini +++ b/Data/User/GameConfig/SEMJ01.ini @@ -14,7 +14,7 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Settings] -EFBScale = 1 +EFBScale = -1 SafeTextureCacheColorSamples = 0 [Video_Enhancements] ForceFiltering = False diff --git a/Data/User/GameConfig/SEMY4Q.ini b/Data/User/GameConfig/SEMY4Q.ini index 817f8387e0..f01579ade7 100644 --- a/Data/User/GameConfig/SEMY4Q.ini +++ b/Data/User/GameConfig/SEMY4Q.ini @@ -14,7 +14,7 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Settings] -EFBScale = 1 +EFBScale = -1 SafeTextureCacheColorSamples = 0 [Video_Enhancements] ForceFiltering = False diff --git a/Data/User/GameConfig/SEMZ4Q.ini b/Data/User/GameConfig/SEMZ4Q.ini index 515a1bd029..1e828432f2 100644 --- a/Data/User/GameConfig/SEMZ4Q.ini +++ b/Data/User/GameConfig/SEMZ4Q.ini @@ -14,7 +14,7 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Settings] -EFBScale = 1 +EFBScale = -1 SafeTextureCacheColorSamples = 0 [Video_Enhancements] ForceFiltering = False diff --git a/Data/User/GameConfig/SERE4Q.ini b/Data/User/GameConfig/SERE4Q.ini index fbc9fa9d3c..526cd7fcda 100644 --- a/Data/User/GameConfig/SERE4Q.ini +++ b/Data/User/GameConfig/SERE4Q.ini @@ -14,6 +14,6 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Settings] -EFBScale = 1 +EFBScale = -1 SafeTextureCacheColorSamples = 0 [Wii] diff --git a/Data/User/GameConfig/SERF4Q.ini b/Data/User/GameConfig/SERF4Q.ini index cd2fca395e..266abd0d76 100644 --- a/Data/User/GameConfig/SERF4Q.ini +++ b/Data/User/GameConfig/SERF4Q.ini @@ -14,6 +14,6 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Settings] -EFBScale = 1 +EFBScale = -1 SafeTextureCacheColorSamples = 0 [Wii] diff --git a/Data/User/GameConfig/SERP4Q.ini b/Data/User/GameConfig/SERP4Q.ini index 7e332b8bcd..300b9d7e8b 100644 --- a/Data/User/GameConfig/SERP4Q.ini +++ b/Data/User/GameConfig/SERP4Q.ini @@ -14,6 +14,6 @@ PH_ZNear = PH_ZFar = [Gecko] [Video_Settings] -EFBScale = 1 +EFBScale = -1 SafeTextureCacheColorSamples = 0 [Wii] diff --git a/Data/User/GameConfig/SNCE8P.ini b/Data/User/GameConfig/SNCE8P.ini index c259d40061..2be325922b 100644 --- a/Data/User/GameConfig/SNCE8P.ini +++ b/Data/User/GameConfig/SNCE8P.ini @@ -14,6 +14,6 @@ PH_ZNear = PH_ZFar = 0.01 [Gecko] [Video_Settings] -EFBScale = 1 +EFBScale = -1 [Video_Hacks] EFBAccessEnable = False diff --git a/Data/User/GameConfig/SNCJ8P.ini b/Data/User/GameConfig/SNCJ8P.ini index 7de58c7a00..f49713339b 100644 --- a/Data/User/GameConfig/SNCJ8P.ini +++ b/Data/User/GameConfig/SNCJ8P.ini @@ -14,6 +14,6 @@ PH_ZNear = PH_ZFar = 0.01 [Gecko] [Video_Settings] -EFBScale = 1 +EFBScale = -1 [Video_Hacks] EFBAccessEnable = False diff --git a/Data/User/GameConfig/SNCP8P.ini b/Data/User/GameConfig/SNCP8P.ini index 39a221d578..9f78dc824b 100644 --- a/Data/User/GameConfig/SNCP8P.ini +++ b/Data/User/GameConfig/SNCP8P.ini @@ -14,6 +14,6 @@ PH_ZNear = PH_ZFar = 0.01 [Gecko] [Video_Settings] -EFBScale = 1 +EFBScale = -1 [Video_Hacks] EFBAccessEnable = False diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index 25ae6c0af9..6910952d5e 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -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);