misc: chore: Use explicit types in OpenGL project

This commit is contained in:
Evan Husted 2025-01-25 14:12:37 -06:00
parent 2d1a4c3ce5
commit 58c1ab7989
14 changed files with 65 additions and 63 deletions

View file

@ -19,7 +19,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
if (Avx2.IsSupported)
{
var mask = Vector256.Create(
Vector256<byte> mask = Vector256.Create(
(byte)3, (byte)0, (byte)1, (byte)2,
(byte)7, (byte)4, (byte)5, (byte)6,
(byte)11, (byte)8, (byte)9, (byte)10,
@ -35,7 +35,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
{
for (uint i = 0; i < sizeAligned; i += 32)
{
var dataVec = Avx.LoadVector256(pInput + i);
Vector256<byte> dataVec = Avx.LoadVector256(pInput + i);
dataVec = Avx2.Shuffle(dataVec, mask);
@ -47,7 +47,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
}
else if (Ssse3.IsSupported)
{
var mask = Vector128.Create(
Vector128<byte> mask = Vector128.Create(
(byte)3, (byte)0, (byte)1, (byte)2,
(byte)7, (byte)4, (byte)5, (byte)6,
(byte)11, (byte)8, (byte)9, (byte)10,
@ -59,7 +59,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
{
for (uint i = 0; i < sizeAligned; i += 16)
{
var dataVec = Sse2.LoadVector128(pInput + i);
Vector128<byte> dataVec = Sse2.LoadVector128(pInput + i);
dataVec = Ssse3.Shuffle(dataVec, mask);
@ -70,8 +70,8 @@ namespace Ryujinx.Graphics.OpenGL.Image
start = sizeAligned;
}
var outSpan = MemoryMarshal.Cast<byte, uint>(output);
var dataSpan = MemoryMarshal.Cast<byte, uint>(data);
Span<uint> outSpan = MemoryMarshal.Cast<byte, uint>(output);
ReadOnlySpan<uint> dataSpan = MemoryMarshal.Cast<byte, uint>(data);
for (int i = start / sizeof(uint); i < dataSpan.Length; i++)
{
outSpan[i] = BitOperations.RotateLeft(dataSpan[i], 8);
@ -88,7 +88,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
if (Avx2.IsSupported)
{
var mask = Vector256.Create(
Vector256<byte> mask = Vector256.Create(
(byte)1, (byte)2, (byte)3, (byte)0,
(byte)5, (byte)6, (byte)7, (byte)4,
(byte)9, (byte)10, (byte)11, (byte)8,
@ -104,7 +104,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
{
for (uint i = 0; i < sizeAligned; i += 32)
{
var dataVec = Avx.LoadVector256(pInput + i);
Vector256<byte> dataVec = Avx.LoadVector256(pInput + i);
dataVec = Avx2.Shuffle(dataVec, mask);
@ -116,7 +116,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
}
else if (Ssse3.IsSupported)
{
var mask = Vector128.Create(
Vector128<byte> mask = Vector128.Create(
(byte)1, (byte)2, (byte)3, (byte)0,
(byte)5, (byte)6, (byte)7, (byte)4,
(byte)9, (byte)10, (byte)11, (byte)8,
@ -128,7 +128,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
{
for (uint i = 0; i < sizeAligned; i += 16)
{
var dataVec = Sse2.LoadVector128(pInput + i);
Vector128<byte> dataVec = Sse2.LoadVector128(pInput + i);
dataVec = Ssse3.Shuffle(dataVec, mask);
@ -139,8 +139,8 @@ namespace Ryujinx.Graphics.OpenGL.Image
start = sizeAligned;
}
var outSpan = MemoryMarshal.Cast<byte, uint>(output);
var dataSpan = MemoryMarshal.Cast<byte, uint>(data);
Span<uint> outSpan = MemoryMarshal.Cast<byte, uint>(output);
ReadOnlySpan<uint> dataSpan = MemoryMarshal.Cast<byte, uint>(data);
for (int i = start / sizeof(uint); i < dataSpan.Length; i++)
{
outSpan[i] = BitOperations.RotateRight(dataSpan[i], 8);

View file

@ -57,7 +57,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
/// <inheritdoc/>
public void SetData(MemoryOwner<byte> data)
{
var dataSpan = data.Span;
Span<byte> dataSpan = data.Span;
Buffer.SetData(_buffer, _bufferOffset, dataSpan[..Math.Min(dataSpan.Length, _bufferSize)]);

View file

@ -91,8 +91,8 @@ void main()
int srcComponentsCount = srcBpp / componentSize;
int dstComponentsCount = dstBpp / componentSize;
var srcFormat = GetFormat(componentSize, srcComponentsCount);
var dstFormat = GetFormat(componentSize, dstComponentsCount);
SizedInternalFormat srcFormat = GetFormat(componentSize, srcComponentsCount);
SizedInternalFormat dstFormat = GetFormat(componentSize, dstComponentsCount);
GL.UseProgram(srcBpp < dstBpp
? GetWideningShader(componentSize, srcComponentsCount, dstComponentsCount)

View file

@ -454,7 +454,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
{
unsafe
{
var dataSpan = data.Span;
Span<byte> dataSpan = data.Span;
fixed (byte* ptr = dataSpan)
{
ReadFrom((nint)ptr, dataSpan.Length);