mirror of
https://github.com/ryujinx-mirror/ryujinx.git
synced 2024-12-23 07:25:45 +00:00
General improvements for GpuResourceManager (#421)
* General improvements to GpuResourceManager * Address feedback * Address feedback
This commit is contained in:
parent
e04221b293
commit
bed13f2022
3 changed files with 72 additions and 66 deletions
|
@ -35,7 +35,5 @@ namespace Ryujinx.Graphics.Gal
|
||||||
int DstY1);
|
int DstY1);
|
||||||
|
|
||||||
void Reinterpret(long Key, GalImage NewImage);
|
void Reinterpret(long Key, GalImage NewImage);
|
||||||
|
|
||||||
byte[] GetData(long Key);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -56,6 +56,8 @@ namespace Ryujinx.Graphics.Gal.OpenGL
|
||||||
private int DepthAttachment;
|
private int DepthAttachment;
|
||||||
private int StencilAttachment;
|
private int StencilAttachment;
|
||||||
|
|
||||||
|
private int CopyPBO;
|
||||||
|
|
||||||
public OGLRenderTarget(OGLTexture Texture)
|
public OGLRenderTarget(OGLTexture Texture)
|
||||||
{
|
{
|
||||||
ColorAttachments = new int[8];
|
ColorAttachments = new int[8];
|
||||||
|
@ -358,45 +360,33 @@ namespace Ryujinx.Graphics.Gal.OpenGL
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
byte[] Data = GetData(Key);
|
if (CopyPBO == 0)
|
||||||
|
{
|
||||||
|
CopyPBO = GL.GenBuffer();
|
||||||
|
}
|
||||||
|
|
||||||
GL.PixelStore(PixelStoreParameter.UnpackRowLength, OldImage.Width);
|
GL.BindBuffer(BufferTarget.PixelPackBuffer, CopyPBO);
|
||||||
|
|
||||||
Texture.Create(Key, Data, NewImage);
|
GL.BufferData(BufferTarget.PixelPackBuffer, Math.Max(ImageUtils.GetSize(OldImage), ImageUtils.GetSize(NewImage)), IntPtr.Zero, BufferUsageHint.StreamCopy);
|
||||||
|
|
||||||
GL.PixelStore(PixelStoreParameter.UnpackRowLength, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
public byte[] GetData(long Key)
|
|
||||||
{
|
|
||||||
if (!Texture.TryGetImageHandler(Key, out ImageHandler CachedImage))
|
if (!Texture.TryGetImageHandler(Key, out ImageHandler CachedImage))
|
||||||
{
|
{
|
||||||
return null;
|
throw new InvalidOperationException();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (SrcFb == 0)
|
|
||||||
{
|
|
||||||
SrcFb = GL.GenFramebuffer();
|
|
||||||
}
|
|
||||||
|
|
||||||
GL.BindFramebuffer(FramebufferTarget.ReadFramebuffer, SrcFb);
|
|
||||||
|
|
||||||
FramebufferAttachment Attachment = GetAttachment(CachedImage);
|
|
||||||
|
|
||||||
GL.FramebufferTexture(FramebufferTarget.ReadFramebuffer, Attachment, CachedImage.Handle, 0);
|
|
||||||
|
|
||||||
int Size = ImageUtils.GetSize(CachedImage.Image);
|
|
||||||
|
|
||||||
byte[] Data = new byte[Size];
|
|
||||||
|
|
||||||
int Width = CachedImage.Width;
|
|
||||||
int Height = CachedImage.Height;
|
|
||||||
|
|
||||||
(_, PixelFormat Format, PixelType Type) = OGLEnumConverter.GetImageFormat(CachedImage.Format);
|
(_, PixelFormat Format, PixelType Type) = OGLEnumConverter.GetImageFormat(CachedImage.Format);
|
||||||
|
|
||||||
GL.ReadPixels(0, 0, Width, Height, Format, Type, Data);
|
GL.BindTexture(TextureTarget.Texture2D, CachedImage.Handle);
|
||||||
|
|
||||||
return Data;
|
GL.GetTexImage(TextureTarget.Texture2D, 0, Format, Type, IntPtr.Zero);
|
||||||
|
|
||||||
|
GL.BindBuffer(BufferTarget.PixelPackBuffer, 0);
|
||||||
|
|
||||||
|
GL.BindBuffer(BufferTarget.PixelUnpackBuffer, CopyPBO);
|
||||||
|
|
||||||
|
Texture.Create(Key, ImageUtils.GetSize(NewImage), NewImage);
|
||||||
|
|
||||||
|
GL.BindBuffer(BufferTarget.PixelUnpackBuffer, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static FramebufferAttachment GetAttachment(ImageHandler CachedImage)
|
private static FramebufferAttachment GetAttachment(ImageHandler CachedImage)
|
||||||
|
|
|
@ -7,10 +7,20 @@ namespace Ryujinx.Graphics
|
||||||
{
|
{
|
||||||
public class GpuResourceManager
|
public class GpuResourceManager
|
||||||
{
|
{
|
||||||
|
private enum ImageType
|
||||||
|
{
|
||||||
|
None,
|
||||||
|
Texture,
|
||||||
|
ColorBuffer,
|
||||||
|
ZetaBuffer
|
||||||
|
}
|
||||||
|
|
||||||
private NvGpu Gpu;
|
private NvGpu Gpu;
|
||||||
|
|
||||||
private HashSet<long>[] UploadedKeys;
|
private HashSet<long>[] UploadedKeys;
|
||||||
|
|
||||||
|
private Dictionary<long, ImageType> ImageTypes;
|
||||||
|
|
||||||
public GpuResourceManager(NvGpu Gpu)
|
public GpuResourceManager(NvGpu Gpu)
|
||||||
{
|
{
|
||||||
this.Gpu = Gpu;
|
this.Gpu = Gpu;
|
||||||
|
@ -21,26 +31,21 @@ namespace Ryujinx.Graphics
|
||||||
{
|
{
|
||||||
UploadedKeys[Index] = new HashSet<long>();
|
UploadedKeys[Index] = new HashSet<long>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ImageTypes = new Dictionary<long, ImageType>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SendColorBuffer(NvGpuVmm Vmm, long Position, int Attachment, GalImage NewImage)
|
public void SendColorBuffer(NvGpuVmm Vmm, long Position, int Attachment, GalImage NewImage)
|
||||||
{
|
{
|
||||||
long Size = (uint)ImageUtils.GetSize(NewImage);
|
long Size = (uint)ImageUtils.GetSize(NewImage);
|
||||||
|
|
||||||
MarkAsCached(Vmm, Position, Size, NvGpuBufferType.Texture);
|
ImageTypes[Position] = ImageType.ColorBuffer;
|
||||||
|
|
||||||
bool IsCached = Gpu.Renderer.Texture.TryGetImage(Position, out GalImage CachedImage);
|
if (!TryReuse(Vmm, Position, NewImage))
|
||||||
|
|
||||||
if (IsCached && CachedImage.SizeMatches(NewImage))
|
|
||||||
{
|
{
|
||||||
Gpu.Renderer.RenderTarget.Reinterpret(Position, NewImage);
|
Gpu.Renderer.Texture.Create(Position, (int)Size, NewImage);
|
||||||
Gpu.Renderer.RenderTarget.BindColor(Position, Attachment, NewImage);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Gpu.Renderer.Texture.Create(Position, (int)Size, NewImage);
|
|
||||||
|
|
||||||
Gpu.Renderer.RenderTarget.BindColor(Position, Attachment, NewImage);
|
Gpu.Renderer.RenderTarget.BindColor(Position, Attachment, NewImage);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48,38 +53,49 @@ namespace Ryujinx.Graphics
|
||||||
{
|
{
|
||||||
long Size = (uint)ImageUtils.GetSize(NewImage);
|
long Size = (uint)ImageUtils.GetSize(NewImage);
|
||||||
|
|
||||||
MarkAsCached(Vmm, Position, Size, NvGpuBufferType.Texture);
|
ImageTypes[Position] = ImageType.ZetaBuffer;
|
||||||
|
|
||||||
bool IsCached = Gpu.Renderer.Texture.TryGetImage(Position, out GalImage CachedImage);
|
if (!TryReuse(Vmm, Position, NewImage))
|
||||||
|
|
||||||
if (IsCached && CachedImage.SizeMatches(NewImage))
|
|
||||||
{
|
{
|
||||||
Gpu.Renderer.RenderTarget.Reinterpret(Position, NewImage);
|
Gpu.Renderer.Texture.Create(Position, (int)Size, NewImage);
|
||||||
Gpu.Renderer.RenderTarget.BindZeta(Position, NewImage);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Gpu.Renderer.Texture.Create(Position, (int)Size, NewImage);
|
|
||||||
|
|
||||||
Gpu.Renderer.RenderTarget.BindZeta(Position, NewImage);
|
Gpu.Renderer.RenderTarget.BindZeta(Position, NewImage);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SendTexture(NvGpuVmm Vmm, long Position, GalImage NewImage, int TexIndex = -1)
|
public void SendTexture(NvGpuVmm Vmm, long Position, GalImage NewImage, int TexIndex = -1)
|
||||||
{
|
{
|
||||||
long Size = (uint)ImageUtils.GetSize(NewImage);
|
PrepareSendTexture(Vmm, Position, NewImage);
|
||||||
|
|
||||||
if (!MemoryRegionModified(Vmm, Position, Size, NvGpuBufferType.Texture))
|
if (TexIndex >= 0)
|
||||||
{
|
{
|
||||||
if (Gpu.Renderer.Texture.TryGetImage(Position, out GalImage CachedImage) && CachedImage.SizeMatches(NewImage))
|
Gpu.Renderer.Texture.Bind(Position, TexIndex, NewImage);
|
||||||
|
}
|
||||||
|
|
||||||
|
ImageTypes[Position] = ImageType.Texture;
|
||||||
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
{
|
{
|
||||||
Gpu.Renderer.RenderTarget.Reinterpret(Position, NewImage);
|
//Avoid data destruction
|
||||||
|
MemoryRegionModified(Vmm, Position, Size, NvGpuBufferType.Texture);
|
||||||
|
|
||||||
if (TexIndex >= 0)
|
SkipCheck = true;
|
||||||
{
|
}
|
||||||
Gpu.Renderer.Texture.Bind(Position, TexIndex, NewImage);
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
if (SkipCheck || !MemoryRegionModified(Vmm, Position, Size, NvGpuBufferType.Texture))
|
||||||
|
{
|
||||||
|
if (TryReuse(Vmm, Position, NewImage))
|
||||||
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -87,16 +103,18 @@ namespace Ryujinx.Graphics
|
||||||
byte[] Data = ImageUtils.ReadTexture(Vmm, NewImage, Position);
|
byte[] Data = ImageUtils.ReadTexture(Vmm, NewImage, Position);
|
||||||
|
|
||||||
Gpu.Renderer.Texture.Create(Position, Data, NewImage);
|
Gpu.Renderer.Texture.Create(Position, Data, NewImage);
|
||||||
|
|
||||||
if (TexIndex >= 0)
|
|
||||||
{
|
|
||||||
Gpu.Renderer.Texture.Bind(Position, TexIndex, NewImage);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void MarkAsCached(NvGpuVmm Vmm, long Position, long Size, NvGpuBufferType Type)
|
private bool TryReuse(NvGpuVmm Vmm, long Position, GalImage NewImage)
|
||||||
{
|
{
|
||||||
Vmm.IsRegionModified(Position, Size, Type);
|
if (Gpu.Renderer.Texture.TryGetImage(Position, out GalImage CachedImage) && CachedImage.SizeMatches(NewImage))
|
||||||
|
{
|
||||||
|
Gpu.Renderer.RenderTarget.Reinterpret(Position, NewImage);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool MemoryRegionModified(NvGpuVmm Vmm, long Position, long Size, NvGpuBufferType Type)
|
private bool MemoryRegionModified(NvGpuVmm Vmm, long Position, long Size, NvGpuBufferType Type)
|
||||||
|
|
Loading…
Reference in a new issue