diff --git a/Data/Sys/GameSettings/G2XE8P.ini b/Data/Sys/GameSettings/G2XE8P.ini index 2ed164ba3e..d8d63aeafa 100644 --- a/Data/Sys/GameSettings/G2XE8P.ini +++ b/Data/Sys/GameSettings/G2XE8P.ini @@ -30,5 +30,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 512 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/G2XP8P.ini b/Data/Sys/GameSettings/G2XP8P.ini index e735673169..15ae50f3f6 100644 --- a/Data/Sys/GameSettings/G2XP8P.ini +++ b/Data/Sys/GameSettings/G2XP8P.ini @@ -30,5 +30,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 512 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/G3FE69.ini b/Data/Sys/GameSettings/G3FE69.ini index fab54bcc27..e25278953d 100644 --- a/Data/Sys/GameSettings/G3FE69.ini +++ b/Data/Sys/GameSettings/G3FE69.ini @@ -31,5 +31,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 0 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/G3FF69.ini b/Data/Sys/GameSettings/G3FF69.ini index 706f27fdb4..73b5e8a15d 100644 --- a/Data/Sys/GameSettings/G3FF69.ini +++ b/Data/Sys/GameSettings/G3FF69.ini @@ -31,5 +31,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 0 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/G3FP69.ini b/Data/Sys/GameSettings/G3FP69.ini index 18a50599bd..d41e6d6cd5 100644 --- a/Data/Sys/GameSettings/G3FP69.ini +++ b/Data/Sys/GameSettings/G3FP69.ini @@ -31,5 +31,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 0 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/G4AEE9.ini b/Data/Sys/GameSettings/G4AEE9.ini index 7f447f0a7a..85c93c4197 100644 --- a/Data/Sys/GameSettings/G4AEE9.ini +++ b/Data/Sys/GameSettings/G4AEE9.ini @@ -29,5 +29,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/G8ME01.ini b/Data/Sys/GameSettings/G8ME01.ini index d768792efe..5b03cc5790 100644 --- a/Data/Sys/GameSettings/G8ME01.ini +++ b/Data/Sys/GameSettings/G8ME01.ini @@ -56,7 +56,6 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False EFBToTextureEnable = False EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/G8MJ01.ini b/Data/Sys/GameSettings/G8MJ01.ini index 38d28b756b..b691431d10 100644 --- a/Data/Sys/GameSettings/G8MJ01.ini +++ b/Data/Sys/GameSettings/G8MJ01.ini @@ -21,7 +21,6 @@ EmulationIssues = Needs Efb to Ram for BBox (proper graphics). UseBBox = True [Video_Hacks] -DlistCachingEnable = False EFBToTextureEnable = False EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/G8MP01.ini b/Data/Sys/GameSettings/G8MP01.ini index 9c5730b053..4bf5cabedd 100644 --- a/Data/Sys/GameSettings/G8MP01.ini +++ b/Data/Sys/GameSettings/G8MP01.ini @@ -21,7 +21,6 @@ EmulationIssues = Needs Efb to Ram for BBox (proper graphics). UseBBox = True [Video_Hacks] -DlistCachingEnable = False EFBToTextureEnable = False EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/GBIE08.ini b/Data/Sys/GameSettings/GBIE08.ini index 423f113b97..b95d8fcf96 100644 --- a/Data/Sys/GameSettings/GBIE08.ini +++ b/Data/Sys/GameSettings/GBIE08.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/GBIP08.ini b/Data/Sys/GameSettings/GBIP08.ini index 81994ceb7f..d5b9d2a683 100644 --- a/Data/Sys/GameSettings/GBIP08.ini +++ b/Data/Sys/GameSettings/GBIP08.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/GCPE6S.ini b/Data/Sys/GameSettings/GCPE6S.ini index 287f339de0..52d4b867da 100644 --- a/Data/Sys/GameSettings/GCPE6S.ini +++ b/Data/Sys/GameSettings/GCPE6S.ini @@ -30,5 +30,4 @@ UseXFB = True UseRealXFB = True [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/GCPP6S.ini b/Data/Sys/GameSettings/GCPP6S.ini index 50c527c0f9..9de08ce440 100644 --- a/Data/Sys/GameSettings/GCPP6S.ini +++ b/Data/Sys/GameSettings/GCPP6S.ini @@ -30,5 +30,4 @@ UseXFB = True UseRealXFB = True [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/GGEE41.ini b/Data/Sys/GameSettings/GGEE41.ini index 313ae3cdf3..70c3635a3b 100644 --- a/Data/Sys/GameSettings/GGEE41.ini +++ b/Data/Sys/GameSettings/GGEE41.ini @@ -30,6 +30,5 @@ UseXFB = True UseRealXFB = False [Video_Hacks] -DlistCachingEnable = False EFBAccessEnable = True diff --git a/Data/Sys/GameSettings/GGEP41.ini b/Data/Sys/GameSettings/GGEP41.ini index 6ef2027d2a..0c60e996c9 100644 --- a/Data/Sys/GameSettings/GGEP41.ini +++ b/Data/Sys/GameSettings/GGEP41.ini @@ -30,6 +30,5 @@ UseXFB = True UseRealXFB = False [Video_Hacks] -DlistCachingEnable = False EFBAccessEnable = True diff --git a/Data/Sys/GameSettings/GGEY41.ini b/Data/Sys/GameSettings/GGEY41.ini index 4f46c1c19d..e5a698aac7 100644 --- a/Data/Sys/GameSettings/GGEY41.ini +++ b/Data/Sys/GameSettings/GGEY41.ini @@ -30,6 +30,5 @@ UseXFB = True UseRealXFB = False [Video_Hacks] -DlistCachingEnable = False EFBAccessEnable = True diff --git a/Data/Sys/GameSettings/GP7E01.ini b/Data/Sys/GameSettings/GP7E01.ini index 7d3ac3d768..268acca9c1 100644 --- a/Data/Sys/GameSettings/GP7E01.ini +++ b/Data/Sys/GameSettings/GP7E01.ini @@ -35,5 +35,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/GP7J01.ini b/Data/Sys/GameSettings/GP7J01.ini index 3687a26fb8..679e57374c 100644 --- a/Data/Sys/GameSettings/GP7J01.ini +++ b/Data/Sys/GameSettings/GP7J01.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/GP7P01.ini b/Data/Sys/GameSettings/GP7P01.ini index e6356b445e..6758a148d2 100644 --- a/Data/Sys/GameSettings/GP7P01.ini +++ b/Data/Sys/GameSettings/GP7P01.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/GQSDAF.ini b/Data/Sys/GameSettings/GQSDAF.ini index d5a88fd3c5..141d2521d4 100644 --- a/Data/Sys/GameSettings/GQSDAF.ini +++ b/Data/Sys/GameSettings/GQSDAF.ini @@ -29,5 +29,4 @@ PH_ZFar = 1 SafeTextureCacheColorSamples = 512 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/GQSEAF.ini b/Data/Sys/GameSettings/GQSEAF.ini index 2f9393b87d..d79f312e91 100644 --- a/Data/Sys/GameSettings/GQSEAF.ini +++ b/Data/Sys/GameSettings/GQSEAF.ini @@ -796,5 +796,4 @@ PH_ZFar = 1 SafeTextureCacheColorSamples = 512 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/GQSFAF.ini b/Data/Sys/GameSettings/GQSFAF.ini index 211493d604..2e98d59b52 100644 --- a/Data/Sys/GameSettings/GQSFAF.ini +++ b/Data/Sys/GameSettings/GQSFAF.ini @@ -29,5 +29,4 @@ PH_ZFar = 1 SafeTextureCacheColorSamples = 512 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/GQSPAF.ini b/Data/Sys/GameSettings/GQSPAF.ini index a7e8da41e6..230f6eb439 100644 --- a/Data/Sys/GameSettings/GQSPAF.ini +++ b/Data/Sys/GameSettings/GQSPAF.ini @@ -29,5 +29,4 @@ PH_ZFar = 1 SafeTextureCacheColorSamples = 512 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/GTEE01.ini b/Data/Sys/GameSettings/GTEE01.ini index 1216ed5187..9ba8a580d1 100644 --- a/Data/Sys/GameSettings/GTEE01.ini +++ b/Data/Sys/GameSettings/GTEE01.ini @@ -66,5 +66,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/GTEP01.ini b/Data/Sys/GameSettings/GTEP01.ini index c83d02503e..9079bd42af 100644 --- a/Data/Sys/GameSettings/GTEP01.ini +++ b/Data/Sys/GameSettings/GTEP01.ini @@ -34,5 +34,4 @@ GZ5T-HADH-NGPBM BAF8-QT5K-5N9WC [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/GTOJAF.ini b/Data/Sys/GameSettings/GTOJAF.ini index 0b50ff4f50..a71b1cdb92 100644 --- a/Data/Sys/GameSettings/GTOJAF.ini +++ b/Data/Sys/GameSettings/GTOJAF.ini @@ -29,4 +29,3 @@ PH_ZFar = 1 SafeTextureCacheColorSamples = 512 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/R2GEXJ.ini b/Data/Sys/GameSettings/R2GEXJ.ini index 2d04ace8b2..b028b67fd1 100644 --- a/Data/Sys/GameSettings/R2GEXJ.ini +++ b/Data/Sys/GameSettings/R2GEXJ.ini @@ -30,6 +30,5 @@ UseXFB = True UseRealXFB = False [Video_Hacks] -DlistCachingEnable = False EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/R2GJAF.ini b/Data/Sys/GameSettings/R2GJAF.ini index 030dce8cfb..2649bdf1cf 100644 --- a/Data/Sys/GameSettings/R2GJAF.ini +++ b/Data/Sys/GameSettings/R2GJAF.ini @@ -30,6 +30,5 @@ UseXFB = True UseRealXFB = False [Video_Hacks] -DlistCachingEnable = False EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/R2GP99.ini b/Data/Sys/GameSettings/R2GP99.ini index a8163c4389..6b8a13c138 100644 --- a/Data/Sys/GameSettings/R2GP99.ini +++ b/Data/Sys/GameSettings/R2GP99.ini @@ -30,6 +30,5 @@ UseXFB = True UseRealXFB = False [Video_Hacks] -DlistCachingEnable = False EFBEmulateFormatChanges = True diff --git a/Data/Sys/GameSettings/R4QE01.ini b/Data/Sys/GameSettings/R4QE01.ini index fe9e62a6ed..d6eaeb7ced 100644 --- a/Data/Sys/GameSettings/R4QE01.ini +++ b/Data/Sys/GameSettings/R4QE01.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/R4QJ01.ini b/Data/Sys/GameSettings/R4QJ01.ini index 6fdfe5aefd..35b7404401 100644 --- a/Data/Sys/GameSettings/R4QJ01.ini +++ b/Data/Sys/GameSettings/R4QJ01.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/R4QK01.ini b/Data/Sys/GameSettings/R4QK01.ini index 724fdb6a3d..8b315f3d19 100644 --- a/Data/Sys/GameSettings/R4QK01.ini +++ b/Data/Sys/GameSettings/R4QK01.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/R4QP01.ini b/Data/Sys/GameSettings/R4QP01.ini index 7989f34c4b..3ff3624afe 100644 --- a/Data/Sys/GameSettings/R4QP01.ini +++ b/Data/Sys/GameSettings/R4QP01.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/R5DE5G.ini b/Data/Sys/GameSettings/R5DE5G.ini index de6618040c..7cdbb86f12 100644 --- a/Data/Sys/GameSettings/R5DE5G.ini +++ b/Data/Sys/GameSettings/R5DE5G.ini @@ -27,5 +27,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/R5VE41.ini b/Data/Sys/GameSettings/R5VE41.ini index ffc33ffbe0..aede7537b6 100644 --- a/Data/Sys/GameSettings/R5VE41.ini +++ b/Data/Sys/GameSettings/R5VE41.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/R5VP41.ini b/Data/Sys/GameSettings/R5VP41.ini index 1624995a79..bee1525b04 100644 --- a/Data/Sys/GameSettings/R5VP41.ini +++ b/Data/Sys/GameSettings/R5VP41.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/R5VX41.ini b/Data/Sys/GameSettings/R5VX41.ini index ffc33ffbe0..aede7537b6 100644 --- a/Data/Sys/GameSettings/R5VX41.ini +++ b/Data/Sys/GameSettings/R5VX41.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/R8JEWR.ini b/Data/Sys/GameSettings/R8JEWR.ini index 25b3008faa..5beb22c058 100644 --- a/Data/Sys/GameSettings/R8JEWR.ini +++ b/Data/Sys/GameSettings/R8JEWR.ini @@ -27,5 +27,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/R8JPWR.ini b/Data/Sys/GameSettings/R8JPWR.ini index a2f0cbde14..352a56f9c5 100644 --- a/Data/Sys/GameSettings/R8JPWR.ini +++ b/Data/Sys/GameSettings/R8JPWR.ini @@ -27,5 +27,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/R8PE01.ini b/Data/Sys/GameSettings/R8PE01.ini index 8b7c4a006b..a952eb0d4e 100644 --- a/Data/Sys/GameSettings/R8PE01.ini +++ b/Data/Sys/GameSettings/R8PE01.ini @@ -23,7 +23,6 @@ UseBBox = True ProjectionHack = 0 [Video_Hacks] -DlistCachingEnable = False EFBToTextureEnable = False EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/R8PJ01.ini b/Data/Sys/GameSettings/R8PJ01.ini index d80dcb1ffc..6754bf9857 100644 --- a/Data/Sys/GameSettings/R8PJ01.ini +++ b/Data/Sys/GameSettings/R8PJ01.ini @@ -22,7 +22,6 @@ UseBBox = True ProjectionHack = 0 [Video_Hacks] -DlistCachingEnable = False EFBToTextureEnable = False EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/R8PK01.ini b/Data/Sys/GameSettings/R8PK01.ini index 6a72f77920..26ed500541 100644 --- a/Data/Sys/GameSettings/R8PK01.ini +++ b/Data/Sys/GameSettings/R8PK01.ini @@ -22,7 +22,6 @@ UseBBox = True ProjectionHack = 0 [Video_Hacks] -DlistCachingEnable = False EFBToTextureEnable = False EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/R8PP01.ini b/Data/Sys/GameSettings/R8PP01.ini index b511c67c18..5003442af2 100644 --- a/Data/Sys/GameSettings/R8PP01.ini +++ b/Data/Sys/GameSettings/R8PP01.ini @@ -22,7 +22,6 @@ UseBBox = True ProjectionHack = 0 [Video_Hacks] -DlistCachingEnable = False EFBToTextureEnable = False EFBCopyEnable = True diff --git a/Data/Sys/GameSettings/RBHE08.ini b/Data/Sys/GameSettings/RBHE08.ini index 2dd2773425..69baef053d 100644 --- a/Data/Sys/GameSettings/RBHE08.ini +++ b/Data/Sys/GameSettings/RBHE08.ini @@ -30,5 +30,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 512 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RBHJ08.ini b/Data/Sys/GameSettings/RBHJ08.ini index 537d3b8444..98fb1d96df 100644 --- a/Data/Sys/GameSettings/RBHJ08.ini +++ b/Data/Sys/GameSettings/RBHJ08.ini @@ -30,5 +30,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 512 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RBHP08.ini b/Data/Sys/GameSettings/RBHP08.ini index f17ffee900..84aac038e6 100644 --- a/Data/Sys/GameSettings/RBHP08.ini +++ b/Data/Sys/GameSettings/RBHP08.ini @@ -30,5 +30,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 512 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RBIEE9.ini b/Data/Sys/GameSettings/RBIEE9.ini index 4200dfd2dd..54bc917b60 100644 --- a/Data/Sys/GameSettings/RBIEE9.ini +++ b/Data/Sys/GameSettings/RBIEE9.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RBIJ99.ini b/Data/Sys/GameSettings/RBIJ99.ini index 419688b25d..06a613ec41 100644 --- a/Data/Sys/GameSettings/RBIJ99.ini +++ b/Data/Sys/GameSettings/RBIJ99.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RBIP99.ini b/Data/Sys/GameSettings/RBIP99.ini index e3e567b157..23b5d5c5a5 100644 --- a/Data/Sys/GameSettings/RBIP99.ini +++ b/Data/Sys/GameSettings/RBIP99.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RCJE8P.ini b/Data/Sys/GameSettings/RCJE8P.ini index a3797f1b57..757cff23ff 100644 --- a/Data/Sys/GameSettings/RCJE8P.ini +++ b/Data/Sys/GameSettings/RCJE8P.ini @@ -30,7 +30,6 @@ PH_ZFar = ForceFiltering = False [Video_Hacks] -DlistCachingEnable = False [Speedhacks] 0x80199d08=700 diff --git a/Data/Sys/GameSettings/RCJP8P.ini b/Data/Sys/GameSettings/RCJP8P.ini index 6f0db6cc30..505513c382 100644 --- a/Data/Sys/GameSettings/RCJP8P.ini +++ b/Data/Sys/GameSettings/RCJP8P.ini @@ -30,5 +30,4 @@ PH_ZFar = ForceFiltering = False [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RDZJ01.ini b/Data/Sys/GameSettings/RDZJ01.ini index deb2063226..87813ecea4 100644 --- a/Data/Sys/GameSettings/RDZJ01.ini +++ b/Data/Sys/GameSettings/RDZJ01.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RDZP01.ini b/Data/Sys/GameSettings/RDZP01.ini index 8b94a717fe..3e03796402 100644 --- a/Data/Sys/GameSettings/RDZP01.ini +++ b/Data/Sys/GameSettings/RDZP01.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RE4E08.ini b/Data/Sys/GameSettings/RE4E08.ini index 4e040299e7..130d174e74 100644 --- a/Data/Sys/GameSettings/RE4E08.ini +++ b/Data/Sys/GameSettings/RE4E08.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RE4J08.ini b/Data/Sys/GameSettings/RE4J08.ini index b707b54abb..0d184b3359 100644 --- a/Data/Sys/GameSettings/RE4J08.ini +++ b/Data/Sys/GameSettings/RE4J08.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RE4P08.ini b/Data/Sys/GameSettings/RE4P08.ini index 7eeb359861..27f34be128 100644 --- a/Data/Sys/GameSettings/RE4P08.ini +++ b/Data/Sys/GameSettings/RE4P08.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RFBE01.ini b/Data/Sys/GameSettings/RFBE01.ini index a27bb18f4a..9f6b8264da 100644 --- a/Data/Sys/GameSettings/RFBE01.ini +++ b/Data/Sys/GameSettings/RFBE01.ini @@ -28,5 +28,4 @@ PH_ZFar = [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RFBJ01.ini b/Data/Sys/GameSettings/RFBJ01.ini index 17df52e9bd..13bbae2863 100644 --- a/Data/Sys/GameSettings/RFBJ01.ini +++ b/Data/Sys/GameSettings/RFBJ01.ini @@ -28,5 +28,4 @@ PH_ZFar = [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RFBP01.ini b/Data/Sys/GameSettings/RFBP01.ini index 097140e075..5ad8915150 100644 --- a/Data/Sys/GameSettings/RFBP01.ini +++ b/Data/Sys/GameSettings/RFBP01.ini @@ -28,5 +28,4 @@ PH_ZFar = [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RHAE01.ini b/Data/Sys/GameSettings/RHAE01.ini index 7d5bf8ccc7..c75bab0ddc 100644 --- a/Data/Sys/GameSettings/RHAE01.ini +++ b/Data/Sys/GameSettings/RHAE01.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RHAJ01.ini b/Data/Sys/GameSettings/RHAJ01.ini index 33cf231885..0e9a5fc2a7 100644 --- a/Data/Sys/GameSettings/RHAJ01.ini +++ b/Data/Sys/GameSettings/RHAJ01.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RHAK01.ini b/Data/Sys/GameSettings/RHAK01.ini index 26f966d304..3be9e72d04 100644 --- a/Data/Sys/GameSettings/RHAK01.ini +++ b/Data/Sys/GameSettings/RHAK01.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RHAP01.ini b/Data/Sys/GameSettings/RHAP01.ini index 2cde1b1023..432ddc508b 100644 --- a/Data/Sys/GameSettings/RHAP01.ini +++ b/Data/Sys/GameSettings/RHAP01.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RHAW01.ini b/Data/Sys/GameSettings/RHAW01.ini index d3b0e5b970..fc7d8a495b 100644 --- a/Data/Sys/GameSettings/RHAW01.ini +++ b/Data/Sys/GameSettings/RHAW01.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RHMEE9.ini b/Data/Sys/GameSettings/RHMEE9.ini index 71cb3e898d..56a3c5f01f 100644 --- a/Data/Sys/GameSettings/RHMEE9.ini +++ b/Data/Sys/GameSettings/RHMEE9.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RHMP99.ini b/Data/Sys/GameSettings/RHMP99.ini index d278ff1ffc..f1c618ecf2 100644 --- a/Data/Sys/GameSettings/RHMP99.ini +++ b/Data/Sys/GameSettings/RHMP99.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RM8E01.ini b/Data/Sys/GameSettings/RM8E01.ini index 534dfa7e0a..9a3fb49407 100644 --- a/Data/Sys/GameSettings/RM8E01.ini +++ b/Data/Sys/GameSettings/RM8E01.ini @@ -21,4 +21,3 @@ ForceFiltering = False [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RM8J01.ini b/Data/Sys/GameSettings/RM8J01.ini index 5dcd287241..5345cd96c1 100644 --- a/Data/Sys/GameSettings/RM8J01.ini +++ b/Data/Sys/GameSettings/RM8J01.ini @@ -21,4 +21,3 @@ ForceFiltering = False [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RM8K01.ini b/Data/Sys/GameSettings/RM8K01.ini index ef60f0363e..4081abf01a 100644 --- a/Data/Sys/GameSettings/RM8K01.ini +++ b/Data/Sys/GameSettings/RM8K01.ini @@ -21,4 +21,3 @@ ForceFiltering = False [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RM8P01.ini b/Data/Sys/GameSettings/RM8P01.ini index a42774aa79..755b487e5d 100644 --- a/Data/Sys/GameSettings/RM8P01.ini +++ b/Data/Sys/GameSettings/RM8P01.ini @@ -21,4 +21,3 @@ ForceFiltering = False [Video_Hacks] EFBToTextureEnable = False EFBCopyEnable = True -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RPJE7U.ini b/Data/Sys/GameSettings/RPJE7U.ini index 37cedbc157..43b29cf6ab 100644 --- a/Data/Sys/GameSettings/RPJE7U.ini +++ b/Data/Sys/GameSettings/RPJE7U.ini @@ -29,5 +29,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 512 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RPJJ99.ini b/Data/Sys/GameSettings/RPJJ99.ini index 8bd66b52ef..22c655b054 100644 --- a/Data/Sys/GameSettings/RPJJ99.ini +++ b/Data/Sys/GameSettings/RPJJ99.ini @@ -29,5 +29,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 512 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RWRE4F.ini b/Data/Sys/GameSettings/RWRE4F.ini index d1caebd716..eb17135e89 100644 --- a/Data/Sys/GameSettings/RWRE4F.ini +++ b/Data/Sys/GameSettings/RWRE4F.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/RWRP4F.ini b/Data/Sys/GameSettings/RWRP4F.ini index 35eac83354..07f774018e 100644 --- a/Data/Sys/GameSettings/RWRP4F.ini +++ b/Data/Sys/GameSettings/RWRP4F.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/S3BEWR.ini b/Data/Sys/GameSettings/S3BEWR.ini index 75b983fc0f..a8f4db033c 100644 --- a/Data/Sys/GameSettings/S3BEWR.ini +++ b/Data/Sys/GameSettings/S3BEWR.ini @@ -29,5 +29,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 0 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/S3BPWR.ini b/Data/Sys/GameSettings/S3BPWR.ini index 4b479e2c42..cc4328ce0c 100644 --- a/Data/Sys/GameSettings/S3BPWR.ini +++ b/Data/Sys/GameSettings/S3BPWR.ini @@ -29,5 +29,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 0 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SC2E8P.ini b/Data/Sys/GameSettings/SC2E8P.ini index e714e16ad1..8ea96b1efa 100644 --- a/Data/Sys/GameSettings/SC2E8P.ini +++ b/Data/Sys/GameSettings/SC2E8P.ini @@ -27,5 +27,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SC2P8P.ini b/Data/Sys/GameSettings/SC2P8P.ini index ccb5cd12e7..0c4afea09d 100644 --- a/Data/Sys/GameSettings/SC2P8P.ini +++ b/Data/Sys/GameSettings/SC2P8P.ini @@ -76,5 +76,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SC4E64.ini b/Data/Sys/GameSettings/SC4E64.ini index c4017d8d58..a44eefca8d 100644 --- a/Data/Sys/GameSettings/SC4E64.ini +++ b/Data/Sys/GameSettings/SC4E64.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SC4P64.ini b/Data/Sys/GameSettings/SC4P64.ini index c7e7320572..e6ec2487de 100644 --- a/Data/Sys/GameSettings/SC4P64.ini +++ b/Data/Sys/GameSettings/SC4P64.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SEME4Q.ini b/Data/Sys/GameSettings/SEME4Q.ini index 487e5571df..af28064ebb 100644 --- a/Data/Sys/GameSettings/SEME4Q.ini +++ b/Data/Sys/GameSettings/SEME4Q.ini @@ -33,5 +33,4 @@ SafeTextureCacheColorSamples = 0 ForceFiltering = False [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SEMJ01.ini b/Data/Sys/GameSettings/SEMJ01.ini index 73106463f3..2d908edcc7 100644 --- a/Data/Sys/GameSettings/SEMJ01.ini +++ b/Data/Sys/GameSettings/SEMJ01.ini @@ -33,5 +33,4 @@ SafeTextureCacheColorSamples = 0 ForceFiltering = False [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SEMP4Q.ini b/Data/Sys/GameSettings/SEMP4Q.ini index 3eef876fda..0bf6ba1bd3 100644 --- a/Data/Sys/GameSettings/SEMP4Q.ini +++ b/Data/Sys/GameSettings/SEMP4Q.ini @@ -33,5 +33,4 @@ SafeTextureCacheColorSamples = 0 ForceFiltering = False [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SEMX4Q.ini b/Data/Sys/GameSettings/SEMX4Q.ini index 1efd288b23..1bbbc4fcaa 100644 --- a/Data/Sys/GameSettings/SEMX4Q.ini +++ b/Data/Sys/GameSettings/SEMX4Q.ini @@ -33,5 +33,4 @@ SafeTextureCacheColorSamples = 0 ForceFiltering = False [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SEMY4Q.ini b/Data/Sys/GameSettings/SEMY4Q.ini index 5234e9cc99..f76b0accf9 100644 --- a/Data/Sys/GameSettings/SEMY4Q.ini +++ b/Data/Sys/GameSettings/SEMY4Q.ini @@ -33,5 +33,4 @@ SafeTextureCacheColorSamples = 0 ForceFiltering = False [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SEMZ4Q.ini b/Data/Sys/GameSettings/SEMZ4Q.ini index bbcf9b1db1..1f34b4a0b3 100644 --- a/Data/Sys/GameSettings/SEMZ4Q.ini +++ b/Data/Sys/GameSettings/SEMZ4Q.ini @@ -33,5 +33,4 @@ SafeTextureCacheColorSamples = 0 ForceFiltering = False [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SMNE01.ini b/Data/Sys/GameSettings/SMNE01.ini index ebc073f6e8..18bc47ca7f 100644 --- a/Data/Sys/GameSettings/SMNE01.ini +++ b/Data/Sys/GameSettings/SMNE01.ini @@ -53,5 +53,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 512 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SMNJ01.ini b/Data/Sys/GameSettings/SMNJ01.ini index 278408d9fe..d08999247b 100644 --- a/Data/Sys/GameSettings/SMNJ01.ini +++ b/Data/Sys/GameSettings/SMNJ01.ini @@ -29,5 +29,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 512 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SMNK01.ini b/Data/Sys/GameSettings/SMNK01.ini index e30d833226..6dfccb6269 100644 --- a/Data/Sys/GameSettings/SMNK01.ini +++ b/Data/Sys/GameSettings/SMNK01.ini @@ -29,5 +29,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 512 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SMNP01.ini b/Data/Sys/GameSettings/SMNP01.ini index fa82d55841..dccb211237 100644 --- a/Data/Sys/GameSettings/SMNP01.ini +++ b/Data/Sys/GameSettings/SMNP01.ini @@ -38,5 +38,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 512 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SMNW01.ini b/Data/Sys/GameSettings/SMNW01.ini index a7ce8bcacc..3c7cfc4184 100644 --- a/Data/Sys/GameSettings/SMNW01.ini +++ b/Data/Sys/GameSettings/SMNW01.ini @@ -29,5 +29,4 @@ PH_ZFar = SafeTextureCacheColorSamples = 512 [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SO3EE9.ini b/Data/Sys/GameSettings/SO3EE9.ini index ba4e63e1c2..57d28f4e63 100644 --- a/Data/Sys/GameSettings/SO3EE9.ini +++ b/Data/Sys/GameSettings/SO3EE9.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SO3J99.ini b/Data/Sys/GameSettings/SO3J99.ini index 00a38f1488..400c6d127e 100644 --- a/Data/Sys/GameSettings/SO3J99.ini +++ b/Data/Sys/GameSettings/SO3J99.ini @@ -26,5 +26,3 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False - diff --git a/Data/Sys/GameSettings/SOUE01.ini b/Data/Sys/GameSettings/SOUE01.ini index da6c37beab..9f1090a7e2 100644 --- a/Data/Sys/GameSettings/SOUE01.ini +++ b/Data/Sys/GameSettings/SOUE01.ini @@ -18,4 +18,3 @@ PH_ZNear = PH_ZFar = [Video_Hacks] EFBAccessEnable = True -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SOUJ01.ini b/Data/Sys/GameSettings/SOUJ01.ini index 7ac8c3a5a5..037f36f1b2 100644 --- a/Data/Sys/GameSettings/SOUJ01.ini +++ b/Data/Sys/GameSettings/SOUJ01.ini @@ -18,4 +18,3 @@ PH_ZNear = PH_ZFar = [Video_Hacks] EFBAccessEnable = True -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SOUK01.ini b/Data/Sys/GameSettings/SOUK01.ini index 93ed73dc19..afff3ba808 100644 --- a/Data/Sys/GameSettings/SOUK01.ini +++ b/Data/Sys/GameSettings/SOUK01.ini @@ -18,4 +18,3 @@ PH_ZNear = PH_ZFar = [Video_Hacks] EFBAccessEnable = True -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SOUP01.ini b/Data/Sys/GameSettings/SOUP01.ini index 8fb81b6a71..10ac2a3cf4 100644 --- a/Data/Sys/GameSettings/SOUP01.ini +++ b/Data/Sys/GameSettings/SOUP01.ini @@ -18,4 +18,3 @@ PH_ZNear = PH_ZFar = [Video_Hacks] EFBAccessEnable = True -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SRQE41.ini b/Data/Sys/GameSettings/SRQE41.ini index bdf53c6c47..6cc354013f 100644 --- a/Data/Sys/GameSettings/SRQE41.ini +++ b/Data/Sys/GameSettings/SRQE41.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SRQP41.ini b/Data/Sys/GameSettings/SRQP41.ini index 9106f0539a..22108772c1 100644 --- a/Data/Sys/GameSettings/SRQP41.ini +++ b/Data/Sys/GameSettings/SRQP41.ini @@ -26,5 +26,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/STHP8P.ini b/Data/Sys/GameSettings/STHP8P.ini index cc147492eb..cf485ef70b 100644 --- a/Data/Sys/GameSettings/STHP8P.ini +++ b/Data/Sys/GameSettings/STHP8P.ini @@ -27,5 +27,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SX4E01.ini b/Data/Sys/GameSettings/SX4E01.ini index bc96ee2cc5..85ca816fb7 100644 --- a/Data/Sys/GameSettings/SX4E01.ini +++ b/Data/Sys/GameSettings/SX4E01.ini @@ -27,4 +27,3 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SX4J01.ini b/Data/Sys/GameSettings/SX4J01.ini index 4df1e41460..4dca2aff57 100644 --- a/Data/Sys/GameSettings/SX4J01.ini +++ b/Data/Sys/GameSettings/SX4J01.ini @@ -27,5 +27,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Data/Sys/GameSettings/SX4P01.ini b/Data/Sys/GameSettings/SX4P01.ini index c03cda0a94..6aee33302c 100644 --- a/Data/Sys/GameSettings/SX4P01.ini +++ b/Data/Sys/GameSettings/SX4P01.ini @@ -27,5 +27,4 @@ PH_ZNear = PH_ZFar = [Video_Hacks] -DlistCachingEnable = False diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java index 3811f96a0c..28aae92ed4 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java @@ -91,7 +91,6 @@ public final class UserPreferences editor.putString("externalFrameBuffer", "Real"); } - editor.putBoolean("cacheDisplayLists", getConfig("gfx_opengl.ini", "Hacks", "DlistCachingEnable", "False").equals("True")); editor.putBoolean("disableDestinationAlpha", getConfig("gfx_opengl.ini", "Settings", "DstAlphaPass", "False").equals("True")); editor.putBoolean("fastDepthCalculation", getConfig("gfx_opengl.ini", "Settings", "FastDepthCalc", "True").equals("True")); @@ -234,7 +233,6 @@ public final class UserPreferences NativeLibrary.SetConfig("gfx_opengl.ini", "Settings", "UseRealXFB", "True"); } - NativeLibrary.SetConfig("gfx_opengl.ini", "Hacks", "DlistCachingEnable", dlistCachingEnabled ? "True" : "False"); NativeLibrary.SetConfig("gfx_opengl.ini", "Settings", "DstAlphaPass", disableDstAlphaPass ? "True" : "False"); NativeLibrary.SetConfig("gfx_opengl.ini", "Settings", "FastDepthCalc", useFastDepthCalc ? "True" : "False"); diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp index 3a7757d1c6..d8af788d97 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp @@ -117,7 +117,6 @@ wxString use_ffv1_desc = wxTRANSLATE("Encode frame dumps using the FFV1 codec.\n #endif wxString free_look_desc = wxTRANSLATE("This feature allows you to change the game's camera.\nMove the mouse while holding the right mouse button to pan and while holding the middle button to move.\nHold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n\nIf unsure, leave this unchecked."); wxString crop_desc = wxTRANSLATE("Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n\nIf unsure, leave this unchecked."); -wxString dlc_desc = wxTRANSLATE("[EXPERIMENTAL]\nSpeeds up emulation a bit by caching display lists.\nPossibly causes issues though.\n\nIf unsure, leave this unchecked."); wxString omp_desc = wxTRANSLATE("Use multiple threads to decode textures.\nMight result in a speedup (especially on CPUs with more than two cores).\n\nIf unsure, leave this unchecked."); wxString ppshader_desc = wxTRANSLATE("Apply a post-processing effect after finishing a frame.\n\nIf unsure, select (off)."); wxString cache_efb_copies_desc = wxTRANSLATE("Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\nSometimes also increases visual quality.\nIf you're experiencing any issues, try raising texture cache accuracy or disable this option.\n\nIf unsure, leave this unchecked."); @@ -495,7 +494,6 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con // - other hacks { wxGridSizer* const szr_other = new wxGridSizer(2, 5, 5); - szr_other->Add(CreateCheckBox(page_hacks, _("Cache Display Lists"), wxGetTranslation(dlc_desc), vconfig.bDlistCachingEnable)); szr_other->Add(CreateCheckBox(page_hacks, _("Disable Destination Alpha"), wxGetTranslation(disable_dstalpha_desc), vconfig.bDstAlphaPass)); szr_other->Add(CreateCheckBox(page_hacks, _("OpenMP Texture Decoder"), wxGetTranslation(omp_desc), vconfig.bOMPDecoder)); szr_other->Add(CreateCheckBox(page_hacks, _("Fast Depth Calculation"), wxGetTranslation(fast_depth_calc_desc), vconfig.bFastDepthCalc)); diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index ee6814deb7..1c1955aea6 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -8,7 +8,6 @@ #include "Timer.h" #include "Debugger.h" -#include "DLCache.h" #include "EmuWindow.h" #include "Fifo.h" #include "OnScreenDisplay.h" @@ -950,7 +949,6 @@ void Renderer::Swap(u32 xfbAddr, u32 fbWidth, u32 fbHeight,const EFBRectangle& r GFX_DEBUGGER_PAUSE_AT(NEXT_FRAME, true); - DLCache::ProgressiveCleanup(); TextureCache::Cleanup(); // Enable configuration changes diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp index 0514106da5..2c8179c91d 100644 --- a/Source/Core/VideoBackends/D3D/main.cpp +++ b/Source/Core/VideoBackends/D3D/main.cpp @@ -20,7 +20,6 @@ #include "Host.h" #include "Debugger/DebuggerPanel.h" -#include "DLCache.h" #include "EmuWindow.h" #include "IndexGenerator.h" #include "FileUtil.h" @@ -201,7 +200,6 @@ void VideoBackend::Video_Prepare() PixelShaderManager::Init(); CommandProcessor::Init(); PixelEngine::Init(); - DLCache::Init(); // Tell the host that the window is ready Host_Message(WM_USER_CREATE); @@ -219,7 +217,6 @@ void VideoBackend::Shutdown() s_swapRequested = FALSE; // VideoCommon - DLCache::Shutdown(); Fifo_Shutdown(); CommandProcessor::Shutdown(); PixelShaderManager::Shutdown(); diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index a04071be30..0cabbd0a10 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -33,7 +33,6 @@ #include "TextureCache.h" #include "RasterFont.h" #include "VertexShaderGen.h" -#include "DLCache.h" #include "ProgramShaderCache.h" #include "VertexShaderManager.h" #include "VertexLoaderManager.h" @@ -1588,7 +1587,6 @@ void Renderer::Swap(u32 xfbAddr, u32 fbWidth, u32 fbHeight,const EFBRectangle& r } // Clean out old stuff from caches. It's not worth it to clean out the shader caches. - DLCache::ProgressiveCleanup(); TextureCache::Cleanup(); frameCount++; diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp index 8fe856db84..ba7f1a0689 100644 --- a/Source/Core/VideoBackends/OGL/main.cpp +++ b/Source/Core/VideoBackends/OGL/main.cpp @@ -76,7 +76,6 @@ Make AA apply instantly during gameplay if possible #include "TextureConverter.h" #include "PostProcessing.h" #include "OnScreenDisplay.h" -#include "DLCache.h" #include "FramebufferManager.h" #include "Core.h" #include "Host.h" @@ -225,9 +224,6 @@ void VideoBackend::Video_Prepare() GL_REPORT_ERRORD(); VertexLoaderManager::Init(); TextureConverter::Init(); -#ifndef _M_GENERIC - DLCache::Init(); -#endif // Notify the core that the video backend is ready Host_Message(WM_USER_CREATE); @@ -250,9 +246,6 @@ void VideoBackend::Video_Cleanup() { s_efbAccessRequested = false; s_FifoShuttingDown = false; s_swapRequested = false; -#ifndef _M_GENERIC - DLCache::Shutdown(); -#endif Fifo_Shutdown(); // The following calls are NOT Thread Safe diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt index b9da39f6b4..8a5ad16335 100644 --- a/Source/Core/VideoCommon/CMakeLists.txt +++ b/Source/Core/VideoCommon/CMakeLists.txt @@ -40,11 +40,9 @@ set(SRCS BPFunctions.cpp set(LIBS core png) if(NOT _M_GENERIC) - set(SRCS ${SRCS} TextureDecoder_x64.cpp - DLCache_x64.cpp) + set(SRCS ${SRCS} TextureDecoder_x64.cpp) else() - set(SRCS ${SRCS} TextureDecoder_Generic.cpp - DLCache_Generic.cpp) + set(SRCS ${SRCS} TextureDecoder_Generic.cpp) endif() if(NOT ${CL} STREQUAL CL-NOTFOUND) list(APPEND LIBS ${CL}) diff --git a/Source/Core/VideoCommon/CommandProcessor.cpp b/Source/Core/VideoCommon/CommandProcessor.cpp index 4f64d4172c..b52be51865 100644 --- a/Source/Core/VideoCommon/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/CommandProcessor.cpp @@ -17,7 +17,6 @@ #include "HW/ProcessorInterface.h" #include "HW/GPFifo.h" #include "HW/Memmap.h" -#include "DLCache.h" #include "HW/SystemTimers.h" #include "Core.h" @@ -409,7 +408,6 @@ void Write16(const u16 _Value, const u32 _Address) { ResetVideoBuffer(); } - IncrementCheckContextId(); DEBUG_LOG(COMMANDPROCESSOR,"Try to write to FIFO_RW_DISTANCE_HI : %04x", _Value); break; case FIFO_RW_DISTANCE_LO: @@ -527,7 +525,6 @@ void SetCpStatus(bool isCPUThread) { INFO_LOG(COMMANDPROCESSOR, "Hit breakpoint at %i", fifo.CPReadPointer); fifo.bFF_Breakpoint = true; - IncrementCheckContextId(); } } else diff --git a/Source/Core/VideoCommon/DLCache.h b/Source/Core/VideoCommon/DLCache.h deleted file mode 100644 index 3e12c24ad8..0000000000 --- a/Source/Core/VideoCommon/DLCache.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#ifndef _DLCACHE_H -#define _DLCACHE_H - -bool HandleDisplayList(u32 address, u32 size); -void IncrementCheckContextId(); - -namespace DLCache { - -void Init(); -void Shutdown(); -void ProgressiveCleanup(); -void Clear(); - -} // namespace - -#endif // _DLCACHE_H diff --git a/Source/Core/VideoCommon/DLCache_Generic.cpp b/Source/Core/VideoCommon/DLCache_Generic.cpp deleted file mode 100644 index d5ed12c9c8..0000000000 --- a/Source/Core/VideoCommon/DLCache_Generic.cpp +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (C) 2003-2009 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -// TODO: Handle cache-is-full condition :p - - -#include "Common.h" -#include "DLCache.h" - -namespace DLCache -{ - -void Init() -{ -} - -void Shutdown() -{ -} - -void Clear() -{ -} - -void ProgressiveCleanup() -{ -} -} // namespace - -// NOTE - outside the namespace on purpose. -bool HandleDisplayList(u32 address, u32 size) -{ - return false; -} - -void IncrementCheckContextId() -{ -} diff --git a/Source/Core/VideoCommon/DLCache_x64.cpp b/Source/Core/VideoCommon/DLCache_x64.cpp deleted file mode 100644 index c2ad2a558c..0000000000 --- a/Source/Core/VideoCommon/DLCache_x64.cpp +++ /dev/null @@ -1,775 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -// TODO: Handle cache-is-full condition :p - -#include - -#include "Common.h" -#include "VideoCommon.h" -#include "Hash.h" -#include "MemoryUtil.h" -#include "DataReader.h" -#include "Statistics.h" -#include "OpcodeDecoding.h" // For the GX_ constants. -#include "HW/Memmap.h" - -#include "XFMemory.h" -#include "CPMemory.h" -#include "BPMemory.h" - -#include "VertexLoaderManager.h" -#include "VertexManagerBase.h" -#include "x64Emitter.h" -#include "x64ABI.h" - -#include "DLCache.h" -#include "VideoConfig.h" - -#define DL_CODE_CACHE_SIZE (1024*1024*16) -#define DL_CODE_CLEAR_THRESHOLD (16 * 1024) -extern int frameCount; -static u32 CheckContextId; -using namespace Gen; - -namespace DLCache -{ - -enum DisplayListPass { - DLPASS_ANALYZE, - DLPASS_COMPILE, - DLPASS_RUN, -}; - -#define DL_HASH_STEPS 512 - -struct ReferencedDataRegion -{ - ReferencedDataRegion() - :hash(0), - start_address(NULL), - NextRegion(NULL), - size(0), - MustClean(0) - {} - u64 hash; - u8* start_address; - ReferencedDataRegion* NextRegion; - u32 size; - u32 MustClean; - - - int IntersectsMemoryRange(u8* range_address, u32 range_size) - { - if (start_address + size < range_address) - return -1; - if (start_address >= range_address + range_size) - return 1; - return 0; - } -}; - -struct CachedDisplayList -{ - CachedDisplayList() - : Regions(NULL), - LastRegion(NULL), - uncachable(false), - num_xf_reg(0), - num_cp_reg(0), - num_bp_reg(0), - num_index_xf(0), - num_draw_call(0), - pass(DLPASS_ANALYZE), - BufferCount(0) - { - frame_count = frameCount; - } - u64 dl_hash; - // ... Something containing cached vertex buffers here ... - ReferencedDataRegion* Regions; - ReferencedDataRegion* LastRegion; - // Compile the commands themselves down to native code. - const u8* compiled_code; - u32 uncachable; // if set, this DL will always be interpreted. This gets set if hash ever changes. - // Analytic data - u32 num_xf_reg; - u32 num_cp_reg; - u32 num_bp_reg; - u32 num_index_xf; - u32 num_draw_call; - u32 pass; - u32 check; - int frame_count; - u32 BufferCount; - - void InsertRegion(ReferencedDataRegion* NewRegion) - { - if(LastRegion) - { - LastRegion->NextRegion = NewRegion; - } - LastRegion = NewRegion; - if(!Regions) - { - Regions = LastRegion; - } - BufferCount++; - } - - void InsertOverlapingRegion(u8* RegionStartAddress, u32 Size) - { - ReferencedDataRegion* NewRegion = FindOverlapingRegion(RegionStartAddress, Size); - if(NewRegion) - { - bool RegionChanged = false; - if(RegionStartAddress < NewRegion->start_address) - { - NewRegion->start_address = RegionStartAddress; - RegionChanged = true; - } - if(RegionStartAddress + Size > NewRegion->start_address + NewRegion->size) - { - NewRegion->size += (u32)((RegionStartAddress + Size) - (NewRegion->start_address + NewRegion->size)); - RegionChanged = true; - } - if(RegionChanged) - NewRegion->hash = GetHash64(NewRegion->start_address, NewRegion->size, DL_HASH_STEPS); - } - else - { - NewRegion = new ReferencedDataRegion; - NewRegion->MustClean = false; - NewRegion->size = Size; - NewRegion->start_address = RegionStartAddress; - NewRegion->hash = GetHash64(RegionStartAddress, Size, DL_HASH_STEPS); - InsertRegion(NewRegion); - } - } - - bool CheckRegions() - { - ReferencedDataRegion* Current = Regions; - while(Current) - { - if(Current->hash) - { - if(Current->hash != GetHash64(Current->start_address, Current->size, DL_HASH_STEPS)) - return false; - } - Current = Current->NextRegion; - } - return true; - } - - ReferencedDataRegion* FindOverlapingRegion(u8* RegionStart, u32 Regionsize) - { - ReferencedDataRegion* Current = Regions; - while(Current) - { - if(!Current->IntersectsMemoryRange(RegionStart, Regionsize)) - return Current; - Current = Current->NextRegion; - } - return Current; - } - - void ClearRegions() - { - ReferencedDataRegion* Current = Regions; - while(Current) - { - ReferencedDataRegion* temp = Current; - Current = Current->NextRegion; - if(temp->MustClean) - delete [] temp->start_address; - delete temp; - } - LastRegion = NULL; - Regions = NULL; - } -}; - -// We want to allow caching DLs that start at the same address but have different lengths, -// so the size has to be in the ID. -inline u64 CreateMapId(u32 address, u32 size) -{ - return ((u64)address << 32) | size; -} - -inline u64 CreateVMapId(u32 VATUSED) -{ - u64 vmap_id = 0x9368e53c2f6af274ULL ^ g_VtxDesc.Hex; - for(int i = 0; i < 8 ; i++) - { - if(VATUSED & (1 << i)) - { - vmap_id ^= (((u64)g_VtxAttr[i].g0.Hex) | (((u64)g_VtxAttr[i].g1.Hex) << 32)) ^ (((u64)g_VtxAttr[i].g2.Hex) << i); - } - } - for(int i = 0; i < 12; i++) - { - if(VATUSED & (1 << (i + 16))) - vmap_id ^= (((u64)arraybases[i]) ^ (((u64)arraystrides[i]) << 32)); - } - return vmap_id; -} - -typedef std::unordered_map DLMap; - -struct VDlist -{ - DLMap dl_map; - u32 VATUsed; - u32 count; -}; - -typedef std::unordered_map VDLMap; - -static VDLMap dl_map; -static u8* dlcode_cache; - -static Gen::XEmitter emitter; - - - -// First pass - analyze -u32 AnalyzeAndRunDisplayList(u32 address, u32 size, CachedDisplayList *dl) -{ - u8* old_pVideoData = g_pVideoData; - u8* startAddress = Memory::GetPointer(address); - u32 num_xf_reg = 0; - u32 num_cp_reg = 0; - u32 num_bp_reg = 0; - u32 num_index_xf = 0; - u32 num_draw_call = 0; - u32 result = 0; - - - // Avoid the crash if Memory::GetPointer failed .. - if (startAddress != 0) - { - g_pVideoData = startAddress; - - // temporarily swap dl and non-dl (small "hack" for the stats) - Statistics::SwapDL(); - - u8 *end = g_pVideoData + size; - while (g_pVideoData < end) - { - // Yet another reimplementation of the DL reading... - int cmd_byte = DataReadU8(); - switch (cmd_byte) - { - case GX_NOP: - break; - - case GX_LOAD_CP_REG: //0x08 - { - u8 sub_cmd = DataReadU8(); - u32 value = DataReadU32(); - LoadCPReg(sub_cmd, value); - INCSTAT(stats.thisFrame.numCPLoads); - num_cp_reg++; - } - break; - - case GX_LOAD_XF_REG: - { - u32 Cmd2 = DataReadU32(); - int transfer_size = ((Cmd2 >> 16) & 15) + 1; - u32 xf_address = Cmd2 & 0xFFFF; - GC_ALIGNED128(u32 data_buffer[16]); - DataReadU32xFuncs[transfer_size-1](data_buffer); - LoadXFReg(transfer_size, xf_address, data_buffer); - INCSTAT(stats.thisFrame.numXFLoads); - num_xf_reg++; - } - break; - - case GX_LOAD_INDX_A: //used for position matrices - { - LoadIndexedXF(DataReadU32(), 0xC); - num_index_xf++; - } - break; - case GX_LOAD_INDX_B: //used for normal matrices - { - LoadIndexedXF(DataReadU32(), 0xD); - num_index_xf++; - } - break; - case GX_LOAD_INDX_C: //used for postmatrices - { - LoadIndexedXF(DataReadU32(), 0xE); - num_index_xf++; - } - break; - case GX_LOAD_INDX_D: //used for lights - { - LoadIndexedXF(DataReadU32(), 0xF); - num_index_xf++; - } - break; - case GX_CMD_CALL_DL: - { - u32 addr = DataReadU32(); - u32 count = DataReadU32(); - ExecuteDisplayList(addr, count); - } - break; - case GX_CMD_UNKNOWN_METRICS: // zelda 4 swords calls it and checks the metrics registers after that - DEBUG_LOG(VIDEO, "GX 0x44: %08x", cmd_byte); - break; - case GX_CMD_INVL_VC: // Invalidate Vertex Cache - DEBUG_LOG(VIDEO, "Invalidate (vertex cache?)"); - break; - case GX_LOAD_BP_REG: //0x61 - { - u32 bp_cmd = DataReadU32(); - LoadBPReg(bp_cmd); - INCSTAT(stats.thisFrame.numBPLoads); - num_bp_reg++; - } - break; - - // draw primitives - default: - if (cmd_byte & 0x80) - { - // load vertices (use computed vertex size from FifoCommandRunnable above) - u16 numVertices = DataReadU16(); - if(numVertices > 0) - { - result |= 1 << (cmd_byte & GX_VAT_MASK); - VertexLoaderManager::RunVertices( - cmd_byte & GX_VAT_MASK, // Vertex loader index (0 - 7) - (cmd_byte & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT, - numVertices); - num_draw_call++; - const u32 tc[12] = { - g_VtxDesc.Position, g_VtxDesc.Normal, g_VtxDesc.Color0, g_VtxDesc.Color1, g_VtxDesc.Tex0Coord, g_VtxDesc.Tex1Coord, - g_VtxDesc.Tex2Coord, g_VtxDesc.Tex3Coord, g_VtxDesc.Tex4Coord, g_VtxDesc.Tex5Coord, g_VtxDesc.Tex6Coord, (const u32)((g_VtxDesc.Hex >> 31) & 3) - }; - for(int i = 0; i < 12; i++) - { - if(tc[i] > 1) - { - result |= 1 << (i + 16); - } - } - } - } - else - { - ERROR_LOG(VIDEO, "OpcodeDecoding::Decode: Illegal command %02x", cmd_byte); - break; - } - break; - } - } - INCSTAT(stats.numDListsCalled); - INCSTAT(stats.thisFrame.numDListsCalled); - // un-swap - Statistics::SwapDL(); - } - dl->num_bp_reg = num_bp_reg; - dl->num_cp_reg = num_cp_reg; - dl->num_draw_call = num_draw_call; - dl->num_index_xf = num_index_xf; - dl->num_xf_reg = num_xf_reg; - // reset to the old pointer - g_pVideoData = old_pVideoData; - return result; -} - -// The only sensible way to detect changes to vertex data is to convert several times -// and hash the output. - -// Second pass - compile -// Since some commands can affect the size of other commands, we really have no choice -// but to compile as we go, interpreting the list. We can't compile and then execute, we must -// compile AND execute at the same time. The second time the display list gets called, we already -// have the compiled code so we don't have to interpret anymore, we just run it. -void CompileAndRunDisplayList(u32 address, u32 size, CachedDisplayList *dl) -{ - u8* old_pVideoData = g_pVideoData; - u8* startAddress = Memory::GetPointer(address); - - // Avoid the crash if Memory::GetPointer failed .. - if (startAddress != 0) - { - g_pVideoData = startAddress; - - // temporarily swap dl and non-dl (small "hack" for the stats) - Statistics::SwapDL(); - - u8 *end = g_pVideoData + size; - - emitter.AlignCode4(); - dl->compiled_code = emitter.GetCodePtr(); - emitter.ABI_PushAllCalleeSavedRegsAndAdjustStack(); - - while (g_pVideoData < end) - { - // Yet another reimplementation of the DL reading... - int cmd_byte = DataReadU8(); - switch (cmd_byte) - { - case GX_NOP: - // Execute - // Compile - break; - - case GX_LOAD_CP_REG: //0x08 - { - // Execute - u8 sub_cmd = DataReadU8(); - u32 value = DataReadU32(); - LoadCPReg(sub_cmd, value); - INCSTAT(stats.thisFrame.numCPLoads); - - // Compile - emitter.ABI_CallFunctionCC((void *)&LoadCPReg, sub_cmd, value); - } - break; - - case GX_LOAD_XF_REG: - { - // Execute - u32 Cmd2 = DataReadU32(); - int transfer_size = ((Cmd2 >> 16) & 15) + 1; - u32 xf_address = Cmd2 & 0xFFFF; - ReferencedDataRegion* NewRegion = new ReferencedDataRegion; - NewRegion->MustClean = true; - NewRegion->size = transfer_size * 4; - NewRegion->start_address = (u8*) new u8[NewRegion->size+15+12]; // alignment and guaranteed space - NewRegion->hash = 0; - dl->InsertRegion(NewRegion); - u32 *data_buffer = (u32*)(u8*)(((size_t)NewRegion->start_address+0xf)&~0xf); - DataReadU32xFuncs[transfer_size-1](data_buffer); - LoadXFReg(transfer_size, xf_address, data_buffer); - INCSTAT(stats.thisFrame.numXFLoads); - // Compile - emitter.ABI_CallFunctionCCP((void *)&LoadXFReg, transfer_size, xf_address, data_buffer); - } - break; - - case GX_LOAD_INDX_A: //used for position matrices - { - u32 value = DataReadU32(); - // Execute - LoadIndexedXF(value, 0xC); - // Compile - emitter.ABI_CallFunctionCC((void *)&LoadIndexedXF, value, 0xC); - } - break; - case GX_LOAD_INDX_B: //used for normal matrices - { - u32 value = DataReadU32(); - // Execute - LoadIndexedXF(value, 0xD); - // Compile - emitter.ABI_CallFunctionCC((void *)&LoadIndexedXF, value, 0xD); - } - break; - case GX_LOAD_INDX_C: //used for postmatrices - { - u32 value = DataReadU32(); - // Execute - LoadIndexedXF(value, 0xE); - // Compile - emitter.ABI_CallFunctionCC((void *)&LoadIndexedXF, value, 0xE); - } - break; - case GX_LOAD_INDX_D: //used for lights - { - u32 value = DataReadU32(); - // Execute - LoadIndexedXF(value, 0xF); - // Compile - emitter.ABI_CallFunctionCC((void *)&LoadIndexedXF, value, 0xF); - } - break; - - case GX_CMD_CALL_DL: - { - u32 addr= DataReadU32(); - u32 count = DataReadU32(); - ExecuteDisplayList(addr, count); - emitter.ABI_CallFunctionCC((void *)&ExecuteDisplayList, addr, count); - } - break; - - case GX_CMD_UNKNOWN_METRICS: - // zelda 4 swords calls it and checks the metrics registers after that - break; - - case GX_CMD_INVL_VC:// Invalidate (vertex cache?) - DEBUG_LOG(VIDEO, "Invalidate (vertex cache?)"); - break; - - case GX_LOAD_BP_REG: //0x61 - { - u32 bp_cmd = DataReadU32(); - // Execute - LoadBPReg(bp_cmd); - INCSTAT(stats.thisFrame.numBPLoads); - // Compile - emitter.ABI_CallFunctionC((void *)&LoadBPReg, bp_cmd); - } - break; - - // draw primitives - default: - if (cmd_byte & 0x80) - { - // load vertices (use computed vertex size from FifoCommandRunnable above) - u16 numVertices = DataReadU16(); - if(numVertices > 0) - { - // Execute - u8* StartAddress = VertexManager::s_pBaseBufferPointer; - VertexManager::Flush(); - VertexLoaderManager::RunVertices( - cmd_byte & GX_VAT_MASK, // Vertex loader index (0 - 7) - (cmd_byte & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT, - numVertices); - u32 Vdatasize = (u32)(VertexManager::s_pCurBufferPointer - StartAddress); - if (Vdatasize > 0) - { - // Compile - ReferencedDataRegion* NewRegion = new ReferencedDataRegion; - NewRegion->MustClean = true; - NewRegion->size = Vdatasize; - NewRegion->start_address = (u8*)new u8[Vdatasize]; - NewRegion->hash = 0; - dl->InsertRegion(NewRegion); - memcpy(NewRegion->start_address, StartAddress, Vdatasize); - emitter.ABI_CallFunctionCCCP((void *)&VertexLoaderManager::RunCompiledVertices, cmd_byte & GX_VAT_MASK, (cmd_byte & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT, numVertices, NewRegion->start_address); - const u32 tc[12] = { - g_VtxDesc.Position, g_VtxDesc.Normal, g_VtxDesc.Color0, g_VtxDesc.Color1, g_VtxDesc.Tex0Coord, g_VtxDesc.Tex1Coord, - g_VtxDesc.Tex2Coord, g_VtxDesc.Tex3Coord, g_VtxDesc.Tex4Coord, g_VtxDesc.Tex5Coord, g_VtxDesc.Tex6Coord, (const u32)((g_VtxDesc.Hex >> 31) & 3) - }; - for(int i = 0; i < 12; i++) - { - if(tc[i] > 1) - { - u8* saddr = cached_arraybases[i]; - int arraySize = arraystrides[i] * ((tc[i] == 2)? numVertices : ((numVertices < 1024)? 2 * numVertices : numVertices)); - dl->InsertOverlapingRegion(saddr, arraySize); - } - } - } - } - } - else - { - ERROR_LOG(VIDEO, "DLCache::CompileAndRun: Illegal command %02x", cmd_byte); - break; - } - break; - } - } - emitter.ABI_PopAllCalleeSavedRegsAndAdjustStack(); - emitter.RET(); - INCSTAT(stats.numDListsCalled); - INCSTAT(stats.thisFrame.numDListsCalled); - Statistics::SwapDL(); - } - g_pVideoData = old_pVideoData; -} - - -void Init() -{ - CheckContextId = 0; - dlcode_cache = (u8*)AllocateExecutableMemory(DL_CODE_CACHE_SIZE, false); // Don't need low memory. - emitter.SetCodePtr(dlcode_cache); -} - -void Shutdown() -{ - Clear(); - FreeMemoryPages(dlcode_cache, DL_CODE_CACHE_SIZE); - dlcode_cache = NULL; -} - -void Clear() -{ - VDLMap::iterator iter = dl_map.begin(); - while (iter != dl_map.end()) - { - VDlist &ParentEntry = iter->second; - DLMap::iterator childiter = ParentEntry.dl_map.begin(); - while (childiter != ParentEntry.dl_map.end()) - { - CachedDisplayList &entry = childiter->second; - entry.ClearRegions(); - childiter++; - } - - ParentEntry.dl_map.clear(); - iter++; - } - dl_map.clear(); - // Reset the cache pointers. - emitter.SetCodePtr(dlcode_cache); -} - -void ProgressiveCleanup() -{ - VDLMap::iterator iter = dl_map.begin(); - while (iter != dl_map.end()) - { - VDlist &ParentEntry = iter->second; - DLMap::iterator childiter = ParentEntry.dl_map.begin(); - while (childiter != ParentEntry.dl_map.end()) - { - CachedDisplayList &entry = childiter->second; - int limit = 3600; - if (entry.frame_count < frameCount - limit) - { - entry.ClearRegions(); - ParentEntry.dl_map.erase(childiter++); // (this is gcc standard!) - } - else - { - ++childiter; - } - } - - if(ParentEntry.dl_map.empty()) - { - dl_map.erase(iter++); - } - else - { - iter++; - } - } -} - -static size_t GetSpaceLeft() -{ - return DL_CODE_CACHE_SIZE - (emitter.GetCodePtr() - dlcode_cache); -} - -} // namespace - -// NOTE - outside the namespace on purpose. -bool HandleDisplayList(u32 address, u32 size) -{ - //Fixed DlistCaching now is fully functional still some things to workout - if(!g_ActiveConfig.bDlistCachingEnable) - return false; - if(size == 0) - return false; - - // TODO: Is this thread safe? - if (DLCache::GetSpaceLeft() < DL_CODE_CLEAR_THRESHOLD) - { - DLCache::Clear(); - } - - u64 dl_id = DLCache::CreateMapId(address, size); - u64 vhash = 0; - DLCache::VDLMap::iterator Parentiter = DLCache::dl_map.find(dl_id); - DLCache::DLMap::iterator iter; - bool childexist = false; - - if (Parentiter != DLCache::dl_map.end()) - { - vhash = DLCache::CreateVMapId(Parentiter->second.VATUsed); - iter = Parentiter->second.dl_map.find(vhash); - childexist = iter != Parentiter->second.dl_map.end(); - } - - if (Parentiter != DLCache::dl_map.end() && childexist) - { - DLCache::CachedDisplayList &dl = iter->second; - if (dl.uncachable) - { - return false; - } - - switch (dl.pass) - { - case DLCache::DLPASS_COMPILE: - // First, check that the hash is the same as the last time. - if (dl.dl_hash != GetHash64(Memory::GetPointer(address), size, 0)) - { - dl.uncachable = true; - return false; - } - DLCache::CompileAndRunDisplayList(address, size, &dl); - dl.pass = DLCache::DLPASS_RUN; - break; - case DLCache::DLPASS_RUN: - { - bool DlistChanged = false; - if (dl.check != CheckContextId) - { - dl.check = CheckContextId; - DlistChanged = !dl.CheckRegions() || dl.dl_hash != GetHash64(Memory::GetPointer(address), size, 0); - } - if (DlistChanged) - { - dl.uncachable = true; - dl.ClearRegions(); - return false; - } - dl.frame_count= frameCount; - u8 *old_datareader = g_pVideoData; - ((void (*)())(void*)(dl.compiled_code))(); - Statistics::SwapDL(); - ADDSTAT(stats.thisFrame.numCPLoadsInDL, dl.num_cp_reg); - ADDSTAT(stats.thisFrame.numXFLoadsInDL, dl.num_xf_reg); - ADDSTAT(stats.thisFrame.numBPLoadsInDL, dl.num_bp_reg); - - ADDSTAT(stats.thisFrame.numCPLoads, dl.num_cp_reg); - ADDSTAT(stats.thisFrame.numXFLoads, dl.num_xf_reg); - ADDSTAT(stats.thisFrame.numBPLoads, dl.num_bp_reg); - - INCSTAT(stats.numDListsCalled); - INCSTAT(stats.thisFrame.numDListsCalled); - - Statistics::SwapDL(); - g_pVideoData = old_datareader; - break; - } - } - return true; - } - - DLCache::CachedDisplayList dl; - - u32 dlvatused = DLCache::AnalyzeAndRunDisplayList(address, size, &dl); - dl.dl_hash = GetHash64(Memory::GetPointer(address), size,0); - dl.pass = DLCache::DLPASS_COMPILE; - dl.check = CheckContextId; - vhash = DLCache::CreateVMapId(dlvatused); - if(Parentiter != DLCache::dl_map.end()) - { - DLCache::VDlist &vdl = Parentiter->second; - vdl.dl_map[vhash] = dl; - vdl.VATUsed = dlvatused; - vdl.count++; - } - else - { - DLCache::VDlist vdl; - vdl.dl_map[vhash] = dl; - vdl.VATUsed = dlvatused; - vdl.count = 1; - DLCache::dl_map[dl_id] = vdl; - } - - return true; -} - -void IncrementCheckContextId() -{ - CheckContextId++; -} diff --git a/Source/Core/VideoCommon/OpcodeDecoding.cpp b/Source/Core/VideoCommon/OpcodeDecoding.cpp index f469bc7f6d..4211bd650d 100644 --- a/Source/Core/VideoCommon/OpcodeDecoding.cpp +++ b/Source/Core/VideoCommon/OpcodeDecoding.cpp @@ -112,15 +112,6 @@ void InterpretDisplayList(u32 address, u32 size) g_pVideoData = old_pVideoData; } -// Defer to backend-specific DL cache. -extern bool HandleDisplayList(u32 address, u32 size); - -void ExecuteDisplayList(u32 address, u32 size) -{ - if (!HandleDisplayList(address, size)) - InterpretDisplayList(address, size); -} - u32 FifoCommandRunnable(u32 &command_size) { u32 cycleTime = 0; @@ -337,7 +328,7 @@ static void Decode() { u32 address = DataReadU32(); u32 count = DataReadU32(); - ExecuteDisplayList(address, count); + InterpretDisplayList(address, count); } break; diff --git a/Source/Core/VideoCommon/OpcodeDecoding.h b/Source/Core/VideoCommon/OpcodeDecoding.h index 3263d2c7b0..36d130a8b5 100644 --- a/Source/Core/VideoCommon/OpcodeDecoding.h +++ b/Source/Core/VideoCommon/OpcodeDecoding.h @@ -38,5 +38,5 @@ extern bool g_bRecordFifoData; void OpcodeDecoder_Init(); void OpcodeDecoder_Shutdown(); u32 OpcodeDecoder_Run(bool skipped_frame); -void ExecuteDisplayList(u32 address, u32 size); +void InterpretDisplayList(u32 address, u32 size); #endif // _OPCODE_DECODING_H diff --git a/Source/Core/VideoCommon/PixelEngine.cpp b/Source/Core/VideoCommon/PixelEngine.cpp index 67b707836c..32d91f4310 100644 --- a/Source/Core/VideoCommon/PixelEngine.cpp +++ b/Source/Core/VideoCommon/PixelEngine.cpp @@ -17,7 +17,6 @@ #include "RenderBase.h" #include "CommandProcessor.h" #include "HW/ProcessorInterface.h" -#include "DLCache.h" #include "State.h" namespace PixelEngine @@ -380,7 +379,6 @@ void SetToken_OnMainThread(u64 userdata, int cyclesLate) UpdateInterrupts(); } CommandProcessor::interruptTokenWaiting = false; - IncrementCheckContextId(); } void SetFinish_OnMainThread(u64 userdata, int cyclesLate) @@ -402,7 +400,6 @@ void SetToken(const u16 _token, const int _bSetTokenAcknowledge) CommandProcessor::interruptTokenWaiting = true; CoreTiming::ScheduleEvent_Threadsafe(0, et_SetTokenOnMainThread, _token | (_bSetTokenAcknowledge << 16)); - IncrementCheckContextId(); } // SetFinish @@ -412,7 +409,6 @@ void SetFinish() CommandProcessor::interruptFinishWaiting = true; CoreTiming::ScheduleEvent_Threadsafe(0, et_SetFinishOnMainThread, 0); INFO_LOG(PIXELENGINE, "VIDEO Set Finish"); - IncrementCheckContextId(); } //This function is used in CommandProcessor when write CTRL_REGISTER and the new fifo is attached. diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index e509ccb980..7f046e53a3 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -59,7 +59,6 @@ int Renderer::s_LastEFBScale; bool Renderer::s_skipSwap; bool Renderer::XFBWrited; -bool Renderer::s_EnableDLCachingAfterRecording; unsigned int Renderer::prev_efb_format = (unsigned int)-1; unsigned int Renderer::efb_scale_numeratorX = 1; @@ -490,19 +489,11 @@ void Renderer::CheckFifoRecording() { if (!wasRecording) { - // Disable display list caching because the recorder does not handle it - s_EnableDLCachingAfterRecording = g_ActiveConfig.bDlistCachingEnable; - g_ActiveConfig.bDlistCachingEnable = false; - RecordVideoMemory(); } FifoRecorder::GetInstance().EndFrame(CommandProcessor::fifo.CPBase, CommandProcessor::fifo.CPEnd); } - else if (wasRecording) - { - g_ActiveConfig.bDlistCachingEnable = s_EnableDLCachingAfterRecording; - } } void Renderer::RecordVideoMemory() diff --git a/Source/Core/VideoCommon/RenderBase.h b/Source/Core/VideoCommon/RenderBase.h index 22d31cde23..08c39f8703 100644 --- a/Source/Core/VideoCommon/RenderBase.h +++ b/Source/Core/VideoCommon/RenderBase.h @@ -151,8 +151,6 @@ protected: static bool s_skipSwap; static bool XFBWrited; - static bool s_EnableDLCachingAfterRecording; - private: static unsigned int prev_efb_format; static unsigned int efb_scale_numeratorX; diff --git a/Source/Core/VideoCommon/VertexLoader.cpp b/Source/Core/VideoCommon/VertexLoader.cpp index 45bfec384a..a2825da1c7 100644 --- a/Source/Core/VideoCommon/VertexLoader.cpp +++ b/Source/Core/VideoCommon/VertexLoader.cpp @@ -19,6 +19,7 @@ #include "BPMemory.h" #include "DataReader.h" #include "VertexManagerBase.h" +#include "IndexGenerator.h" #include "VertexLoader_Position.h" #include "VertexLoader_Normal.h" @@ -836,7 +837,7 @@ void VertexLoader::WriteSetVariable(int bits, void *address, OpArg value) } #endif -int VertexLoader::SetupRunVertices(int vtx_attr_group, int primitive, int const count) +void VertexLoader::SetupRunVertices(int vtx_attr_group, int primitive, int const count) { m_numLoadedVertices += count; @@ -851,13 +852,6 @@ int VertexLoader::SetupRunVertices(int vtx_attr_group, int primitive, int const } g_nativeVertexFmt = m_NativeFmt; - if (bpmem.genMode.cullmode == 3 && primitive < 5) - { - // if cull mode is none, ignore triangles and quads - DataSkip(count * m_VertexSize); - return 0; - } - // Load position and texcoord scale factors. m_VtxAttr.PosFrac = g_VtxAttr[vtx_attr_group].g0.PosFrac; m_VtxAttr.texCoord[0].Frac = g_VtxAttr[vtx_attr_group].g0.Tex0Frac; @@ -881,17 +875,6 @@ int VertexLoader::SetupRunVertices(int vtx_attr_group, int primitive, int const s_bbox_primitive = primitive; s_bbox_currPoint = 0; s_bbox_loadedPoints = 0; - - VertexManager::PrepareForAdditionalData(primitive, count, native_stride); - - return count; -} - -void VertexLoader::RunVertices(int vtx_attr_group, int primitive, int const count) -{ - auto const new_count = SetupRunVertices(vtx_attr_group, primitive, count); - ConvertVertices(new_count); - VertexManager::AddVertices(primitive, new_count); } void VertexLoader::ConvertVertices ( int count ) @@ -915,15 +898,21 @@ void VertexLoader::ConvertVertices ( int count ) #endif } -void VertexLoader::RunCompiledVertices(int vtx_attr_group, int primitive, int const count, u8* Data) +void VertexLoader::RunVertices(int vtx_attr_group, int primitive, int const count) { - auto const new_count = SetupRunVertices(vtx_attr_group, primitive, count); + if (bpmem.genMode.cullmode == 3 && primitive < 5) + { + // if cull mode is none, ignore triangles and quads + DataSkip(count * m_VertexSize); + return; + } + SetupRunVertices(vtx_attr_group, primitive, count); + VertexManager::PrepareForAdditionalData(primitive, count, native_stride); + ConvertVertices(count); + IndexGenerator::AddIndices(primitive, count); - memcpy_gc(VertexManager::s_pCurBufferPointer, Data, native_stride * new_count); - VertexManager::s_pCurBufferPointer += native_stride * new_count; - DataSkip(new_count * m_VertexSize); - - VertexManager::AddVertices(primitive, new_count); + ADDSTAT(stats.thisFrame.numPrims, count); + INCSTAT(stats.thisFrame.numPrimitiveJoins); } void VertexLoader::SetVAT(u32 _group0, u32 _group1, u32 _group2) diff --git a/Source/Core/VideoCommon/VertexLoader.h b/Source/Core/VideoCommon/VertexLoader.h index c9ef28175c..59f94774b8 100644 --- a/Source/Core/VideoCommon/VertexLoader.h +++ b/Source/Core/VideoCommon/VertexLoader.h @@ -95,9 +95,8 @@ public: int GetVertexSize() const {return m_VertexSize;} - int SetupRunVertices(int vtx_attr_group, int primitive, int const count); + void SetupRunVertices(int vtx_attr_group, int primitive, int const count); void RunVertices(int vtx_attr_group, int primitive, int count); - void RunCompiledVertices(int vtx_attr_group, int primitive, int count, u8* Data); // For debugging / profiling void AppendToString(std::string *dest) const; diff --git a/Source/Core/VideoCommon/VertexLoaderManager.cpp b/Source/Core/VideoCommon/VertexLoaderManager.cpp index 9ad3e013c6..d1f1acf9a4 100644 --- a/Source/Core/VideoCommon/VertexLoaderManager.cpp +++ b/Source/Core/VideoCommon/VertexLoaderManager.cpp @@ -96,7 +96,7 @@ void MarkAllDirty() s_attr_dirty = 0xff; } -static void RefreshLoader(int vtx_attr_group) +static VertexLoader* RefreshLoader(int vtx_attr_group) { if ((s_attr_dirty >> vtx_attr_group) & 1) { @@ -116,29 +116,27 @@ static void RefreshLoader(int vtx_attr_group) } } s_attr_dirty &= ~(1 << vtx_attr_group); + return g_VertexLoaders[vtx_attr_group]; } void RunVertices(int vtx_attr_group, int primitive, int count) { if (!count) return; - - RefreshLoader(vtx_attr_group); - g_VertexLoaders[vtx_attr_group]->RunVertices(vtx_attr_group, primitive, count); + RefreshLoader(vtx_attr_group)->RunVertices(vtx_attr_group, primitive, count); } -void RunCompiledVertices(int vtx_attr_group, int primitive, int count, u8* Data) +void SkipVertices(int vtx_attr_group, int count) { - if (!count || !Data) + if (!count) return; - RefreshLoader(vtx_attr_group); - g_VertexLoaders[vtx_attr_group]->RunCompiledVertices(vtx_attr_group, primitive, count,Data); + u32 stride = RefreshLoader(vtx_attr_group)->GetVertexSize(); + DataSkip(count * stride); } int GetVertexSize(int vtx_attr_group) { - RefreshLoader(vtx_attr_group); - return g_VertexLoaders[vtx_attr_group]->GetVertexSize(); + return RefreshLoader(vtx_attr_group)->GetVertexSize(); } } // namespace diff --git a/Source/Core/VideoCommon/VertexLoaderManager.h b/Source/Core/VideoCommon/VertexLoaderManager.h index ca795f0d18..c3111db515 100644 --- a/Source/Core/VideoCommon/VertexLoaderManager.h +++ b/Source/Core/VideoCommon/VertexLoaderManager.h @@ -17,7 +17,6 @@ namespace VertexLoaderManager int GetVertexSize(int vtx_attr_group); void RunVertices(int vtx_attr_group, int primitive, int count); - void RunCompiledVertices(int vtx_attr_group, int primitive, int count, u8* Data); // For debugging void AppendListToString(std::string *dest); diff --git a/Source/Core/VideoCommon/VertexManagerBase.cpp b/Source/Core/VideoCommon/VertexManagerBase.cpp index 18a6c81dd6..c4980ae190 100644 --- a/Source/Core/VideoCommon/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/VertexManagerBase.cpp @@ -140,17 +140,6 @@ u32 VertexManager::GetRemainingIndices(int primitive) } } -void VertexManager::AddVertices(int primitive, u32 numVertices) -{ - if (numVertices <= 0) - return; - - ADDSTAT(stats.thisFrame.numPrims, numVertices); - INCSTAT(stats.thisFrame.numPrimitiveJoins); - - IndexGenerator::AddIndices(primitive, numVertices); -} - void VertexManager::Flush() { if (IsFlushed) return; diff --git a/Source/Core/VideoCommon/VertexManagerBase.h b/Source/Core/VideoCommon/VertexManagerBase.h index 1acbfefdf1..83787e57a8 100644 --- a/Source/Core/VideoCommon/VertexManagerBase.h +++ b/Source/Core/VideoCommon/VertexManagerBase.h @@ -32,8 +32,6 @@ public: // needs to be virtual for DX11's dtor virtual ~VertexManager(); - static void AddVertices(int _primitive, u32 _numVertices); - static u8 *s_pCurBufferPointer; static u8 *s_pBaseBufferPointer; static u8 *s_pEndBufferPointer; diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj index d2209410a1..a3bf0a40cf 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj @@ -85,7 +85,6 @@ - @@ -99,7 +98,6 @@ - diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters index 8e29951323..47e58f59bd 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters @@ -120,9 +120,6 @@ Util - - Vertex Loading - Vertex Loading @@ -253,9 +250,6 @@ Vertex Loading - - Vertex Loading - Vertex Loading diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index 12ab0f9b8d..9de5aa5505 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -90,7 +90,6 @@ void VideoConfig::Load(const char *ini_file) iniFile.Get("Enhancements", "Enable3dVision", &b3DVision, false); iniFile.Get("Hacks", "EFBAccessEnable", &bEFBAccessEnable, true); - iniFile.Get("Hacks", "DlistCachingEnable", &bDlistCachingEnable,false); iniFile.Get("Hacks", "EFBCopyEnable", &bEFBCopyEnable, true); iniFile.Get("Hacks", "EFBToTextureEnable", &bCopyEFBToTexture, true); iniFile.Get("Hacks", "EFBScaledCopy", &bCopyEFBScaled, true); @@ -189,7 +188,6 @@ void VideoConfig::GameIniLoad() CHECK_SETTING("Video_Enhancements", "Enable3dVision", b3DVision); CHECK_SETTING("Video_Hacks", "EFBAccessEnable", bEFBAccessEnable); - CHECK_SETTING("Video_Hacks", "DlistCachingEnable", bDlistCachingEnable); CHECK_SETTING("Video_Hacks", "EFBCopyEnable", bEFBCopyEnable); CHECK_SETTING("Video_Hacks", "EFBToTextureEnable", bCopyEFBToTexture); CHECK_SETTING("Video_Hacks", "EFBScaledCopy", bCopyEFBScaled); @@ -269,7 +267,6 @@ void VideoConfig::Save(const char *ini_file) iniFile.Set("Enhancements", "Enable3dVision", b3DVision); iniFile.Set("Hacks", "EFBAccessEnable", bEFBAccessEnable); - iniFile.Set("Hacks", "DlistCachingEnable", bDlistCachingEnable); iniFile.Set("Hacks", "EFBCopyEnable", bEFBCopyEnable); iniFile.Set("Hacks", "EFBToTextureEnable", bCopyEFBToTexture); iniFile.Set("Hacks", "EFBScaledCopy", bCopyEFBScaled); diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h index 9740c96e43..bbd1f6603e 100644 --- a/Source/Core/VideoCommon/VideoConfig.h +++ b/Source/Core/VideoCommon/VideoConfig.h @@ -105,7 +105,6 @@ struct VideoConfig // Hacks bool bEFBAccessEnable; - bool bDlistCachingEnable; bool bPerfQueriesEnable; bool bEFBCopyEnable;