NvServices refactoring (#120)
* Initial implementation of NvMap/NvHostCtrl
* More work on NvHostCtrl
* Refactoring of nvservices, move GPU Vmm, make Vmm per-process, refactor most gpu devices, move Gpu to Core, fix CbBind
* Implement GetGpuTime, support CancelSynchronization, fix issue on InsertWaitingMutex, proper double buffering support (again, not working properly for commercial games, only hb)
* Try to fix perf regression reading/writing textures, moved syncpts and events to a UserCtx class, delete global state when the process exits, other minor tweaks
* Remove now unused code, add comment about probably wrong result codes
2018-05-07 20:53:23 +02:00
|
|
|
using ChocolArm64.Memory;
|
2018-06-09 02:15:56 +02:00
|
|
|
using Ryujinx.Graphics.Gal;
|
2018-06-24 02:39:25 +02:00
|
|
|
using Ryujinx.HLE.Gpu.Memory;
|
2018-04-26 04:11:26 +02:00
|
|
|
using System;
|
|
|
|
|
2018-06-24 02:39:25 +02:00
|
|
|
namespace Ryujinx.HLE.Gpu.Texture
|
2018-04-26 04:11:26 +02:00
|
|
|
{
|
|
|
|
static class TextureHelper
|
|
|
|
{
|
2018-07-19 07:30:21 +02:00
|
|
|
public static ISwizzle GetSwizzle(TextureInfo Texture, int BlockWidth, int Bpp)
|
2018-04-26 04:11:26 +02:00
|
|
|
{
|
2018-07-19 07:30:21 +02:00
|
|
|
int Width = (Texture.Width + (BlockWidth - 1)) / BlockWidth;
|
|
|
|
|
|
|
|
int AlignMask = Texture.TileWidth * (64 / Bpp) - 1;
|
|
|
|
|
|
|
|
Width = (Width + AlignMask) & ~AlignMask;
|
|
|
|
|
2018-04-26 04:11:26 +02:00
|
|
|
switch (Texture.Swizzle)
|
|
|
|
{
|
2018-06-23 07:00:44 +02:00
|
|
|
case TextureSwizzle._1dBuffer:
|
2018-04-26 04:11:26 +02:00
|
|
|
case TextureSwizzle.Pitch:
|
|
|
|
case TextureSwizzle.PitchColorKey:
|
|
|
|
return new LinearSwizzle(Texture.Pitch, Bpp);
|
|
|
|
|
|
|
|
case TextureSwizzle.BlockLinear:
|
|
|
|
case TextureSwizzle.BlockLinearColorKey:
|
|
|
|
return new BlockLinearSwizzle(Width, Bpp, Texture.BlockHeight);
|
|
|
|
}
|
|
|
|
|
|
|
|
throw new NotImplementedException(Texture.Swizzle.ToString());
|
|
|
|
}
|
NvServices refactoring (#120)
* Initial implementation of NvMap/NvHostCtrl
* More work on NvHostCtrl
* Refactoring of nvservices, move GPU Vmm, make Vmm per-process, refactor most gpu devices, move Gpu to Core, fix CbBind
* Implement GetGpuTime, support CancelSynchronization, fix issue on InsertWaitingMutex, proper double buffering support (again, not working properly for commercial games, only hb)
* Try to fix perf regression reading/writing textures, moved syncpts and events to a UserCtx class, delete global state when the process exits, other minor tweaks
* Remove now unused code, add comment about probably wrong result codes
2018-05-07 20:53:23 +02:00
|
|
|
|
2018-06-09 02:15:56 +02:00
|
|
|
public static int GetTextureSize(GalTexture Texture)
|
|
|
|
{
|
|
|
|
switch (Texture.Format)
|
|
|
|
{
|
2018-07-10 04:01:59 +02:00
|
|
|
case GalTextureFormat.R32G32B32A32:
|
|
|
|
return Texture.Width * Texture.Height * 16;
|
|
|
|
|
|
|
|
case GalTextureFormat.R16G16B16A16:
|
|
|
|
return Texture.Width * Texture.Height * 8;
|
|
|
|
|
|
|
|
case GalTextureFormat.A8B8G8R8:
|
2018-07-29 06:41:02 +02:00
|
|
|
case GalTextureFormat.A2B10G10R10:
|
2018-07-10 04:01:59 +02:00
|
|
|
case GalTextureFormat.R32:
|
|
|
|
case GalTextureFormat.ZF32:
|
2018-07-19 01:26:28 +02:00
|
|
|
case GalTextureFormat.BF10GF11RF11:
|
2018-07-19 01:19:37 +02:00
|
|
|
case GalTextureFormat.Z24S8:
|
2018-07-10 04:01:59 +02:00
|
|
|
return Texture.Width * Texture.Height * 4;
|
|
|
|
|
|
|
|
case GalTextureFormat.A1B5G5R5:
|
|
|
|
case GalTextureFormat.B5G6R5:
|
|
|
|
case GalTextureFormat.G8R8:
|
|
|
|
case GalTextureFormat.R16:
|
|
|
|
return Texture.Width * Texture.Height * 2;
|
|
|
|
|
|
|
|
case GalTextureFormat.R8:
|
|
|
|
return Texture.Width * Texture.Height;
|
2018-06-09 02:15:56 +02:00
|
|
|
|
|
|
|
case GalTextureFormat.BC1:
|
|
|
|
case GalTextureFormat.BC4:
|
|
|
|
{
|
2018-07-13 02:27:59 +02:00
|
|
|
return CompressedTextureSize(Texture.Width, Texture.Height, 4, 4, 8);
|
2018-06-09 02:15:56 +02:00
|
|
|
}
|
|
|
|
|
2018-07-16 20:09:34 +02:00
|
|
|
case GalTextureFormat.BC6H_SF16:
|
|
|
|
case GalTextureFormat.BC6H_UF16:
|
2018-06-10 06:00:43 +02:00
|
|
|
case GalTextureFormat.BC7U:
|
2018-06-09 02:15:56 +02:00
|
|
|
case GalTextureFormat.BC2:
|
|
|
|
case GalTextureFormat.BC3:
|
|
|
|
case GalTextureFormat.BC5:
|
|
|
|
case GalTextureFormat.Astc2D4x4:
|
|
|
|
{
|
2018-07-13 02:27:59 +02:00
|
|
|
return CompressedTextureSize(Texture.Width, Texture.Height, 4, 4, 16);
|
|
|
|
}
|
2018-07-14 18:08:39 +02:00
|
|
|
|
2018-07-13 02:27:59 +02:00
|
|
|
case GalTextureFormat.Astc2D5x5:
|
|
|
|
{
|
|
|
|
return CompressedTextureSize(Texture.Width, Texture.Height, 5, 5, 16);
|
|
|
|
}
|
2018-07-14 18:08:39 +02:00
|
|
|
|
2018-07-13 02:27:59 +02:00
|
|
|
case GalTextureFormat.Astc2D6x6:
|
|
|
|
{
|
|
|
|
return CompressedTextureSize(Texture.Width, Texture.Height, 6, 6, 16);
|
|
|
|
}
|
2018-07-14 18:08:39 +02:00
|
|
|
|
2018-07-13 02:27:59 +02:00
|
|
|
case GalTextureFormat.Astc2D8x8:
|
|
|
|
{
|
|
|
|
return CompressedTextureSize(Texture.Width, Texture.Height, 8, 8, 16);
|
|
|
|
}
|
2018-07-14 18:08:39 +02:00
|
|
|
|
2018-07-13 02:27:59 +02:00
|
|
|
case GalTextureFormat.Astc2D10x10:
|
|
|
|
{
|
|
|
|
return CompressedTextureSize(Texture.Width, Texture.Height, 10, 10, 16);
|
|
|
|
}
|
2018-07-14 18:08:39 +02:00
|
|
|
|
2018-07-13 02:27:59 +02:00
|
|
|
case GalTextureFormat.Astc2D12x12:
|
|
|
|
{
|
|
|
|
return CompressedTextureSize(Texture.Width, Texture.Height, 12, 12, 16);
|
|
|
|
}
|
2018-07-14 18:08:39 +02:00
|
|
|
|
2018-07-13 02:27:59 +02:00
|
|
|
case GalTextureFormat.Astc2D5x4:
|
|
|
|
{
|
|
|
|
return CompressedTextureSize(Texture.Width, Texture.Height, 5, 4, 16);
|
|
|
|
}
|
2018-07-14 18:08:39 +02:00
|
|
|
|
2018-07-13 02:27:59 +02:00
|
|
|
case GalTextureFormat.Astc2D6x5:
|
|
|
|
{
|
|
|
|
return CompressedTextureSize(Texture.Width, Texture.Height, 6, 5, 16);
|
|
|
|
}
|
2018-07-14 18:08:39 +02:00
|
|
|
|
2018-07-13 02:27:59 +02:00
|
|
|
case GalTextureFormat.Astc2D8x6:
|
|
|
|
{
|
|
|
|
return CompressedTextureSize(Texture.Width, Texture.Height, 8, 6, 16);
|
|
|
|
}
|
2018-07-14 18:08:39 +02:00
|
|
|
|
2018-07-13 02:27:59 +02:00
|
|
|
case GalTextureFormat.Astc2D10x8:
|
|
|
|
{
|
|
|
|
return CompressedTextureSize(Texture.Width, Texture.Height, 10, 8, 16);
|
|
|
|
}
|
2018-07-14 18:08:39 +02:00
|
|
|
|
2018-07-13 02:27:59 +02:00
|
|
|
case GalTextureFormat.Astc2D12x10:
|
|
|
|
{
|
|
|
|
return CompressedTextureSize(Texture.Width, Texture.Height, 12, 10, 16);
|
|
|
|
}
|
2018-07-14 18:08:39 +02:00
|
|
|
|
2018-07-13 02:27:59 +02:00
|
|
|
case GalTextureFormat.Astc2D8x5:
|
|
|
|
{
|
|
|
|
return CompressedTextureSize(Texture.Width, Texture.Height, 8, 5, 16);
|
|
|
|
}
|
2018-07-14 18:08:39 +02:00
|
|
|
|
2018-07-13 02:27:59 +02:00
|
|
|
case GalTextureFormat.Astc2D10x5:
|
|
|
|
{
|
|
|
|
return CompressedTextureSize(Texture.Width, Texture.Height, 10, 5, 16);
|
|
|
|
}
|
2018-07-14 18:08:39 +02:00
|
|
|
|
2018-07-13 02:27:59 +02:00
|
|
|
case GalTextureFormat.Astc2D10x6:
|
|
|
|
{
|
|
|
|
return CompressedTextureSize(Texture.Width, Texture.Height, 10, 6, 16);
|
2018-06-09 02:15:56 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-17 01:47:36 +02:00
|
|
|
throw new NotImplementedException("0x" + Texture.Format.ToString("x2"));
|
2018-06-09 02:15:56 +02:00
|
|
|
}
|
|
|
|
|
2018-07-13 02:27:59 +02:00
|
|
|
public static int CompressedTextureSize(int TextureWidth, int TextureHeight, int BlockWidth, int BlockHeight, int Bpb)
|
|
|
|
{
|
|
|
|
int W = (TextureWidth + (BlockWidth - 1)) / BlockWidth;
|
|
|
|
int H = (TextureHeight + (BlockHeight - 1)) / BlockHeight;
|
|
|
|
|
|
|
|
return W * H * Bpb;
|
|
|
|
}
|
2018-07-14 18:08:39 +02:00
|
|
|
|
NvServices refactoring (#120)
* Initial implementation of NvMap/NvHostCtrl
* More work on NvHostCtrl
* Refactoring of nvservices, move GPU Vmm, make Vmm per-process, refactor most gpu devices, move Gpu to Core, fix CbBind
* Implement GetGpuTime, support CancelSynchronization, fix issue on InsertWaitingMutex, proper double buffering support (again, not working properly for commercial games, only hb)
* Try to fix perf regression reading/writing textures, moved syncpts and events to a UserCtx class, delete global state when the process exits, other minor tweaks
* Remove now unused code, add comment about probably wrong result codes
2018-05-07 20:53:23 +02:00
|
|
|
public static (AMemory Memory, long Position) GetMemoryAndPosition(
|
|
|
|
IAMemory Memory,
|
|
|
|
long Position)
|
|
|
|
{
|
|
|
|
if (Memory is NvGpuVmm Vmm)
|
|
|
|
{
|
|
|
|
return (Vmm.Memory, Vmm.GetPhysicalAddress(Position));
|
|
|
|
}
|
|
|
|
|
|
|
|
return ((AMemory)Memory, Position);
|
|
|
|
}
|
2018-04-26 04:11:26 +02:00
|
|
|
}
|
|
|
|
}
|