crafterpika/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-07-03 10:16:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

misc: Replace references to IntPtr/UIntPtr with nint/nuint + code cleanups.

Browse source
This commit is contained in:
Evan Husted 2024-10-26 08:46:41 -05:00
parent a09d314817
commit dfb4854d19
172 changed files with 902 additions and 914 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Ryujinx.Graphics.OpenGL/Image/TextureBuffer.cs
View file

@ -97,7 +97,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
SizedInternalFormat format = (SizedInternalFormat)FormatTable.GetFormatInfo(Info.Format).PixelInternalFormat;
GL.TexBufferRange(TextureBufferTarget.TextureBuffer, format, _buffer.ToInt32(), (IntPtr)buffer.Offset, buffer.Size);
GL.TexBufferRange(TextureBufferTarget.TextureBuffer, format, _buffer.ToInt32(), (nint)buffer.Offset, buffer.Size);
}
public void Dispose()

2
src/Ryujinx.Graphics.OpenGL/Image/TextureCopy.cs
View file

@ -464,7 +464,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
_copyPboSize = requiredSize;
GL.BindBuffer(BufferTarget.PixelPackBuffer, _copyPboHandle);
GL.BufferData(BufferTarget.PixelPackBuffer, requiredSize, IntPtr.Zero, BufferUsageHint.DynamicCopy);
GL.BufferData(BufferTarget.PixelPackBuffer, requiredSize, nint.Zero, BufferUsageHint.DynamicCopy);
}
}

28
src/Ryujinx.Graphics.OpenGL/Image/TextureView.cs
View file

@ -282,7 +282,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
}
else
{
IntPtr target = _renderer.PersistentBuffers.Default.GetHostArray(size);
nint target = _renderer.PersistentBuffers.Default.GetHostArray(size);
WriteTo(target);
@ -307,7 +307,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
}
else
{
IntPtr target = _renderer.PersistentBuffers.Default.GetHostArray(size);
nint target = _renderer.PersistentBuffers.Default.GetHostArray(size);
int offset = WriteTo2D(target, layer, level);
@ -339,15 +339,15 @@ namespace Ryujinx.Graphics.OpenGL.Image
public void WriteToPbo(int offset, bool forceBgra)
{
WriteTo(IntPtr.Zero + offset, forceBgra);
WriteTo(nint.Zero + offset, forceBgra);
}
public int WriteToPbo2D(int offset, int layer, int level)
{
return WriteTo2D(IntPtr.Zero + offset, layer, level);
return WriteTo2D(nint.Zero + offset, layer, level);
}
private int WriteTo2D(IntPtr data, int layer, int level)
private int WriteTo2D(nint data, int layer, int level)
{
TextureTarget target = Target.Convert();
@ -390,7 +390,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
return 0;
}
private void WriteTo(IntPtr data, bool forceBgra = false)
private void WriteTo(nint data, bool forceBgra = false)
{
TextureTarget target = Target.Convert();
@ -457,7 +457,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
var dataSpan = data.Span;
fixed (byte* ptr = dataSpan)
{
ReadFrom((IntPtr)ptr, dataSpan.Length);
ReadFrom((nint)ptr, dataSpan.Length);
}
}
}
@ -474,7 +474,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
int width = Math.Max(Info.Width >> level, 1);
int height = Math.Max(Info.Height >> level, 1);
ReadFrom2D((IntPtr)ptr, layer, level, 0, 0, width, height);
ReadFrom2D((nint)ptr, layer, level, 0, 0, width, height);
}
}
}
@ -492,7 +492,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
fixed (byte* ptr = data.Span)
{
ReadFrom2D(
(IntPtr)ptr,
(nint)ptr,
layer,
level,
region.X,
@ -507,15 +507,15 @@ namespace Ryujinx.Graphics.OpenGL.Image
public void ReadFromPbo(int offset, int size)
{
ReadFrom(IntPtr.Zero + offset, size);
ReadFrom(nint.Zero + offset, size);
}
public void ReadFromPbo2D(int offset, int layer, int level, int width, int height)
{
ReadFrom2D(IntPtr.Zero + offset, layer, level, 0, 0, width, height);
ReadFrom2D(nint.Zero + offset, layer, level, 0, 0, width, height);
}
private void ReadFrom2D(IntPtr data, int layer, int level, int x, int y, int width, int height)
private void ReadFrom2D(nint data, int layer, int level, int x, int y, int width, int height)
{
int mipSize = Info.GetMipSize2D(level);
@ -535,7 +535,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
return data;
}
private void ReadFrom2D(IntPtr data, int layer, int level, int x, int y, int width, int height, int mipSize)
private void ReadFrom2D(nint data, int layer, int level, int x, int y, int width, int height, int mipSize)
{
TextureTarget target = Target.Convert();
@ -694,7 +694,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
}
}
private void ReadFrom(IntPtr data, int size)
private void ReadFrom(nint data, int size)
{
TextureTarget target = Target.Convert();
int baseLevel = 0;