aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Graphics/Graphics3d
diff options
context:
space:
mode:
Diffstat (limited to 'Ryujinx.Graphics/Graphics3d')
-rw-r--r--Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs7
-rw-r--r--Ryujinx.Graphics/Graphics3d/Texture/TextureHelper.cs6
2 files changed, 6 insertions, 7 deletions
diff --git a/Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs b/Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs
index 2e78cf14..62dae00b 100644
--- a/Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs
+++ b/Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs
@@ -1,4 +1,4 @@
-using ChocolArm64.Memory;
+using ARMeilleure.Memory;
using OpenTK.Graphics.OpenGL;
using Ryujinx.Graphics.Gal;
using Ryujinx.Graphics.Memory;
@@ -229,7 +229,7 @@ namespace Ryujinx.Graphics.Texture
public static byte[] ReadTexture(IMemory memory, GalImage image, long position)
{
- MemoryManager cpuMemory;
+ IMemoryManager cpuMemory;
if (memory is NvGpuVmm vmm)
{
@@ -237,7 +237,7 @@ namespace Ryujinx.Graphics.Texture
}
else
{
- cpuMemory = (MemoryManager)memory;
+ cpuMemory = (IMemoryManager)memory;
}
ISwizzle swizzle = TextureHelper.GetSwizzle(image);
@@ -251,7 +251,6 @@ namespace Ryujinx.Graphics.Texture
// Note: Each row of the texture needs to be aligned to 4 bytes.
int pitch = (width * bytesPerPixel + 3) & ~3;
-
int dataLayerSize = height * pitch * depth;
byte[] data = new byte[dataLayerSize * image.LayerCount];
diff --git a/Ryujinx.Graphics/Graphics3d/Texture/TextureHelper.cs b/Ryujinx.Graphics/Graphics3d/Texture/TextureHelper.cs
index 1de81008..22b803db 100644
--- a/Ryujinx.Graphics/Graphics3d/Texture/TextureHelper.cs
+++ b/Ryujinx.Graphics/Graphics3d/Texture/TextureHelper.cs
@@ -1,4 +1,4 @@
-using ChocolArm64.Memory;
+using ARMeilleure.Memory;
using Ryujinx.Common;
using Ryujinx.Graphics.Gal;
using Ryujinx.Graphics.Memory;
@@ -38,7 +38,7 @@ namespace Ryujinx.Graphics.Texture
}
}
- public static (MemoryManager Memory, long Position) GetMemoryAndPosition(
+ public static (IMemoryManager Memory, long Position) GetMemoryAndPosition(
IMemory memory,
long position)
{
@@ -47,7 +47,7 @@ namespace Ryujinx.Graphics.Texture
return (vmm.Memory, vmm.GetPhysicalAddress(position));
}
- return ((MemoryManager)memory, position);
+ return ((IMemoryManager)memory, position);
}
}
}