diff options
| author | riperiperi <rhy3756547@hotmail.com> | 2021-03-02 22:30:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-02 19:30:54 -0300 |
| commit | b530f0e1104723b894695b2860cf0f568f24cc9a (patch) | |
| tree | 04f6b7d76d334ddc5c0378f6aa00b98739bc793e /Ryujinx.Graphics.OpenGL/Image/TextureView.cs | |
| parent | 7a90abc03555f41ba7589bc8e1f714839f9e2fed (diff) | |
Texture Cache: "Texture Groups" and "Texture Dependencies" (#2001)
* Initial implementation (3d tex mips broken)
This works rather well for most games, just need to fix 3d texture mips.
* Cleanup
* Address feedback
* Copy Dependencies and various other fixes
* Fix layer/level offset for copy from view<->view.
* Remove dirty flag from dependency
The dirty flag behaviour is not needed - DeferredCopy is all we need.
* Fix tracking mip slices.
* Propagate granularity (fix astral chain)
* Address Feedback pt 1
* Save slice sizes as part of SizeInfo
* Fix nits
* Fix disposing multiple dependencies causing a crash
This list is obviously modified when removing dependencies, so create a copy of it.
Diffstat (limited to 'Ryujinx.Graphics.OpenGL/Image/TextureView.cs')
| -rw-r--r-- | Ryujinx.Graphics.OpenGL/Image/TextureView.cs | 65 |
1 files changed, 23 insertions, 42 deletions
diff --git a/Ryujinx.Graphics.OpenGL/Image/TextureView.cs b/Ryujinx.Graphics.OpenGL/Image/TextureView.cs index 89f74cee..053fb3c2 100644 --- a/Ryujinx.Graphics.OpenGL/Image/TextureView.cs +++ b/Ryujinx.Graphics.OpenGL/Image/TextureView.cs @@ -10,8 +10,6 @@ namespace Ryujinx.Graphics.OpenGL.Image private readonly TextureStorage _parent; - private TextureView _emulatedViewParent; - private TextureView _incompatibleFormatView; public int FirstLayer { get; private set; } @@ -96,37 +94,10 @@ namespace Ryujinx.Graphics.OpenGL.Image public ITexture CreateView(TextureCreateInfo info, int firstLayer, int firstLevel) { - if (Info.IsCompressed == info.IsCompressed) - { - firstLayer += FirstLayer; - firstLevel += FirstLevel; + firstLayer += FirstLayer; + firstLevel += FirstLevel; - return _parent.CreateView(info, firstLayer, firstLevel); - } - else - { - // TODO: Most graphics APIs doesn't support creating a texture view from a compressed format - // with a non-compressed format (or vice-versa), however NVN seems to support it. - // So we emulate that here with a texture copy (see the first CopyTo overload). - // However right now it only does a single copy right after the view is created, - // so it doesn't work for all cases. - TextureView emulatedView = (TextureView)_renderer.CreateTexture(info, ScaleFactor); - - _renderer.TextureCopy.CopyUnscaled( - this, - emulatedView, - 0, - firstLayer, - 0, - firstLevel); - - emulatedView._emulatedViewParent = this; - - emulatedView.FirstLayer = firstLayer; - emulatedView.FirstLevel = firstLevel; - - return emulatedView; - } + return _parent.CreateView(info, firstLayer, firstLevel); } public int GetIncompatibleFormatViewHandle() @@ -163,17 +134,13 @@ namespace Ryujinx.Graphics.OpenGL.Image TextureView destinationView = (TextureView)destination; _renderer.TextureCopy.CopyUnscaled(this, destinationView, 0, firstLayer, 0, firstLevel); + } - if (destinationView._emulatedViewParent != null) - { - _renderer.TextureCopy.CopyUnscaled( - this, - destinationView._emulatedViewParent, - 0, - destinationView.FirstLayer, - 0, - destinationView.FirstLevel); - } + public void CopyTo(ITexture destination, int srcLayer, int dstLayer, int srcLevel, int dstLevel) + { + TextureView destinationView = (TextureView)destination; + + _renderer.TextureCopy.CopyUnscaled(this, destinationView, srcLayer, dstLayer, srcLevel, dstLevel, 1, 1); } public void CopyTo(ITexture destination, Extents2D srcRegion, Extents2D dstRegion, bool linearFilter) @@ -308,6 +275,20 @@ namespace Ryujinx.Graphics.OpenGL.Image } } + public void SetData(ReadOnlySpan<byte> data, int layer, int level) + { + unsafe + { + fixed (byte* ptr = data) + { + int width = Math.Max(Info.Width >> level, 1); + int height = Math.Max(Info.Height >> level, 1); + + ReadFrom2D((IntPtr)ptr, layer, level, width, height); + } + } + } + public void ReadFromPbo(int offset, int size) { ReadFrom(IntPtr.Zero + offset, size); |
