mirror of
https://git.naxdy.org/Mirror/Ryujinx.git
synced 2024-11-16 10:05:25 +00:00
884b4e5fd3
* Initial non 2D textures support - Shaders still need to be changed - Some types aren't yet implemented * Start implementing texture instructions suffixes Fix wrong texture type with cube and TEXS Also support array textures in TEX and TEX.B Clean up TEX and TEXS coords managment Fix TEXS.LL with non-2d textures Implement TEX.AOFFI Get the right arguments for TEX, TEXS and TLDS Also, store suffix operands in appropriate values to support multiple suffix combinaisons * Support depth in read/writeTexture Also support WrapR and detect mipmap * Proper cube map textures support + fix TEXS.LZ * Implement depth compare * some code clean up * Implement CubeMap textures in OGLTexture.Create * Implement TLD4 and TLD4S * Add Texture 1D support * updates comments * fix some code style issues * Fix some nits + rename some things to be less confusing * Remove GetSuffix local functions * AOFFI => AOffI * TextureType => GalTextureTarget * finish renaming TextureType to TextureTarget * Disable LL, LZ and LB support in the decompiler This needs more work at the GL level (GLSL implementation should be right) * Revert "Disable LL, LZ and LB support in the decompiler" This reverts commit 64536c3d9f673645faff3152838d1413c3203395. * Fix TEXS ARRAY_2D index * ImageFormat depth should be 1 for all image format * Fix shader build issues with sampler1DShadow and texture * Fix DC & AOFFI combinaison with TEX/TEXS * Support AOFFI with TLD4 and TLD4S * Fix shader compilation error for TLD4.AOFFI with no DC * Fix binding isuses on the 2d copy engine TODO: support 2d array copy * Support 2D array copy operation in the 2D engine This make every copy right in the GPU side. Thie CPU copy probably needs to be updated * Implement GetGpuSize + fix somes issues with 2d engine copies TODO: mipmap level in it * Don't throw an exception in the layer handling * Fix because of rebase * Reject 2d layers of non textures in 2d copy engine * Add 3D textures and mipmap support on BlockLinearSwizzle * Fix naming on new BitUtils methods * gpu cache: Make sure to invalidate textures that doesn't have the same target * Add the concept of layer count for array instead of using depth Also cleanup GetGpuSize as Swizzle can compute the size with mipmap * Support multi layer with mip map in ReadTexture * Add more check for cache invalidation & remove cubemap and cubemap array code for now Also fix compressed 2d array * Fix texelFetchOffset shader build error * Start looking into cube map again Also add some way to log write in register in engines * fix write register log levles * Remove debug logs in WriteRegister * Disable AOFFI support on non NVIDIA drivers * Fix code align
172 lines
5 KiB
C#
172 lines
5 KiB
C#
using Ryujinx.Common.Logging;
|
|
using Ryujinx.Graphics.Gal;
|
|
using Ryujinx.Graphics.Memory;
|
|
using Ryujinx.Graphics.Texture;
|
|
using System;
|
|
using System.Collections.Generic;
|
|
|
|
namespace Ryujinx.Graphics
|
|
{
|
|
public class GpuResourceManager
|
|
{
|
|
private enum ImageType
|
|
{
|
|
None,
|
|
Texture,
|
|
TextureArrayLayer,
|
|
ColorBuffer,
|
|
ZetaBuffer
|
|
}
|
|
|
|
private NvGpu Gpu;
|
|
|
|
private HashSet<long>[] UploadedKeys;
|
|
|
|
private Dictionary<long, ImageType> ImageTypes;
|
|
private Dictionary<long, int> MirroredTextures;
|
|
|
|
public GpuResourceManager(NvGpu Gpu)
|
|
{
|
|
this.Gpu = Gpu;
|
|
|
|
UploadedKeys = new HashSet<long>[(int)NvGpuBufferType.Count];
|
|
|
|
for (int Index = 0; Index < UploadedKeys.Length; Index++)
|
|
{
|
|
UploadedKeys[Index] = new HashSet<long>();
|
|
}
|
|
|
|
ImageTypes = new Dictionary<long, ImageType>();
|
|
MirroredTextures = new Dictionary<long, int>();
|
|
}
|
|
|
|
public void SendColorBuffer(NvGpuVmm Vmm, long Position, int Attachment, GalImage NewImage)
|
|
{
|
|
long Size = (uint)ImageUtils.GetSize(NewImage);
|
|
|
|
ImageTypes[Position] = ImageType.ColorBuffer;
|
|
|
|
if (!TryReuse(Vmm, Position, NewImage))
|
|
{
|
|
Gpu.Renderer.Texture.Create(Position, (int)Size, NewImage);
|
|
}
|
|
|
|
Gpu.Renderer.RenderTarget.BindColor(Position, Attachment);
|
|
}
|
|
|
|
public void SendZetaBuffer(NvGpuVmm Vmm, long Position, GalImage NewImage)
|
|
{
|
|
long Size = (uint)ImageUtils.GetSize(NewImage);
|
|
|
|
ImageTypes[Position] = ImageType.ZetaBuffer;
|
|
|
|
if (!TryReuse(Vmm, Position, NewImage))
|
|
{
|
|
Gpu.Renderer.Texture.Create(Position, (int)Size, NewImage);
|
|
}
|
|
|
|
Gpu.Renderer.RenderTarget.BindZeta(Position);
|
|
}
|
|
|
|
public void SendTexture(NvGpuVmm Vmm, long Position, GalImage NewImage)
|
|
{
|
|
PrepareSendTexture(Vmm, Position, NewImage);
|
|
|
|
ImageTypes[Position] = ImageType.Texture;
|
|
}
|
|
|
|
public bool TryGetTextureLayer(long Position, out int LayerIndex)
|
|
{
|
|
if (MirroredTextures.TryGetValue(Position, out LayerIndex))
|
|
{
|
|
ImageType Type = ImageTypes[Position];
|
|
|
|
// FIXME(thog): I'm actually unsure if we should deny all other image type, gpu testing needs to be done here.
|
|
if (Type != ImageType.Texture && Type != ImageType.TextureArrayLayer)
|
|
{
|
|
LayerIndex = -1;
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
LayerIndex = -1;
|
|
return false;
|
|
}
|
|
|
|
public void SetTextureArrayLayer(long Position, int LayerIndex)
|
|
{
|
|
ImageTypes[Position] = ImageType.TextureArrayLayer;
|
|
MirroredTextures[Position] = LayerIndex;
|
|
}
|
|
|
|
private void PrepareSendTexture(NvGpuVmm Vmm, long Position, GalImage NewImage)
|
|
{
|
|
long Size = ImageUtils.GetSize(NewImage);
|
|
|
|
bool SkipCheck = false;
|
|
|
|
if (ImageTypes.TryGetValue(Position, out ImageType OldType))
|
|
{
|
|
if (OldType == ImageType.ColorBuffer || OldType == ImageType.ZetaBuffer)
|
|
{
|
|
//Avoid data destruction
|
|
MemoryRegionModified(Vmm, Position, Size, NvGpuBufferType.Texture);
|
|
|
|
SkipCheck = true;
|
|
}
|
|
}
|
|
|
|
if (SkipCheck || !MemoryRegionModified(Vmm, Position, Size, NvGpuBufferType.Texture))
|
|
{
|
|
if (TryReuse(Vmm, Position, NewImage))
|
|
{
|
|
return;
|
|
}
|
|
}
|
|
|
|
byte[] Data = ImageUtils.ReadTexture(Vmm, NewImage, Position);
|
|
|
|
Gpu.Renderer.Texture.Create(Position, Data, NewImage);
|
|
}
|
|
|
|
private bool TryReuse(NvGpuVmm Vmm, long Position, GalImage NewImage)
|
|
{
|
|
if (Gpu.Renderer.Texture.TryGetImage(Position, out GalImage CachedImage) && CachedImage.TextureTarget == NewImage.TextureTarget && CachedImage.SizeMatches(NewImage))
|
|
{
|
|
Gpu.Renderer.RenderTarget.Reinterpret(Position, NewImage);
|
|
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
public bool MemoryRegionModified(NvGpuVmm Vmm, long Position, long Size, NvGpuBufferType Type)
|
|
{
|
|
HashSet<long> Uploaded = UploadedKeys[(int)Type];
|
|
|
|
if (!Uploaded.Add(Position))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
return Vmm.IsRegionModified(Position, Size, Type);
|
|
}
|
|
|
|
public void ClearPbCache()
|
|
{
|
|
for (int Index = 0; Index < UploadedKeys.Length; Index++)
|
|
{
|
|
UploadedKeys[Index].Clear();
|
|
}
|
|
}
|
|
|
|
public void ClearPbCache(NvGpuBufferType Type)
|
|
{
|
|
UploadedKeys[(int)Type].Clear();
|
|
}
|
|
}
|
|
}
|