diff options
Diffstat (limited to 'Ryujinx.Graphics.Gpu/Image')
| -rw-r--r-- | Ryujinx.Graphics.Gpu/Image/Texture.cs | 12 | ||||
| -rw-r--r-- | Ryujinx.Graphics.Gpu/Image/TextureManager.cs | 26 |
2 files changed, 2 insertions, 36 deletions
diff --git a/Ryujinx.Graphics.Gpu/Image/Texture.cs b/Ryujinx.Graphics.Gpu/Image/Texture.cs index 28ad3f77..120abe3f 100644 --- a/Ryujinx.Graphics.Gpu/Image/Texture.cs +++ b/Ryujinx.Graphics.Gpu/Image/Texture.cs @@ -335,18 +335,6 @@ namespace Ryujinx.Graphics.Gpu.Image return true; } - if (_info.FormatInfo.Format == Format.R8G8B8A8Srgb && - info.FormatInfo.Format == Format.R8G8B8A8Unorm && !strict) - { - return true; - } - - if (_info.FormatInfo.Format == Format.R8G8B8A8Unorm && - info.FormatInfo.Format == Format.R8G8B8A8Srgb && !strict) - { - return true; - } - return _info.FormatInfo.Format == info.FormatInfo.Format; } diff --git a/Ryujinx.Graphics.Gpu/Image/TextureManager.cs b/Ryujinx.Graphics.Gpu/Image/TextureManager.cs index 045c2ed9..413ba327 100644 --- a/Ryujinx.Graphics.Gpu/Image/TextureManager.cs +++ b/Ryujinx.Graphics.Gpu/Image/TextureManager.cs @@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.Gpu.Image private ITexture[] _rtHostColors; private ITexture _rtHostDs; - private ConcurrentRangeList<Texture> _textures; + private RangeList<Texture> _textures; private AutoDeleteCache _cache; @@ -39,7 +39,7 @@ namespace Ryujinx.Graphics.Gpu.Image _rtHostColors = new ITexture[Constants.TotalRenderTargets]; - _textures = new ConcurrentRangeList<Texture>(); + _textures = new RangeList<Texture>(); _cache = new AutoDeleteCache(); } @@ -561,28 +561,6 @@ namespace Ryujinx.Graphics.Gpu.Image info.SwizzleA); } - public Texture Find2(ulong address) - { - Texture[] ts = _textures.FindOverlaps(address, 1); - - if (ts.Length == 2) - { - return ts[1]; - } - - if (ts.Length == 0) - { - ts = _textures.FindOverlaps(address - 1, 2); - } - - if (ts.Length == 0) - { - return null; - } - - return ts[0]; - } - public void Flush() { foreach (Texture texture in _cache) |