crafterpika/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-06-29 04:26:24 +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

32
src/Ryujinx.Graphics.OpenGL/Pipeline.cs
View file

@ -23,7 +23,7 @@ namespace Ryujinx.Graphics.OpenGL
private VertexArray _vertexArray;
private Framebuffer _framebuffer;
private IntPtr _indexBaseOffset;
private nint _indexBaseOffset;
private DrawElementsType _elementsType;
@ -358,7 +358,7 @@ namespace Ryujinx.Graphics.OpenGL
break;
}
IntPtr indexBaseOffset = _indexBaseOffset + firstIndex * indexElemSize;
nint indexBaseOffset = _indexBaseOffset + firstIndex * indexElemSize;
if (_primitiveType == PrimitiveType.Quads && !HwCapabilities.SupportsQuads)
{
@ -396,7 +396,7 @@ namespace Ryujinx.Graphics.OpenGL
private void DrawQuadsIndexedImpl(
int indexCount,
int instanceCount,
IntPtr indexBaseOffset,
nint indexBaseOffset,
int indexElemSize,
int firstVertex,
int firstInstance)
@ -447,7 +447,7 @@ namespace Ryujinx.Graphics.OpenGL
}
else
{
IntPtr[] indices = new IntPtr[quadsCount];
nint[] indices = new nint[quadsCount];
int[] counts = new int[quadsCount];
@ -475,7 +475,7 @@ namespace Ryujinx.Graphics.OpenGL
private void DrawQuadStripIndexedImpl(
int indexCount,
int instanceCount,
IntPtr indexBaseOffset,
nint indexBaseOffset,
int indexElemSize,
int firstVertex,
int firstInstance)
@ -483,7 +483,7 @@ namespace Ryujinx.Graphics.OpenGL
// TODO: Instanced rendering.
int quadsCount = (indexCount - 2) / 2;
IntPtr[] indices = new IntPtr[quadsCount];
nint[] indices = new nint[quadsCount];
int[] counts = new int[quadsCount];
@ -516,7 +516,7 @@ namespace Ryujinx.Graphics.OpenGL
private void DrawIndexedImpl(
int indexCount,
int instanceCount,
IntPtr indexBaseOffset,
nint indexBaseOffset,
int firstVertex,
int firstInstance)
{
@ -589,7 +589,7 @@ namespace Ryujinx.Graphics.OpenGL
GL.BindBuffer((BufferTarget)All.DrawIndirectBuffer, indirectBuffer.Handle.ToInt32());
GL.DrawElementsIndirect(_primitiveType, _elementsType, (IntPtr)indirectBuffer.Offset);
GL.DrawElementsIndirect(_primitiveType, _elementsType, (nint)indirectBuffer.Offset);
_vertexArray.RestoreIndexBuffer();
@ -614,8 +614,8 @@ namespace Ryujinx.Graphics.OpenGL
GL.MultiDrawElementsIndirectCount(
_primitiveType,
(All)_elementsType,
(IntPtr)indirectBuffer.Offset,
(IntPtr)parameterBuffer.Offset,
(nint)indirectBuffer.Offset,
(nint)parameterBuffer.Offset,
maxDrawCount,
stride);
@ -636,7 +636,7 @@ namespace Ryujinx.Graphics.OpenGL
GL.BindBuffer((BufferTarget)All.DrawIndirectBuffer, indirectBuffer.Handle.ToInt32());
GL.DrawArraysIndirect(_primitiveType, (IntPtr)indirectBuffer.Offset);
GL.DrawArraysIndirect(_primitiveType, (nint)indirectBuffer.Offset);
PostDraw();
}
@ -656,8 +656,8 @@ namespace Ryujinx.Graphics.OpenGL
GL.MultiDrawArraysIndirectCount(
_primitiveType,
(IntPtr)indirectBuffer.Offset,
(IntPtr)parameterBuffer.Offset,
(nint)indirectBuffer.Offset,
(nint)parameterBuffer.Offset,
maxDrawCount,
stride);
@ -972,7 +972,7 @@ namespace Ryujinx.Graphics.OpenGL
{
_elementsType = type.Convert();
_indexBaseOffset = (IntPtr)buffer.Offset;
_indexBaseOffset = (nint)buffer.Offset;
EnsureVertexArray();
@ -1450,11 +1450,11 @@ namespace Ryujinx.Graphics.OpenGL
if (buffer.Handle == BufferHandle.Null)
{
GL.BindBufferRange(target, assignment.Binding, 0, IntPtr.Zero, 0);
GL.BindBufferRange(target, assignment.Binding, 0, nint.Zero, 0);
continue;
}
GL.BindBufferRange(target, assignment.Binding, buffer.Handle.ToInt32(), (IntPtr)buffer.Offset, buffer.Size);
GL.BindBufferRange(target, assignment.Binding, buffer.Handle.ToInt32(), (nint)buffer.Offset, buffer.Size);
}
}