emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

Move GPU emulation from Ryujinx.HLE to Ryujinx.Graphics and misc changes (#402)

Browse source 
* Move GPU LLE emulation from HLE to Graphics

* Graphics: Move Gal/Texture to Texture

* Remove Engines/ directory and namespace

* Use tables for image formats

* Abstract OpCode decoding

* Simplify image table

* Do not leak Read* symbols in TextureReader

* Fixups

* Rename IGalFrameBuffer -> IGalRenderTarget

* Remove MaxBpp hardcoded value

* Change yet again texture data and add G8R8 flipping

* Rename GalFrameBufferFormat to GalSurfaceFormat

* Unident EnsureSetup in ImageHandler

* Add IsCompressed

* Address some feedback
This commit is contained in:
ReinUsesLisp 2018-09-08 14:51:50 -03:00 committed by gdkchan
parent a0c78f7920
commit ce1d5be212
58 changed files with 3378 additions and 3448 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx.Graphics/Gal/GalFrameBufferFormat.cs
View file

@ -1,6 +1,6 @@
namespace Ryujinx.Graphics.Gal namespace Ryujinx.Graphics.Gal
{ {
public enum GalFrameBufferFormat public enum GalSurfaceFormat
{ {
Bitmap = 0x1c, Bitmap = 0x1c,
Unknown1D = 0x1d, Unknown1D = 0x1d,

275
Ryujinx.Graphics/Gal/GalImageFormat.cs
View file

@ -1,204 +1,93 @@
namespace Ryujinx.Graphics.Gal using System;
namespace Ryujinx.Graphics.Gal
{ {
//These are Vulkan-based enumerations, do not take them as Tegra values [Flags]
public enum GalImageFormat public enum GalImageFormat
{ {
Undefined = 0, Snorm = 1 << 27,
Unorm = 1 << 28,
Sint = 1 << 29,
Uint = 1 << 30,
Sfloat = 1 << 31,
R4G4_UNORM_PACK8 = 1, TypeMask = Snorm | Unorm | Sint | Uint | Sfloat,
R4G4B4A4_UNORM_PACK16 = 2,
B4G4R4A4_UNORM_PACK16 = 3,
R5G6B5_UNORM_PACK16 = 4,
B5G6R5_UNORM_PACK16 = 5,
R5G5B5A1_UNORM_PACK16 = 6,
B5G5R5A1_UNORM_PACK16 = 7,
A1R5G5B5_UNORM_PACK16 = 8,
R8_UNORM = 9,
R8_SNORM = 10,
R8_USCALED = 11,
R8_SSCALED = 12,
R8_UINT = 13,
R8_SINT = 14,
R8_SRGB = 15,
R8G8_UNORM = 16,
R8G8_SNORM = 17,
R8G8_USCALED = 18,
R8G8_SSCALED = 19,
R8G8_UINT = 20,
R8G8_SINT = 21,
R8G8_SRGB = 22,
R8G8B8_UNORM = 23,
R8G8B8_SNORM = 24,
R8G8B8_USCALED = 25,
R8G8B8_SSCALED = 26,
R8G8B8_UINT = 27,
R8G8B8_SINT = 28,
R8G8B8_SRGB = 29,
B8G8R8_UNORM = 30,
B8G8R8_SNORM = 31,
B8G8R8_USCALED = 32,
B8G8R8_SSCALED = 33,
B8G8R8_UINT = 34,
B8G8R8_SINT = 35,
B8G8R8_SRGB = 36,
R8G8B8A8_UNORM = 37,
R8G8B8A8_SNORM = 38,
R8G8B8A8_USCALED = 39,
R8G8B8A8_SSCALED = 40,
R8G8B8A8_UINT = 41,
R8G8B8A8_SINT = 42,
R8G8B8A8_SRGB = 43,
B8G8R8A8_UNORM = 44,
B8G8R8A8_SNORM = 45,
B8G8R8A8_USCALED = 46,
B8G8R8A8_SSCALED = 47,
B8G8R8A8_UINT = 48,
B8G8R8A8_SINT = 49,
B8G8R8A8_SRGB = 50,
A8B8G8R8_UNORM_PACK32 = 51,
A8B8G8R8_SNORM_PACK32 = 52,
A8B8G8R8_USCALED_PACK32 = 53,
A8B8G8R8_SSCALED_PACK32 = 54,
A8B8G8R8_UINT_PACK32 = 55,
A8B8G8R8_SINT_PACK32 = 56,
A8B8G8R8_SRGB_PACK32 = 57,
A2R10G10B10_UNORM_PACK32 = 58,
A2R10G10B10_SNORM_PACK32 = 59,
A2R10G10B10_USCALED_PACK32 = 60,
A2R10G10B10_SSCALED_PACK32 = 61,
A2R10G10B10_UINT_PACK32 = 62,
A2R10G10B10_SINT_PACK32 = 63,
A2B10G10R10_UNORM_PACK32 = 64,
A2B10G10R10_SNORM_PACK32 = 65,
A2B10G10R10_USCALED_PACK32 = 66,
A2B10G10R10_SSCALED_PACK32 = 67,
A2B10G10R10_UINT_PACK32 = 68,
A2B10G10R10_SINT_PACK32 = 69,
R16_UNORM = 70,
R16_SNORM = 71,
R16_USCALED = 72,
R16_SSCALED = 73,
R16_UINT = 74,
R16_SINT = 75,
R16_SFLOAT = 76,
R16G16_UNORM = 77,
R16G16_SNORM = 78,
R16G16_USCALED = 79,
R16G16_SSCALED = 80,
R16G16_UINT = 81,
R16G16_SINT = 82,
R16G16_SFLOAT = 83,
R16G16B16_UNORM = 84,
R16G16B16_SNORM = 85,
R16G16B16_USCALED = 86,
R16G16B16_SSCALED = 87,
R16G16B16_UINT = 88,
R16G16B16_SINT = 89,
R16G16B16_SFLOAT = 90,
R16G16B16A16_UNORM = 91,
R16G16B16A16_SNORM = 92,
R16G16B16A16_USCALED = 93,
R16G16B16A16_SSCALED = 94,
R16G16B16A16_UINT = 95,
R16G16B16A16_SINT = 96,
R16G16B16A16_SFLOAT = 97,
R32_UINT = 98,
R32_SINT = 99,
R32_SFLOAT = 100,
R32G32_UINT = 101,
R32G32_SINT = 102,
R32G32_SFLOAT = 103,
R32G32B32_UINT = 104,
R32G32B32_SINT = 105,
R32G32B32_SFLOAT = 106,
R32G32B32A32_UINT = 107,
R32G32B32A32_SINT = 108,
R32G32B32A32_SFLOAT = 109,
R64_UINT = 110,
R64_SINT = 111,
R64_SFLOAT = 112,
R64G64_UINT = 113,
R64G64_SINT = 114,
R64G64_SFLOAT = 115,
R64G64B64_UINT = 116,
R64G64B64_SINT = 117,
R64G64B64_SFLOAT = 118,
R64G64B64A64_UINT = 119,
R64G64B64A64_SINT = 120,
R64G64B64A64_SFLOAT = 121,
B10G11R11_UFLOAT_PACK32 = 122,
E5B9G9R9_UFLOAT_PACK32 = 123,
D16_UNORM = 124,
X8_D24_UNORM_PACK32 = 125,
D32_SFLOAT = 126,
S8_UINT = 127,
D16_UNORM_S8_UINT = 128,
D24_UNORM_S8_UINT = 129,
D32_SFLOAT_S8_UINT = 130,
BC1_RGB_UNORM_BLOCK = 131,
BC1_RGB_SRGB_BLOCK = 132,
BC1_RGBA_UNORM_BLOCK = 133,
BC1_RGBA_SRGB_BLOCK = 134,
BC2_UNORM_BLOCK = 135,
BC2_SRGB_BLOCK = 136,
BC3_UNORM_BLOCK = 137,
BC3_SRGB_BLOCK = 138,
BC4_UNORM_BLOCK = 139,
BC4_SNORM_BLOCK = 140,
BC5_UNORM_BLOCK = 141,
BC5_SNORM_BLOCK = 142,
BC6H_UFLOAT_BLOCK = 143,
BC6H_SFLOAT_BLOCK = 144,
BC7_UNORM_BLOCK = 145,
BC7_SRGB_BLOCK = 146,
ETC2_R8G8B8_UNORM_BLOCK = 147,
ETC2_R8G8B8_SRGB_BLOCK = 148,
ETC2_R8G8B8A1_UNORM_BLOCK = 149,
ETC2_R8G8B8A1_SRGB_BLOCK = 150,
ETC2_R8G8B8A8_UNORM_BLOCK = 151,
ETC2_R8G8B8A8_SRGB_BLOCK = 152,
EAC_R11_UNORM_BLOCK = 153,
EAC_R11_SNORM_BLOCK = 154,
EAC_R11G11_UNORM_BLOCK = 155,
EAC_R11G11_SNORM_BLOCK = 156,
ASTC_BEGIN = ASTC_4x4_UNORM_BLOCK, FormatMask = ~TypeMask,
ASTC_4x4_UNORM_BLOCK = 157, ASTC_BEGIN = ASTC_4x4,
ASTC_4x4_SRGB_BLOCK = 158,
ASTC_5x4_UNORM_BLOCK = 159,
ASTC_5x4_SRGB_BLOCK = 160,
ASTC_5x5_UNORM_BLOCK = 161,
ASTC_5x5_SRGB_BLOCK = 162,
ASTC_6x5_UNORM_BLOCK = 163,
ASTC_6x5_SRGB_BLOCK = 164,
ASTC_6x6_UNORM_BLOCK = 165,
ASTC_6x6_SRGB_BLOCK = 166,
ASTC_8x5_UNORM_BLOCK = 167,
ASTC_8x5_SRGB_BLOCK = 168,
ASTC_8x6_UNORM_BLOCK = 169,
ASTC_8x6_SRGB_BLOCK = 170,
ASTC_8x8_UNORM_BLOCK = 171,
ASTC_8x8_SRGB_BLOCK = 172,
ASTC_10x5_UNORM_BLOCK = 173,
ASTC_10x5_SRGB_BLOCK = 174,
ASTC_10x6_UNORM_BLOCK = 175,
ASTC_10x6_SRGB_BLOCK = 176,
ASTC_10x8_UNORM_BLOCK = 177,
ASTC_10x8_SRGB_BLOCK = 178,
ASTC_10x10_UNORM_BLOCK = 179,
ASTC_10x10_SRGB_BLOCK = 180,
ASTC_12x10_UNORM_BLOCK = 181,
ASTC_12x10_SRGB_BLOCK = 182,
ASTC_12x12_UNORM_BLOCK = 183,
ASTC_12x12_SRGB_BLOCK = 184,
ASTC_END = ASTC_12x12_SRGB_BLOCK, ASTC_4x4 = 1,
ASTC_5x4,
ASTC_5x5,
ASTC_6x5,
ASTC_6x6,
ASTC_8x5,
ASTC_8x6,
ASTC_8x8,
ASTC_10x5,
ASTC_10x6,
ASTC_10x8,
ASTC_10x10,
ASTC_12x10,
ASTC_12x12,
REVERSED_BEGIN, ASTC_END = ASTC_12x12,
R4G4B4A4_UNORM_PACK16_REVERSED = REVERSED_BEGIN, R4G4,
R4G4B4A4,
REVERSED_END B4G4R4A4,
A4B4G4R4,
R5G6B5,
B5G6R5,
R5G5B5A1,
B5G5R5A1,
A1R5G5B5,
R8,
R8G8,
G8R8,
R8G8B8,
B8G8R8,
R8G8B8A8,
B8G8R8A8,
A8B8G8R8,
A8B8G8R8_SRGB,
A2R10G10B10,
A2B10G10R10,
R16,
R16G16,
R16G16B16,
R16G16B16A16,
R32,
R32G32,
R32G32B32,
R32G32B32A32,
R64,
R64G64,
R64G64B64,
R64G64B64A64,
B10G11R11,
E5B9G9R9,
D16,
X8_D24,
D32,
S8,
D16_S8,
D24_S8,
D32_S8,
BC1_RGB,
BC1_RGBA,
BC2,
BC3,
BC4,
BC5,
BC6H_SF16,
BC6H_UF16,
BC7,
ETC2_R8G8B8,
ETC2_R8G8B8A1,
ETC2_R8G8B8A8,
EAC_R11,
EAC_R11G11,
} }
} }

2
Ryujinx.Graphics/Gal/IGalFrameBuffer.cs → Ryujinx.Graphics/Gal/IGalRenderTarget.cs
View file

@ -2,7 +2,7 @@ using System;
namespace Ryujinx.Graphics.Gal namespace Ryujinx.Graphics.Gal
{ {
public interface IGalFrameBuffer public interface IGalRenderTarget
{ {
void BindColor(long Key, int Attachment); void BindColor(long Key, int Attachment);

2
Ryujinx.Graphics/Gal/IGalRenderer.cs
View file

@ -10,7 +10,7 @@ namespace Ryujinx.Graphics.Gal
IGalConstBuffer Buffer { get; } IGalConstBuffer Buffer { get; }
IGalFrameBuffer FrameBuffer { get; } IGalRenderTarget RenderTarget { get; }
IGalRasterizer Rasterizer { get; } IGalRasterizer Rasterizer { get; }

279
Ryujinx.Graphics/Gal/ImageFormatConverter.cs
View file

@ -1,279 +0,0 @@
using System;
namespace Ryujinx.Graphics.Gal
{
public static class ImageFormatConverter
{
public static GalImageFormat ConvertTexture(
GalTextureFormat Format,
GalTextureType RType,
GalTextureType GType,
GalTextureType BType,
GalTextureType AType)
{
if (RType != GType || RType != BType || RType != AType)
{
throw new NotImplementedException("Per component types are not implemented");
}
GalTextureType Type = RType;
switch (Type)
{
case GalTextureType.Snorm:
switch (Format)
{
case GalTextureFormat.R16G16B16A16: return GalImageFormat.R16G16B16A16_SNORM;
case GalTextureFormat.A8B8G8R8: return GalImageFormat.A8B8G8R8_SNORM_PACK32;
case GalTextureFormat.A2B10G10R10: return GalImageFormat.A2B10G10R10_SNORM_PACK32;
case GalTextureFormat.G8R8: return GalImageFormat.R8G8_SNORM;
case GalTextureFormat.R16: return GalImageFormat.R16_SNORM;
case GalTextureFormat.R8: return GalImageFormat.R8_SNORM;
case GalTextureFormat.BC4: return GalImageFormat.BC4_SNORM_BLOCK;
case GalTextureFormat.BC5: return GalImageFormat.BC5_SNORM_BLOCK;
}
break;
case GalTextureType.Unorm:
switch (Format)
{
case GalTextureFormat.R16G16B16A16: return GalImageFormat.R16G16B16A16_UNORM;
case GalTextureFormat.A8B8G8R8: return GalImageFormat.A8B8G8R8_UNORM_PACK32;
case GalTextureFormat.A2B10G10R10: return GalImageFormat.A2B10G10R10_UNORM_PACK32;
case GalTextureFormat.A4B4G4R4: return GalImageFormat.R4G4B4A4_UNORM_PACK16_REVERSED;
case GalTextureFormat.A1B5G5R5: return GalImageFormat.A1R5G5B5_UNORM_PACK16;
case GalTextureFormat.B5G6R5: return GalImageFormat.B5G6R5_UNORM_PACK16;
case GalTextureFormat.BC7U: return GalImageFormat.BC7_UNORM_BLOCK;
case GalTextureFormat.G8R8: return GalImageFormat.R8G8_UNORM;
case GalTextureFormat.R16: return GalImageFormat.R16_UNORM;
case GalTextureFormat.R8: return GalImageFormat.R8_UNORM;
case GalTextureFormat.BC1: return GalImageFormat.BC1_RGBA_UNORM_BLOCK;
case GalTextureFormat.BC2: return GalImageFormat.BC2_UNORM_BLOCK;
case GalTextureFormat.BC3: return GalImageFormat.BC3_UNORM_BLOCK;
case GalTextureFormat.BC4: return GalImageFormat.BC4_UNORM_BLOCK;
case GalTextureFormat.BC5: return GalImageFormat.BC5_UNORM_BLOCK;
case GalTextureFormat.Z24S8: return GalImageFormat.D24_UNORM_S8_UINT;
case GalTextureFormat.ZF32_X24S8: return GalImageFormat.D32_SFLOAT_S8_UINT;
case GalTextureFormat.Astc2D4x4: return GalImageFormat.ASTC_4x4_UNORM_BLOCK;
case GalTextureFormat.Astc2D5x5: return GalImageFormat.ASTC_5x5_UNORM_BLOCK;
case GalTextureFormat.Astc2D6x6: return GalImageFormat.ASTC_6x6_UNORM_BLOCK;
case GalTextureFormat.Astc2D8x8: return GalImageFormat.ASTC_8x8_UNORM_BLOCK;
case GalTextureFormat.Astc2D10x10: return GalImageFormat.ASTC_10x10_UNORM_BLOCK;
case GalTextureFormat.Astc2D12x12: return GalImageFormat.ASTC_12x12_UNORM_BLOCK;
case GalTextureFormat.Astc2D5x4: return GalImageFormat.ASTC_5x4_UNORM_BLOCK;
case GalTextureFormat.Astc2D6x5: return GalImageFormat.ASTC_6x5_UNORM_BLOCK;
case GalTextureFormat.Astc2D8x6: return GalImageFormat.ASTC_8x6_UNORM_BLOCK;
case GalTextureFormat.Astc2D10x8: return GalImageFormat.ASTC_10x8_UNORM_BLOCK;
case GalTextureFormat.Astc2D12x10: return GalImageFormat.ASTC_12x10_UNORM_BLOCK;
case GalTextureFormat.Astc2D8x5: return GalImageFormat.ASTC_8x5_UNORM_BLOCK;
case GalTextureFormat.Astc2D10x5: return GalImageFormat.ASTC_10x5_UNORM_BLOCK;
case GalTextureFormat.Astc2D10x6: return GalImageFormat.ASTC_10x6_UNORM_BLOCK;
}
break;
case GalTextureType.Sint:
switch (Format)
{
case GalTextureFormat.R32G32B32A32: return GalImageFormat.R32G32B32A32_SINT;
case GalTextureFormat.R16G16B16A16: return GalImageFormat.R16G16B16A16_SINT;
case GalTextureFormat.R32G32: return GalImageFormat.R32G32_SINT;
case GalTextureFormat.A8B8G8R8: return GalImageFormat.A8B8G8R8_SINT_PACK32;
case GalTextureFormat.A2B10G10R10: return GalImageFormat.A2B10G10R10_SINT_PACK32;
case GalTextureFormat.R32: return GalImageFormat.R32_SINT;
case GalTextureFormat.G8R8: return GalImageFormat.R8G8_SINT;
case GalTextureFormat.R16: return GalImageFormat.R16_SINT;
case GalTextureFormat.R8: return GalImageFormat.R8_SINT;
}
break;
case GalTextureType.Uint:
switch (Format)
{
case GalTextureFormat.R32G32B32A32: return GalImageFormat.R32G32B32A32_UINT;
case GalTextureFormat.R16G16B16A16: return GalImageFormat.R16G16B16A16_UINT;
case GalTextureFormat.R32G32: return GalImageFormat.R32G32_UINT;
case GalTextureFormat.A8B8G8R8: return GalImageFormat.A8B8G8R8_UINT_PACK32;
case GalTextureFormat.A2B10G10R10: return GalImageFormat.A2B10G10R10_UINT_PACK32;
case GalTextureFormat.R32: return GalImageFormat.R32_UINT;
case GalTextureFormat.G8R8: return GalImageFormat.R8G8_UINT;
case GalTextureFormat.R16: return GalImageFormat.R16_UINT;
case GalTextureFormat.R8: return GalImageFormat.R8_UINT;
}
break;
case GalTextureType.Snorm_Force_Fp16:
//TODO
break;
case GalTextureType.Unorm_Force_Fp16:
//TODO
break;
case GalTextureType.Float:
switch (Format)
{
case GalTextureFormat.R32G32B32A32: return GalImageFormat.R32G32B32A32_SFLOAT;
case GalTextureFormat.R16G16B16A16: return GalImageFormat.R16G16B16A16_SFLOAT;
case GalTextureFormat.R32G32: return GalImageFormat.R32G32_SFLOAT;
case GalTextureFormat.R32: return GalImageFormat.R32_SFLOAT;
case GalTextureFormat.BC6H_SF16: return GalImageFormat.BC6H_SFLOAT_BLOCK;
case GalTextureFormat.BC6H_UF16: return GalImageFormat.BC6H_UFLOAT_BLOCK;
case GalTextureFormat.R16: return GalImageFormat.R16_SFLOAT;
case GalTextureFormat.BF10GF11RF11: return GalImageFormat.B10G11R11_UFLOAT_PACK32;
case GalTextureFormat.ZF32: return GalImageFormat.D32_SFLOAT;
}
break;
}
throw new NotImplementedException("0x" + ((int)Format).ToString("x2") + " " + Type.ToString());
}
public static GalImageFormat ConvertFrameBuffer(GalFrameBufferFormat Format)
{
switch (Format)
{
case GalFrameBufferFormat.R32Float: return GalImageFormat.R32_SFLOAT;
case GalFrameBufferFormat.RGB10A2Unorm: return GalImageFormat.A2B10G10R10_UNORM_PACK32;
case GalFrameBufferFormat.RGBA8Srgb: return GalImageFormat.A8B8G8R8_SRGB_PACK32;
case GalFrameBufferFormat.RGBA16Float: return GalImageFormat.R16G16B16A16_SFLOAT;
case GalFrameBufferFormat.R16Float: return GalImageFormat.R16_SFLOAT;
case GalFrameBufferFormat.R8Unorm: return GalImageFormat.R8_UNORM;
case GalFrameBufferFormat.RGBA8Unorm: return GalImageFormat.A8B8G8R8_UNORM_PACK32;
case GalFrameBufferFormat.R11G11B10Float: return GalImageFormat.B10G11R11_UFLOAT_PACK32;
case GalFrameBufferFormat.RGBA32Float: return GalImageFormat.R32G32B32A32_SFLOAT;
case GalFrameBufferFormat.RG16Snorm: return GalImageFormat.R16G16_SNORM;
case GalFrameBufferFormat.RG16Float: return GalImageFormat.R16G16_SFLOAT;
case GalFrameBufferFormat.RG8Snorm: return GalImageFormat.R8_SNORM;
case GalFrameBufferFormat.RGBA8Snorm: return GalImageFormat.A8B8G8R8_SNORM_PACK32;
case GalFrameBufferFormat.RG8Unorm: return GalImageFormat.R8G8_UNORM;
case GalFrameBufferFormat.BGRA8Unorm: return GalImageFormat.A8B8G8R8_UNORM_PACK32;
case GalFrameBufferFormat.BGRA8Srgb: return GalImageFormat.A8B8G8R8_SRGB_PACK32;
case GalFrameBufferFormat.RG32Float: return GalImageFormat.R32G32_SFLOAT;
case GalFrameBufferFormat.RG32Sint: return GalImageFormat.R32G32_SINT;
case GalFrameBufferFormat.RG32Uint: return GalImageFormat.R32G32_UINT;
}
throw new NotImplementedException(Format.ToString());
}
public static GalImageFormat ConvertZeta(GalZetaFormat Format)
{
switch (Format)
{
case GalZetaFormat.Z32Float: return GalImageFormat.D32_SFLOAT;
case GalZetaFormat.S8Z24Unorm: return GalImageFormat.D24_UNORM_S8_UINT;
case GalZetaFormat.Z16Unorm: return GalImageFormat.D16_UNORM;
case GalZetaFormat.Z32S8X24Float: return GalImageFormat.D32_SFLOAT_S8_UINT;
}
throw new NotImplementedException(Format.ToString());
}
public static bool HasColor(GalImageFormat Format)
{
switch (Format)
{
case GalImageFormat.R32G32B32A32_SFLOAT:
case GalImageFormat.R32G32B32A32_SINT:
case GalImageFormat.R32G32B32A32_UINT:
case GalImageFormat.R16G16B16A16_SFLOAT:
case GalImageFormat.R16G16B16A16_SINT:
case GalImageFormat.R16G16B16A16_UINT:
case GalImageFormat.R32G32_SFLOAT:
case GalImageFormat.R32G32_SINT:
case GalImageFormat.R32G32_UINT:
case GalImageFormat.A8B8G8R8_SNORM_PACK32:
case GalImageFormat.A8B8G8R8_UNORM_PACK32:
case GalImageFormat.A8B8G8R8_SINT_PACK32:
case GalImageFormat.A8B8G8R8_UINT_PACK32:
case GalImageFormat.A2B10G10R10_SINT_PACK32:
case GalImageFormat.A2B10G10R10_SNORM_PACK32:
case GalImageFormat.A2B10G10R10_UINT_PACK32:
case GalImageFormat.A2B10G10R10_UNORM_PACK32:
case GalImageFormat.R32_SFLOAT:
case GalImageFormat.R32_SINT:
case GalImageFormat.R32_UINT:
case GalImageFormat.BC6H_SFLOAT_BLOCK:
case GalImageFormat.BC6H_UFLOAT_BLOCK:
case GalImageFormat.A1R5G5B5_UNORM_PACK16:
case GalImageFormat.B5G6R5_UNORM_PACK16:
case GalImageFormat.BC7_UNORM_BLOCK:
case GalImageFormat.R16G16_SFLOAT:
case GalImageFormat.R16G16_SINT:
case GalImageFormat.R16G16_SNORM:
case GalImageFormat.R16G16_UNORM:
case GalImageFormat.R8G8_SINT:
case GalImageFormat.R8G8_SNORM:
case GalImageFormat.R8G8_UINT:
case GalImageFormat.R8G8_UNORM:
case GalImageFormat.R16_SFLOAT:
case GalImageFormat.R16_SINT:
case GalImageFormat.R16_SNORM:
case GalImageFormat.R16_UINT:
case GalImageFormat.R16_UNORM:
case GalImageFormat.R8_SINT:
case GalImageFormat.R8_SNORM:
case GalImageFormat.R8_UINT:
case GalImageFormat.R8_UNORM:
case GalImageFormat.B10G11R11_UFLOAT_PACK32:
case GalImageFormat.BC1_RGBA_UNORM_BLOCK:
case GalImageFormat.BC2_UNORM_BLOCK:
case GalImageFormat.BC3_UNORM_BLOCK:
case GalImageFormat.BC4_UNORM_BLOCK:
case GalImageFormat.BC5_UNORM_BLOCK:
case GalImageFormat.ASTC_4x4_UNORM_BLOCK:
case GalImageFormat.ASTC_5x5_UNORM_BLOCK:
case GalImageFormat.ASTC_6x6_UNORM_BLOCK:
case GalImageFormat.ASTC_8x8_UNORM_BLOCK:
case GalImageFormat.ASTC_10x10_UNORM_BLOCK:
case GalImageFormat.ASTC_12x12_UNORM_BLOCK:
case GalImageFormat.ASTC_5x4_UNORM_BLOCK:
case GalImageFormat.ASTC_6x5_UNORM_BLOCK:
case GalImageFormat.ASTC_8x6_UNORM_BLOCK:
case GalImageFormat.ASTC_10x8_UNORM_BLOCK:
case GalImageFormat.ASTC_12x10_UNORM_BLOCK:
case GalImageFormat.ASTC_8x5_UNORM_BLOCK:
case GalImageFormat.ASTC_10x5_UNORM_BLOCK:
case GalImageFormat.ASTC_10x6_UNORM_BLOCK:
case GalImageFormat.R4G4B4A4_UNORM_PACK16_REVERSED:
return true;
case GalImageFormat.D24_UNORM_S8_UINT:
case GalImageFormat.D32_SFLOAT:
case GalImageFormat.D16_UNORM:
case GalImageFormat.D32_SFLOAT_S8_UINT:
return false;
}
throw new NotImplementedException(Format.ToString());
}
public static bool HasDepth(GalImageFormat Format)
{
switch (Format)
{
case GalImageFormat.D24_UNORM_S8_UINT:
case GalImageFormat.D32_SFLOAT:
case GalImageFormat.D16_UNORM:
case GalImageFormat.D32_SFLOAT_S8_UINT:
return true;
}
//Depth formats are fewer than colors, so it's harder to miss one
//Instead of checking for individual formats, return false
return false;
}
public static bool HasStencil(GalImageFormat Format)
{
switch (Format)
{
case GalImageFormat.D24_UNORM_S8_UINT:
case GalImageFormat.D32_SFLOAT_S8_UINT:
return true;
}
return false;
}
}
}

81
Ryujinx.Graphics/Gal/OpenGL/ImageHandler.cs
View file

@ -1,13 +1,11 @@
using OpenTK.Graphics.OpenGL; using OpenTK.Graphics.OpenGL;
using Ryujinx.Graphics.Texture;
using System; using System;
namespace Ryujinx.Graphics.Gal.OpenGL namespace Ryujinx.Graphics.Gal.OpenGL
{ {
class ImageHandler class ImageHandler
{ {
//TODO: Use a variable value here
public const int MaxBpp = 16;
private static int CopyBuffer = 0; private static int CopyBuffer = 0;
private static int CopyBufferSize = 0; private static int CopyBufferSize = 0;
@ -38,15 +36,31 @@ namespace Ryujinx.Graphics.Gal.OpenGL
this.Image = Image; this.Image = Image;
} }
public void EnsureSetup(GalImage Image) public void EnsureSetup(GalImage NewImage)
{ {
if (Width != Image.Width || if (Width == NewImage.Width &&
Height != Image.Height || Height == NewImage.Height &&
Format != Image.Format || Format == NewImage.Format &&
!Initialized) Initialized)
{ {
(PixelInternalFormat InternalFormat, PixelFormat PixelFormat, PixelType PixelType) = return;
OGLEnumConverter.GetImageFormat(Image.Format); }
PixelInternalFormat InternalFmt;
PixelFormat PixelFormat;
PixelType PixelType;
if (ImageUtils.IsCompressed(NewImage.Format))
{
InternalFmt = (PixelInternalFormat)OGLEnumConverter.GetCompressedImageFormat(NewImage.Format);
PixelFormat = default(PixelFormat);
PixelType = default(PixelType);
}
else
{
(InternalFmt, PixelFormat, PixelType) = OGLEnumConverter.GetImageFormat(NewImage.Format);
}
GL.BindTexture(TextureTarget.Texture2D, Handle); GL.BindTexture(TextureTarget.Texture2D, Handle);
@ -57,10 +71,8 @@ namespace Ryujinx.Graphics.Gal.OpenGL
CopyBuffer = GL.GenBuffer(); CopyBuffer = GL.GenBuffer();
} }
int MaxWidth = Math.Max(Image.Width, Width); int CurrentSize = Math.Max(ImageUtils.GetSize(NewImage),
int MaxHeight = Math.Max(Image.Height, Height); ImageUtils.GetSize(Image));
int CurrentSize = MaxWidth * MaxHeight * MaxBpp;
GL.BindBuffer(BufferTarget.PixelPackBuffer, CopyBuffer); GL.BindBuffer(BufferTarget.PixelPackBuffer, CopyBuffer);
GL.BindBuffer(BufferTarget.PixelUnpackBuffer, CopyBuffer); GL.BindBuffer(BufferTarget.PixelUnpackBuffer, CopyBuffer);
@ -72,7 +84,14 @@ namespace Ryujinx.Graphics.Gal.OpenGL
GL.BufferData(BufferTarget.PixelPackBuffer, CurrentSize, IntPtr.Zero, BufferUsageHint.StreamCopy); GL.BufferData(BufferTarget.PixelPackBuffer, CurrentSize, IntPtr.Zero, BufferUsageHint.StreamCopy);
} }
if (ImageUtils.IsCompressed(Image.Format))
{
GL.GetCompressedTexImage(TextureTarget.Texture2D, 0, IntPtr.Zero);
}
else
{
GL.GetTexImage(TextureTarget.Texture2D, 0, this.PixelFormat, this.PixelType, IntPtr.Zero); GL.GetTexImage(TextureTarget.Texture2D, 0, this.PixelFormat, this.PixelType, IntPtr.Zero);
}
GL.DeleteTexture(Handle); GL.DeleteTexture(Handle);
@ -90,16 +109,33 @@ namespace Ryujinx.Graphics.Gal.OpenGL
const int Level = 0; const int Level = 0;
const int Border = 0; const int Border = 0;
if (ImageUtils.IsCompressed(NewImage.Format))
{
Console.WriteLine("Hit");
GL.CompressedTexImage2D(
TextureTarget.Texture2D,
Level,
(InternalFormat)InternalFmt,
NewImage.Width,
NewImage.Height,
Border,
ImageUtils.GetSize(NewImage),
IntPtr.Zero);
}
else
{
GL.TexImage2D( GL.TexImage2D(
TextureTarget.Texture2D, TextureTarget.Texture2D,
Level, Level,
InternalFormat, InternalFmt,
Image.Width, NewImage.Width,
Image.Height, NewImage.Height,
Border, Border,
PixelFormat, PixelFormat,
PixelType, PixelType,
IntPtr.Zero); IntPtr.Zero);
}
if (Initialized) if (Initialized)
{ {
@ -107,18 +143,17 @@ namespace Ryujinx.Graphics.Gal.OpenGL
GL.BindBuffer(BufferTarget.PixelUnpackBuffer, 0); GL.BindBuffer(BufferTarget.PixelUnpackBuffer, 0);
} }
this.Image = Image; Image = NewImage;
this.InternalFormat = InternalFormat; this.InternalFormat = InternalFmt;
this.PixelFormat = PixelFormat; this.PixelFormat = PixelFormat;
this.PixelType = PixelType; this.PixelType = PixelType;
Initialized = true; Initialized = true;
} }
}
public bool HasColor { get => ImageFormatConverter.HasColor(Format); } public bool HasColor => ImageUtils.HasColor(Image.Format);
public bool HasDepth { get => ImageFormatConverter.HasDepth(Format); } public bool HasDepth => ImageUtils.HasDepth(Image.Format);
public bool HasStencil { get => ImageFormatConverter.HasStencil(Format); } public bool HasStencil => ImageUtils.HasStencil(Image.Format);
} }
} }

109
Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs
View file

@ -129,52 +129,51 @@ namespace Ryujinx.Graphics.Gal.OpenGL
{ {
switch (Format) switch (Format)
{ {
case GalImageFormat.R32G32B32A32_SFLOAT: return (PixelInternalFormat.Rgba32f, PixelFormat.Rgba, PixelType.Float); case GalImageFormat.R32G32B32A32 | GalImageFormat.Sfloat: return (PixelInternalFormat.Rgba32f, PixelFormat.Rgba, PixelType.Float);
case GalImageFormat.R32G32B32A32_SINT: return (PixelInternalFormat.Rgba32i, PixelFormat.RgbaInteger, PixelType.Int); case GalImageFormat.R32G32B32A32 | GalImageFormat.Sint: return (PixelInternalFormat.Rgba32i, PixelFormat.RgbaInteger, PixelType.Int);
case GalImageFormat.R32G32B32A32_UINT: return (PixelInternalFormat.Rgba32ui, PixelFormat.RgbaInteger, PixelType.UnsignedInt); case GalImageFormat.R32G32B32A32 | GalImageFormat.Uint: return (PixelInternalFormat.Rgba32ui, PixelFormat.RgbaInteger, PixelType.UnsignedInt);
case GalImageFormat.R16G16B16A16_SFLOAT: return (PixelInternalFormat.Rgba16f, PixelFormat.Rgba, PixelType.HalfFloat); case GalImageFormat.R16G16B16A16 | GalImageFormat.Sfloat: return (PixelInternalFormat.Rgba16f, PixelFormat.Rgba, PixelType.HalfFloat);
case GalImageFormat.R16G16B16A16_SINT: return (PixelInternalFormat.Rgba16i, PixelFormat.RgbaInteger, PixelType.Short); case GalImageFormat.R16G16B16A16 | GalImageFormat.Sint: return (PixelInternalFormat.Rgba16i, PixelFormat.RgbaInteger, PixelType.Short);
case GalImageFormat.R16G16B16A16_UINT: return (PixelInternalFormat.Rgba16ui, PixelFormat.RgbaInteger, PixelType.UnsignedShort); case GalImageFormat.R16G16B16A16 | GalImageFormat.Uint: return (PixelInternalFormat.Rgba16ui, PixelFormat.RgbaInteger, PixelType.UnsignedShort);
case GalImageFormat.R32G32_SFLOAT: return (PixelInternalFormat.Rg32f, PixelFormat.Rg, PixelType.Float); case GalImageFormat.R32G32 | GalImageFormat.Sfloat: return (PixelInternalFormat.Rg32f, PixelFormat.Rg, PixelType.Float);
case GalImageFormat.R32G32_SINT: return (PixelInternalFormat.Rg32i, PixelFormat.RgInteger, PixelType.Int); case GalImageFormat.R32G32 | GalImageFormat.Sint: return (PixelInternalFormat.Rg32i, PixelFormat.RgInteger, PixelType.Int);
case GalImageFormat.R32G32_UINT: return (PixelInternalFormat.Rg32ui, PixelFormat.RgInteger, PixelType.UnsignedInt); case GalImageFormat.R32G32 | GalImageFormat.Uint: return (PixelInternalFormat.Rg32ui, PixelFormat.RgInteger, PixelType.UnsignedInt);
case GalImageFormat.A8B8G8R8_SNORM_PACK32: return (PixelInternalFormat.Rgba8Snorm, PixelFormat.Rgba, PixelType.Byte); case GalImageFormat.A8B8G8R8 | GalImageFormat.Snorm: return (PixelInternalFormat.Rgba8Snorm, PixelFormat.Rgba, PixelType.Byte);
case GalImageFormat.A8B8G8R8_UNORM_PACK32: return (PixelInternalFormat.Rgba8, PixelFormat.Rgba, PixelType.UnsignedByte); case GalImageFormat.A8B8G8R8 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba8, PixelFormat.Rgba, PixelType.UnsignedByte);
case GalImageFormat.A8B8G8R8_SINT_PACK32: return (PixelInternalFormat.Rgba8i, PixelFormat.RgbaInteger, PixelType.Byte); case GalImageFormat.A8B8G8R8 | GalImageFormat.Sint: return (PixelInternalFormat.Rgba8i, PixelFormat.RgbaInteger, PixelType.Byte);
case GalImageFormat.A8B8G8R8_UINT_PACK32: return (PixelInternalFormat.Rgba8ui, PixelFormat.RgbaInteger, PixelType.UnsignedByte); case GalImageFormat.A8B8G8R8 | GalImageFormat.Uint: return (PixelInternalFormat.Rgba8ui, PixelFormat.RgbaInteger, PixelType.UnsignedByte);
case GalImageFormat.A8B8G8R8_SRGB_PACK32: return (PixelInternalFormat.Srgb8Alpha8, PixelFormat.Rgba, PixelType.UnsignedByte); case GalImageFormat.A8B8G8R8_SRGB: return (PixelInternalFormat.Srgb8Alpha8, PixelFormat.Rgba, PixelType.UnsignedByte);
case GalImageFormat.A2B10G10R10_UINT_PACK32: return (PixelInternalFormat.Rgb10A2ui, PixelFormat.RgbaInteger, PixelType.UnsignedInt2101010Reversed); case GalImageFormat.A4B4G4R4 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba4, PixelFormat.Rgba, PixelType.UnsignedShort4444Reversed);
case GalImageFormat.A2B10G10R10_UNORM_PACK32: return (PixelInternalFormat.Rgb10A2, PixelFormat.Rgba, PixelType.UnsignedInt2101010Reversed); case GalImageFormat.A2B10G10R10 | GalImageFormat.Uint: return (PixelInternalFormat.Rgb10A2ui, PixelFormat.RgbaInteger, PixelType.UnsignedInt2101010Reversed);
case GalImageFormat.R32_SFLOAT: return (PixelInternalFormat.R32f, PixelFormat.Red, PixelType.Float); case GalImageFormat.A2B10G10R10 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgb10A2, PixelFormat.Rgba, PixelType.UnsignedInt2101010Reversed);
case GalImageFormat.R32_SINT: return (PixelInternalFormat.R32i, PixelFormat.Red, PixelType.Int); case GalImageFormat.R32 | GalImageFormat.Sfloat: return (PixelInternalFormat.R32f, PixelFormat.Red, PixelType.Float);
case GalImageFormat.R32_UINT: return (PixelInternalFormat.R32ui, PixelFormat.Red, PixelType.UnsignedInt); case GalImageFormat.R32 | GalImageFormat.Sint: return (PixelInternalFormat.R32i, PixelFormat.Red, PixelType.Int);
case GalImageFormat.A1R5G5B5_UNORM_PACK16: return (PixelInternalFormat.Rgb5A1, PixelFormat.Rgba, PixelType.UnsignedShort5551); case GalImageFormat.R32 | GalImageFormat.Uint: return (PixelInternalFormat.R32ui, PixelFormat.Red, PixelType.UnsignedInt);
case GalImageFormat.B5G6R5_UNORM_PACK16: return (PixelInternalFormat.Rgba, PixelFormat.Rgb, PixelType.UnsignedShort565); case GalImageFormat.A1R5G5B5 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgb5A1, PixelFormat.Rgba, PixelType.UnsignedShort5551);
case GalImageFormat.R16G16_SFLOAT: return (PixelInternalFormat.Rg16f, PixelFormat.Rg, PixelType.HalfFloat); case GalImageFormat.B5G6R5 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba, PixelFormat.Rgb, PixelType.UnsignedShort565);
case GalImageFormat.R16G16_SINT: return (PixelInternalFormat.Rg16i, PixelFormat.RgInteger, PixelType.Short); case GalImageFormat.R16G16 | GalImageFormat.Sfloat: return (PixelInternalFormat.Rg16f, PixelFormat.Rg, PixelType.HalfFloat);
case GalImageFormat.R16G16_SNORM: return (PixelInternalFormat.Rg16Snorm, PixelFormat.Rg, PixelType.Byte); case GalImageFormat.R16G16 | GalImageFormat.Sint: return (PixelInternalFormat.Rg16i, PixelFormat.RgInteger, PixelType.Short);
case GalImageFormat.R16G16_UNORM: return (PixelInternalFormat.Rg16, PixelFormat.Rg, PixelType.UnsignedShort); case GalImageFormat.R16G16 | GalImageFormat.Snorm: return (PixelInternalFormat.Rg16Snorm, PixelFormat.Rg, PixelType.Byte);
case GalImageFormat.R8G8_SINT: return (PixelInternalFormat.Rg8i, PixelFormat.RgInteger, PixelType.Byte); case GalImageFormat.R16G16 | GalImageFormat.Unorm: return (PixelInternalFormat.Rg16, PixelFormat.Rg, PixelType.UnsignedShort);
case GalImageFormat.R8G8_SNORM: return (PixelInternalFormat.Rg8Snorm, PixelFormat.Rg, PixelType.Byte); case GalImageFormat.R8G8 | GalImageFormat.Sint: return (PixelInternalFormat.Rg8i, PixelFormat.RgInteger, PixelType.Byte);
case GalImageFormat.R8G8_UINT: return (PixelInternalFormat.Rg8ui, PixelFormat.RgInteger, PixelType.UnsignedByte); case GalImageFormat.R8G8 | GalImageFormat.Snorm: return (PixelInternalFormat.Rg8Snorm, PixelFormat.Rg, PixelType.Byte);
case GalImageFormat.R8G8_UNORM: return (PixelInternalFormat.Rg8, PixelFormat.Rg, PixelType.UnsignedByte); case GalImageFormat.R8G8 | GalImageFormat.Uint: return (PixelInternalFormat.Rg8ui, PixelFormat.RgInteger, PixelType.UnsignedByte);
case GalImageFormat.R16_SFLOAT: return (PixelInternalFormat.R16f, PixelFormat.Red, PixelType.HalfFloat); case GalImageFormat.R8G8 | GalImageFormat.Unorm: return (PixelInternalFormat.Rg8, PixelFormat.Rg, PixelType.UnsignedByte);
case GalImageFormat.R16_SINT: return (PixelInternalFormat.R16i, PixelFormat.RedInteger, PixelType.Short); case GalImageFormat.R16 | GalImageFormat.Sfloat: return (PixelInternalFormat.R16f, PixelFormat.Red, PixelType.HalfFloat);
case GalImageFormat.R16_SNORM: return (PixelInternalFormat.R16Snorm, PixelFormat.Red, PixelType.Byte); case GalImageFormat.R16 | GalImageFormat.Sint: return (PixelInternalFormat.R16i, PixelFormat.RedInteger, PixelType.Short);
case GalImageFormat.R16_UINT: return (PixelInternalFormat.R16ui, PixelFormat.RedInteger, PixelType.UnsignedShort); case GalImageFormat.R16 | GalImageFormat.Snorm: return (PixelInternalFormat.R16Snorm, PixelFormat.Red, PixelType.Byte);
case GalImageFormat.R16_UNORM: return (PixelInternalFormat.R16, PixelFormat.Red, PixelType.UnsignedShort); case GalImageFormat.R16 | GalImageFormat.Uint: return (PixelInternalFormat.R16ui, PixelFormat.RedInteger, PixelType.UnsignedShort);
case GalImageFormat.R8_SINT: return (PixelInternalFormat.R8i, PixelFormat.RedInteger, PixelType.Byte); case GalImageFormat.R16 | GalImageFormat.Unorm: return (PixelInternalFormat.R16, PixelFormat.Red, PixelType.UnsignedShort);
case GalImageFormat.R8_SNORM: return (PixelInternalFormat.R8Snorm, PixelFormat.Red, PixelType.Byte); case GalImageFormat.R8 | GalImageFormat.Sint: return (PixelInternalFormat.R8i, PixelFormat.RedInteger, PixelType.Byte);
case GalImageFormat.R8_UINT: return (PixelInternalFormat.R8ui, PixelFormat.RedInteger, PixelType.UnsignedByte); case GalImageFormat.R8 | GalImageFormat.Snorm: return (PixelInternalFormat.R8Snorm, PixelFormat.Red, PixelType.Byte);
case GalImageFormat.R8_UNORM: return (PixelInternalFormat.R8, PixelFormat.Red, PixelType.UnsignedByte); case GalImageFormat.R8 | GalImageFormat.Uint: return (PixelInternalFormat.R8ui, PixelFormat.RedInteger, PixelType.UnsignedByte);
case GalImageFormat.B10G11R11_UFLOAT_PACK32: return (PixelInternalFormat.R11fG11fB10f, PixelFormat.Rgb, PixelType.UnsignedInt10F11F11FRev); case GalImageFormat.R8 | GalImageFormat.Unorm: return (PixelInternalFormat.R8, PixelFormat.Red, PixelType.UnsignedByte);
case GalImageFormat.B10G11R11 | GalImageFormat.Sfloat: return (PixelInternalFormat.R11fG11fB10f, PixelFormat.Rgb, PixelType.UnsignedInt10F11F11FRev);
case GalImageFormat.R4G4B4A4_UNORM_PACK16_REVERSED: return (PixelInternalFormat.Rgba4, PixelFormat.Rgba, PixelType.UnsignedShort4444Reversed); case GalImageFormat.D24_S8 | GalImageFormat.Unorm: return (PixelInternalFormat.Depth24Stencil8, PixelFormat.DepthStencil, PixelType.UnsignedInt248);
case GalImageFormat.D32 | GalImageFormat.Sfloat: return (PixelInternalFormat.DepthComponent32f, PixelFormat.DepthComponent, PixelType.Float);
case GalImageFormat.D24_UNORM_S8_UINT: return (PixelInternalFormat.Depth24Stencil8, PixelFormat.DepthStencil, PixelType.UnsignedInt248); case GalImageFormat.D16 | GalImageFormat.Unorm: return (PixelInternalFormat.DepthComponent16, PixelFormat.DepthComponent, PixelType.UnsignedShort);
case GalImageFormat.D32_SFLOAT: return (PixelInternalFormat.DepthComponent32f, PixelFormat.DepthComponent, PixelType.Float); case GalImageFormat.D32_S8 | GalImageFormat.Uint: return (PixelInternalFormat.Depth32fStencil8, PixelFormat.DepthStencil, PixelType.Float32UnsignedInt248Rev);
case GalImageFormat.D16_UNORM: return (PixelInternalFormat.DepthComponent16, PixelFormat.DepthComponent, PixelType.UnsignedShort);
case GalImageFormat.D32_SFLOAT_S8_UINT: return (PixelInternalFormat.Depth32fStencil8, PixelFormat.DepthStencil, PixelType.Float32UnsignedInt248Rev);
} }
throw new NotImplementedException(Format.ToString()); throw new NotImplementedException(Format.ToString());
@ -184,16 +183,16 @@ namespace Ryujinx.Graphics.Gal.OpenGL
{ {
switch (Format) switch (Format)
{ {
case GalImageFormat.BC6H_UFLOAT_BLOCK: return InternalFormat.CompressedRgbBptcUnsignedFloat; case GalImageFormat.BC6H_UF16 | GalImageFormat.Unorm: return InternalFormat.CompressedRgbBptcUnsignedFloat;
case GalImageFormat.BC6H_SFLOAT_BLOCK: return InternalFormat.CompressedRgbBptcSignedFloat; case GalImageFormat.BC6H_SF16 | GalImageFormat.Unorm: return InternalFormat.CompressedRgbBptcSignedFloat;
case GalImageFormat.BC7_UNORM_BLOCK: return InternalFormat.CompressedRgbaBptcUnorm; case GalImageFormat.BC7 | GalImageFormat.Unorm: return InternalFormat.CompressedRgbaBptcUnorm;
case GalImageFormat.BC1_RGBA_UNORM_BLOCK: return InternalFormat.CompressedRgbaS3tcDxt1Ext; case GalImageFormat.BC1_RGBA | GalImageFormat.Unorm: return InternalFormat.CompressedRgbaS3tcDxt1Ext;
case GalImageFormat.BC2_UNORM_BLOCK: return InternalFormat.CompressedRgbaS3tcDxt3Ext; case GalImageFormat.BC2 | GalImageFormat.Unorm: return InternalFormat.CompressedRgbaS3tcDxt3Ext;
case GalImageFormat.BC3_UNORM_BLOCK: return InternalFormat.CompressedRgbaS3tcDxt5Ext; case GalImageFormat.BC3 | GalImageFormat.Unorm: return InternalFormat.CompressedRgbaS3tcDxt5Ext;
case GalImageFormat.BC4_SNORM_BLOCK: return InternalFormat.CompressedSignedRedRgtc1; case GalImageFormat.BC4 | GalImageFormat.Snorm: return InternalFormat.CompressedSignedRedRgtc1;
case GalImageFormat.BC4_UNORM_BLOCK: return InternalFormat.CompressedRedRgtc1; case GalImageFormat.BC4 | GalImageFormat.Unorm: return InternalFormat.CompressedRedRgtc1;
case GalImageFormat.BC5_SNORM_BLOCK: return InternalFormat.CompressedSignedRgRgtc2; case GalImageFormat.BC5 | GalImageFormat.Snorm: return InternalFormat.CompressedSignedRgRgtc2;
case GalImageFormat.BC5_UNORM_BLOCK: return InternalFormat.CompressedRgRgtc2; case GalImageFormat.BC5 | GalImageFormat.Unorm: return InternalFormat.CompressedRgRgtc2;
} }
throw new NotImplementedException(Format.ToString()); throw new NotImplementedException(Format.ToString());

9
Ryujinx.Graphics/Gal/OpenGL/OGLFrameBuffer.cs → Ryujinx.Graphics/Gal/OpenGL/OGLRenderTarget.cs
View file

@ -1,9 +1,10 @@
using OpenTK.Graphics.OpenGL; using OpenTK.Graphics.OpenGL;
using Ryujinx.Graphics.Texture;
using System; using System;
namespace Ryujinx.Graphics.Gal.OpenGL namespace Ryujinx.Graphics.Gal.OpenGL
{ {
class OGLFrameBuffer : IGalFrameBuffer class OGLRenderTarget : IGalRenderTarget
{ {
private struct Rect private struct Rect
{ {
@ -24,7 +25,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
private const int NativeWidth = 1280; private const int NativeWidth = 1280;
private const int NativeHeight = 720; private const int NativeHeight = 720;
private const GalImageFormat RawFormat = GalImageFormat.A8B8G8R8_UNORM_PACK32; private const GalImageFormat RawFormat = GalImageFormat.A8B8G8R8 | GalImageFormat.Unorm;
private OGLTexture Texture; private OGLTexture Texture;
@ -56,7 +57,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
private int DepthAttachment; private int DepthAttachment;
private int StencilAttachment; private int StencilAttachment;
public OGLFrameBuffer(OGLTexture Texture) public OGLRenderTarget(OGLTexture Texture)
{ {
ColorAttachments = new int[8]; ColorAttachments = new int[8];
@ -379,7 +380,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
{ {
if (Texture.TryGetImage(Key, out ImageHandler Tex)) if (Texture.TryGetImage(Key, out ImageHandler Tex))
{ {
byte[] Data = new byte[Tex.Width * Tex.Height * ImageHandler.MaxBpp]; byte[] Data = new byte[ImageUtils.GetSize(Tex.Image)];
GL.BindTexture(TextureTarget.Texture2D, Tex.Handle); GL.BindTexture(TextureTarget.Texture2D, Tex.Handle);

4
Ryujinx.Graphics/Gal/OpenGL/OGLRenderer.cs
View file

@ -7,7 +7,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
{ {
public IGalConstBuffer Buffer { get; private set; } public IGalConstBuffer Buffer { get; private set; }
public IGalFrameBuffer FrameBuffer { get; private set; } public IGalRenderTarget RenderTarget { get; private set; }
public IGalRasterizer Rasterizer { get; private set; } public IGalRasterizer Rasterizer { get; private set; }
@ -25,7 +25,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
Texture = new OGLTexture(); Texture = new OGLTexture();
FrameBuffer = new OGLFrameBuffer(Texture as OGLTexture); RenderTarget = new OGLRenderTarget(Texture as OGLTexture);
Rasterizer = new OGLRasterizer(); Rasterizer = new OGLRasterizer();

99
Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs
View file

@ -1,5 +1,5 @@
using OpenTK.Graphics.OpenGL; using OpenTK.Graphics.OpenGL;
using Ryujinx.Graphics.Gal.Texture; using Ryujinx.Graphics.Texture;
using System; using System;
namespace Ryujinx.Graphics.Gal.OpenGL namespace Ryujinx.Graphics.Gal.OpenGL
@ -39,7 +39,11 @@ namespace Ryujinx.Graphics.Gal.OpenGL
const int Level = 0; //TODO: Support mipmap textures. const int Level = 0; //TODO: Support mipmap textures.
const int Border = 0; const int Border = 0;
if (IsCompressedTextureFormat(Image.Format)) GalImageFormat TypeLess = Image.Format & GalImageFormat.FormatMask;
bool IsASTC = TypeLess >= GalImageFormat.ASTC_BEGIN && TypeLess <= GalImageFormat.ASTC_END;
if (ImageUtils.IsCompressed(Image.Format) && !IsASTC)
{ {
InternalFormat InternalFmt = OGLEnumConverter.GetCompressedImageFormat(Image.Format); InternalFormat InternalFmt = OGLEnumConverter.GetCompressedImageFormat(Image.Format);
@ -55,7 +59,8 @@ namespace Ryujinx.Graphics.Gal.OpenGL
} }
else else
{ {
if (Image.Format >= GalImageFormat.ASTC_BEGIN && Image.Format <= GalImageFormat.ASTC_END) //TODO: Use KHR_texture_compression_astc_hdr when available
if (IsASTC)
{ {
int TextureBlockWidth = GetAstcBlockWidth(Image.Format); int TextureBlockWidth = GetAstcBlockWidth(Image.Format);
int TextureBlockHeight = GetAstcBlockHeight(Image.Format); int TextureBlockHeight = GetAstcBlockHeight(Image.Format);
@ -67,7 +72,17 @@ namespace Ryujinx.Graphics.Gal.OpenGL
Image.Width, Image.Width,
Image.Height, 1); Image.Height, 1);
Image.Format = GalImageFormat.A8B8G8R8_UNORM_PACK32; Image.Format = GalImageFormat.A8B8G8R8 | GalImageFormat.Unorm;
}
else if (TypeLess == GalImageFormat.G8R8)
{
Data = ImageConverter.G8R8ToR8G8(
Data,
Image.Width,
Image.Height,
1);
Image.Format = GalImageFormat.R8G8 | (Image.Format & GalImageFormat.FormatMask);
} }
(PixelInternalFormat InternalFormat, PixelFormat Format, PixelType Type) = OGLEnumConverter.GetImageFormat(Image.Format); (PixelInternalFormat InternalFormat, PixelFormat Format, PixelType Type) = OGLEnumConverter.GetImageFormat(Image.Format);
@ -123,20 +138,20 @@ namespace Ryujinx.Graphics.Gal.OpenGL
{ {
switch (Format) switch (Format)
{ {
case GalImageFormat.ASTC_4x4_UNORM_BLOCK: return 4; case GalImageFormat.ASTC_4x4 | GalImageFormat.Unorm: return 4;
case GalImageFormat.ASTC_5x5_UNORM_BLOCK: return 5; case GalImageFormat.ASTC_5x5 | GalImageFormat.Unorm: return 5;
case GalImageFormat.ASTC_6x6_UNORM_BLOCK: return 6; case GalImageFormat.ASTC_6x6 | GalImageFormat.Unorm: return 6;
case GalImageFormat.ASTC_8x8_UNORM_BLOCK: return 8; case GalImageFormat.ASTC_8x8 | GalImageFormat.Unorm: return 8;
case GalImageFormat.ASTC_10x10_UNORM_BLOCK: return 10; case GalImageFormat.ASTC_10x10 | GalImageFormat.Unorm: return 10;
case GalImageFormat.ASTC_12x12_UNORM_BLOCK: return 12; case GalImageFormat.ASTC_12x12 | GalImageFormat.Unorm: return 12;
case GalImageFormat.ASTC_5x4_UNORM_BLOCK: return 5; case GalImageFormat.ASTC_5x4 | GalImageFormat.Unorm: return 5;
case GalImageFormat.ASTC_6x5_UNORM_BLOCK: return 6; case GalImageFormat.ASTC_6x5 | GalImageFormat.Unorm: return 6;
case GalImageFormat.ASTC_8x6_UNORM_BLOCK: return 8; case GalImageFormat.ASTC_8x6 | GalImageFormat.Unorm: return 8;
case GalImageFormat.ASTC_10x8_UNORM_BLOCK: return 10; case GalImageFormat.ASTC_10x8 | GalImageFormat.Unorm: return 10;
case GalImageFormat.ASTC_12x10_UNORM_BLOCK: return 12; case GalImageFormat.ASTC_12x10 | GalImageFormat.Unorm: return 12;
case GalImageFormat.ASTC_8x5_UNORM_BLOCK: return 8; case GalImageFormat.ASTC_8x5 | GalImageFormat.Unorm: return 8;
case GalImageFormat.ASTC_10x5_UNORM_BLOCK: return 10; case GalImageFormat.ASTC_10x5 | GalImageFormat.Unorm: return 10;
case GalImageFormat.ASTC_10x6_UNORM_BLOCK: return 10; case GalImageFormat.ASTC_10x6 | GalImageFormat.Unorm: return 10;
} }
throw new ArgumentException(nameof(Format)); throw new ArgumentException(nameof(Format));
@ -146,20 +161,20 @@ namespace Ryujinx.Graphics.Gal.OpenGL
{ {
switch (Format) switch (Format)
{ {
case GalImageFormat.ASTC_4x4_UNORM_BLOCK: return 4; case GalImageFormat.ASTC_4x4 | GalImageFormat.Unorm: return 4;
case GalImageFormat.ASTC_5x5_UNORM_BLOCK: return 5; case GalImageFormat.ASTC_5x5 | GalImageFormat.Unorm: return 5;
case GalImageFormat.ASTC_6x6_UNORM_BLOCK: return 6; case GalImageFormat.ASTC_6x6 | GalImageFormat.Unorm: return 6;
case GalImageFormat.ASTC_8x8_UNORM_BLOCK: return 8; case GalImageFormat.ASTC_8x8 | GalImageFormat.Unorm: return 8;
case GalImageFormat.ASTC_10x10_UNORM_BLOCK: return 10; case GalImageFormat.ASTC_10x10 | GalImageFormat.Unorm: return 10;
case GalImageFormat.ASTC_12x12_UNORM_BLOCK: return 12; case GalImageFormat.ASTC_12x12 | GalImageFormat.Unorm: return 12;
case GalImageFormat.ASTC_5x4_UNORM_BLOCK: return 4; case GalImageFormat.ASTC_5x4 | GalImageFormat.Unorm: return 4;
case GalImageFormat.ASTC_6x5_UNORM_BLOCK: return 5; case GalImageFormat.ASTC_6x5 | GalImageFormat.Unorm: return 5;
case GalImageFormat.ASTC_8x6_UNORM_BLOCK: return 6; case GalImageFormat.ASTC_8x6 | GalImageFormat.Unorm: return 6;
case GalImageFormat.ASTC_10x8_UNORM_BLOCK: return 8; case GalImageFormat.ASTC_10x8 | GalImageFormat.Unorm: return 8;
case GalImageFormat.ASTC_12x10_UNORM_BLOCK: return 10; case GalImageFormat.ASTC_12x10 | GalImageFormat.Unorm: return 10;
case GalImageFormat.ASTC_8x5_UNORM_BLOCK: return 5; case GalImageFormat.ASTC_8x5 | GalImageFormat.Unorm: return 5;
case GalImageFormat.ASTC_10x5_UNORM_BLOCK: return 5; case GalImageFormat.ASTC_10x5 | GalImageFormat.Unorm: return 5;
case GalImageFormat.ASTC_10x6_UNORM_BLOCK: return 6; case GalImageFormat.ASTC_10x6 | GalImageFormat.Unorm: return 6;
} }
throw new ArgumentException(nameof(Format)); throw new ArgumentException(nameof(Format));
@ -216,25 +231,5 @@ namespace Ryujinx.Graphics.Gal.OpenGL
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureBorderColor, Color); GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureBorderColor, Color);
} }
private static bool IsCompressedTextureFormat(GalImageFormat Format)
{
switch (Format)
{
case GalImageFormat.BC6H_UFLOAT_BLOCK:
case GalImageFormat.BC6H_SFLOAT_BLOCK:
case GalImageFormat.BC7_UNORM_BLOCK:
case GalImageFormat.BC1_RGBA_UNORM_BLOCK:
case GalImageFormat.BC2_UNORM_BLOCK:
case GalImageFormat.BC3_UNORM_BLOCK:
case GalImageFormat.BC4_SNORM_BLOCK:
case GalImageFormat.BC4_UNORM_BLOCK:
case GalImageFormat.BC5_SNORM_BLOCK:
case GalImageFormat.BC5_UNORM_BLOCK:
return true;
}
return false;
}
} }
} }

400
Ryujinx.Graphics/Gal/Shader/ShaderDecodeAlu.cs
View file

@ -33,20 +33,20 @@ namespace Ryujinx.Graphics.Gal.Shader
public static void Fadd_I32(ShaderIrBlock Block, long OpCode, long Position) public static void Fadd_I32(ShaderIrBlock Block, long OpCode, long Position)
{ {
ShaderIrNode OperA = GetOperGpr8 (OpCode); ShaderIrNode OperA = OpCode.Gpr8();
ShaderIrNode OperB = GetOperImmf32_20(OpCode); ShaderIrNode OperB = OpCode.Immf32_20();
bool NegB = ((OpCode >> 53) & 1) != 0; bool NegB = OpCode.Read(53);
bool AbsA = ((OpCode >> 54) & 1) != 0; bool AbsA = OpCode.Read(54);
bool NegA = ((OpCode >> 56) & 1) != 0; bool NegA = OpCode.Read(56);
bool AbsB = ((OpCode >> 57) & 1) != 0; bool AbsB = OpCode.Read(57);
OperA = GetAluFabsFneg(OperA, AbsA, NegA); OperA = GetAluFabsFneg(OperA, AbsA, NegA);
OperB = GetAluFabsFneg(OperB, AbsB, NegB); OperB = GetAluFabsFneg(OperB, AbsB, NegB);
ShaderIrOp Op = new ShaderIrOp(ShaderIrInst.Fadd, OperA, OperB); ShaderIrOp Op = new ShaderIrOp(ShaderIrInst.Fadd, OperA, OperB);
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op)));
} }
public static void Fadd_R(ShaderIrBlock Block, long OpCode, long Position) public static void Fadd_R(ShaderIrBlock Block, long OpCode, long Position)
@ -91,12 +91,12 @@ namespace Ryujinx.Graphics.Gal.Shader
public static void Fmul_I32(ShaderIrBlock Block, long OpCode, long Position) public static void Fmul_I32(ShaderIrBlock Block, long OpCode, long Position)
{ {
ShaderIrNode OperA = GetOperGpr8 (OpCode); ShaderIrNode OperA = OpCode.Gpr8();
ShaderIrNode OperB = GetOperImmf32_20(OpCode); ShaderIrNode OperB = OpCode.Immf32_20();
ShaderIrOp Op = new ShaderIrOp(ShaderIrInst.Fmul, OperA, OperB); ShaderIrOp Op = new ShaderIrOp(ShaderIrInst.Fmul, OperA, OperB);
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op)));
} }
public static void Fmul_C(ShaderIrBlock Block, long OpCode, long Position) public static void Fmul_C(ShaderIrBlock Block, long OpCode, long Position)
@ -156,16 +156,16 @@ namespace Ryujinx.Graphics.Gal.Shader
public static void Iadd_I32(ShaderIrBlock Block, long OpCode, long Position) public static void Iadd_I32(ShaderIrBlock Block, long OpCode, long Position)
{ {
ShaderIrNode OperA = GetOperGpr8 (OpCode); ShaderIrNode OperA = OpCode.Gpr8();
ShaderIrNode OperB = GetOperImm32_20(OpCode); ShaderIrNode OperB = OpCode.Imm32_20();
bool NegA = ((OpCode >> 56) & 1) != 0; bool NegA = OpCode.Read(56);
OperA = GetAluIneg(OperA, NegA); OperA = GetAluIneg(OperA, NegA);
ShaderIrOp Op = new ShaderIrOp(ShaderIrInst.Add, OperA, OperB); ShaderIrOp Op = new ShaderIrOp(ShaderIrInst.Add, OperA, OperB);
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op)));
} }
public static void Iadd_R(ShaderIrBlock Block, long OpCode, long Position) public static void Iadd_R(ShaderIrBlock Block, long OpCode, long Position)
@ -205,16 +205,16 @@ namespace Ryujinx.Graphics.Gal.Shader
public static void Ipa(ShaderIrBlock Block, long OpCode, long Position) public static void Ipa(ShaderIrBlock Block, long OpCode, long Position)
{ {
ShaderIrNode OperA = GetOperAbuf28(OpCode); ShaderIrNode OperA = OpCode.Abuf28();
ShaderIrNode OperB = GetOperGpr20 (OpCode); ShaderIrNode OperB = OpCode.Gpr20();
ShaderIpaMode Mode = (ShaderIpaMode)((OpCode >> 54) & 3); ShaderIpaMode Mode = (ShaderIpaMode)(OpCode.Read(54, 3));
ShaderIrMetaIpa Meta = new ShaderIrMetaIpa(Mode); ShaderIrMetaIpa Meta = new ShaderIrMetaIpa(Mode);
ShaderIrOp Op = new ShaderIrOp(ShaderIrInst.Ipa, OperA, OperB, null, Meta); ShaderIrOp Op = new ShaderIrOp(ShaderIrInst.Ipa, OperA, OperB, null, Meta);
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op)));
} }
public static void Iscadd_C(ShaderIrBlock Block, long OpCode, long Position) public static void Iscadd_C(ShaderIrBlock Block, long OpCode, long Position)
@ -264,10 +264,10 @@ namespace Ryujinx.Graphics.Gal.Shader
public static void Lop_I32(ShaderIrBlock Block, long OpCode, long Position) public static void Lop_I32(ShaderIrBlock Block, long OpCode, long Position)
{ {
int SubOp = (int)(OpCode >> 53) & 3; int SubOp = OpCode.Read(53, 3);
bool InvA = ((OpCode >> 55) & 1) != 0; bool InvA = OpCode.Read(55);
bool InvB = ((OpCode >> 56) & 1) != 0; bool InvB = OpCode.Read(56);
ShaderIrInst Inst = 0; ShaderIrInst Inst = 0;
@ -278,21 +278,21 @@ namespace Ryujinx.Graphics.Gal.Shader
case 2: Inst = ShaderIrInst.Xor; break; case 2: Inst = ShaderIrInst.Xor; break;
} }
ShaderIrNode OperB = GetAluNot(GetOperImm32_20(OpCode), InvB); ShaderIrNode OperB = GetAluNot(OpCode.Imm32_20(), InvB);
//SubOp == 3 is pass, used by the not instruction //SubOp == 3 is pass, used by the not instruction
//which just moves the inverted register value. //which just moves the inverted register value.
if (SubOp < 3) if (SubOp < 3)
{ {
ShaderIrNode OperA = GetAluNot(GetOperGpr8(OpCode), InvA); ShaderIrNode OperA = GetAluNot(OpCode.Gpr8(), InvA);
ShaderIrOp Op = new ShaderIrOp(Inst, OperA, OperB); ShaderIrOp Op = new ShaderIrOp(Inst, OperA, OperB);
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op)));
} }
else else
{ {
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), OperB), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), OperB)));
} }
} }
@ -313,10 +313,10 @@ namespace Ryujinx.Graphics.Gal.Shader
public static void Mufu(ShaderIrBlock Block, long OpCode, long Position) public static void Mufu(ShaderIrBlock Block, long OpCode, long Position)
{ {
int SubOp = (int)(OpCode >> 20) & 0xf; int SubOp = OpCode.Read(20, 0xf);
bool AbsA = ((OpCode >> 46) & 1) != 0; bool AbsA = OpCode.Read(46);
bool NegA = ((OpCode >> 48) & 1) != 0; bool NegA = OpCode.Read(48);
ShaderIrInst Inst = 0; ShaderIrInst Inst = 0;
@ -333,23 +333,23 @@ namespace Ryujinx.Graphics.Gal.Shader
default: throw new NotImplementedException(SubOp.ToString()); default: throw new NotImplementedException(SubOp.ToString());
} }
ShaderIrNode OperA = GetOperGpr8(OpCode); ShaderIrNode OperA = OpCode.Gpr8();
ShaderIrOp Op = new ShaderIrOp(Inst, GetAluFabsFneg(OperA, AbsA, NegA)); ShaderIrOp Op = new ShaderIrOp(Inst, GetAluFabsFneg(OperA, AbsA, NegA));
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op)));
} }
public static void Psetp(ShaderIrBlock Block, long OpCode, long Position) public static void Psetp(ShaderIrBlock Block, long OpCode, long Position)
{ {
bool NegA = ((OpCode >> 15) & 1) != 0; bool NegA = OpCode.Read(15);
bool NegB = ((OpCode >> 32) & 1) != 0; bool NegB = OpCode.Read(32);
bool NegP = ((OpCode >> 42) & 1) != 0; bool NegP = OpCode.Read(42);
ShaderIrInst LopInst = GetBLop24(OpCode); ShaderIrInst LopInst = OpCode.BLop24();
ShaderIrNode OperA = GetOperPred12(OpCode); ShaderIrNode OperA = OpCode.Pred12();
ShaderIrNode OperB = GetOperPred29(OpCode); ShaderIrNode OperB = OpCode.Pred29();
if (NegA) if (NegA)
{ {
@ -363,13 +363,13 @@ namespace Ryujinx.Graphics.Gal.Shader
ShaderIrOp Op = new ShaderIrOp(LopInst, OperA, OperB); ShaderIrOp Op = new ShaderIrOp(LopInst, OperA, OperB);
ShaderIrOperPred P0Node = GetOperPred3 (OpCode); ShaderIrOperPred P0Node = OpCode.Pred3();
ShaderIrOperPred P1Node = GetOperPred0 (OpCode); ShaderIrOperPred P1Node = OpCode.Pred0();
ShaderIrOperPred P2Node = GetOperPred39(OpCode); ShaderIrOperPred P2Node = OpCode.Pred39();
Block.AddNode(GetPredNode(new ShaderIrAsg(P0Node, Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(P0Node, Op)));
LopInst = GetBLop45(OpCode); LopInst = OpCode.BLop45();
if (LopInst == ShaderIrInst.Band && P1Node.IsConst && P2Node.IsConst) if (LopInst == ShaderIrInst.Band && P1Node.IsConst && P2Node.IsConst)
{ {
@ -387,11 +387,11 @@ namespace Ryujinx.Graphics.Gal.Shader
Op = new ShaderIrOp(LopInst, Op, P2NNode); Op = new ShaderIrOp(LopInst, Op, P2NNode);
Block.AddNode(GetPredNode(new ShaderIrAsg(P1Node, Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(P1Node, Op)));
Op = new ShaderIrOp(LopInst, P0Node, P2NNode); Op = new ShaderIrOp(LopInst, P0Node, P2NNode);
Block.AddNode(GetPredNode(new ShaderIrAsg(P0Node, Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(P0Node, Op)));
} }
public static void Rro_C(ShaderIrBlock Block, long OpCode, long Position) public static void Rro_C(ShaderIrBlock Block, long OpCode, long Position)
@ -441,33 +441,33 @@ namespace Ryujinx.Graphics.Gal.Shader
private static ShaderIrInst GetShrInst(long OpCode) private static ShaderIrInst GetShrInst(long OpCode)
{ {
bool Signed = ((OpCode >> 48) & 1) != 0; bool Signed = OpCode.Read(48);
return Signed ? ShaderIrInst.Asr : ShaderIrInst.Lsr; return Signed ? ShaderIrInst.Asr : ShaderIrInst.Lsr;
} }
public static void Vmad(ShaderIrBlock Block, long OpCode, long Position) public static void Vmad(ShaderIrBlock Block, long OpCode, long Position)
{ {
ShaderIrNode OperA = GetOperGpr8(OpCode); ShaderIrNode OperA = OpCode.Gpr8();
ShaderIrNode OperB; ShaderIrNode OperB;
if (((OpCode >> 50) & 1) != 0) if (OpCode.Read(50))
{ {
OperB = GetOperGpr20(OpCode); OperB = OpCode.Gpr20();
} }
else else
{ {
OperB = GetOperImm19_20(OpCode); OperB = OpCode.Imm19_20();
} }
ShaderIrOperGpr OperC = GetOperGpr39(OpCode); ShaderIrOperGpr OperC = OpCode.Gpr39();
ShaderIrNode Tmp = new ShaderIrOp(ShaderIrInst.Mul, OperA, OperB); ShaderIrNode Tmp = new ShaderIrOp(ShaderIrInst.Mul, OperA, OperB);
ShaderIrNode Final = new ShaderIrOp(ShaderIrInst.Add, Tmp, OperC); ShaderIrNode Final = new ShaderIrOp(ShaderIrInst.Add, Tmp, OperC);
int Shr = (int)((OpCode >> 51) & 3); int Shr = OpCode.Read(51, 3);
if (Shr != 0) if (Shr != 0)
{ {
@ -478,7 +478,7 @@ namespace Ryujinx.Graphics.Gal.Shader
Block.AddNode(new ShaderIrCmnt("Stubbed. Instruction is reduced to a * b + c")); Block.AddNode(new ShaderIrCmnt("Stubbed. Instruction is reduced to a * b + c"));
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Final), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Final)));
} }
public static void Xmad_CR(ShaderIrBlock Block, long OpCode, long Position) public static void Xmad_CR(ShaderIrBlock Block, long OpCode, long Position)
@ -507,20 +507,20 @@ namespace Ryujinx.Graphics.Gal.Shader
ShaderOper Oper, ShaderOper Oper,
ShaderIrInst Inst) ShaderIrInst Inst)
{ {
ShaderIrNode OperA = GetOperGpr8(OpCode), OperB; ShaderIrNode OperA = OpCode.Gpr8(), OperB;
switch (Oper) switch (Oper)
{ {
case ShaderOper.CR: OperB = GetOperCbuf34 (OpCode); break; case ShaderOper.CR: OperB = OpCode.Cbuf34(); break;
case ShaderOper.Imm: OperB = GetOperImm19_20(OpCode); break; case ShaderOper.Imm: OperB = OpCode.Imm19_20(); break;
case ShaderOper.RR: OperB = GetOperGpr20 (OpCode); break; case ShaderOper.RR: OperB = OpCode.Gpr20(); break;
default: throw new ArgumentException(nameof(Oper)); default: throw new ArgumentException(nameof(Oper));
} }
ShaderIrNode Op = new ShaderIrOp(Inst, OperA, OperB); ShaderIrNode Op = new ShaderIrOp(Inst, OperA, OperB);
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op)));
} }
private static void EmitBfe(ShaderIrBlock Block, long OpCode, ShaderOper Oper) private static void EmitBfe(ShaderIrBlock Block, long OpCode, ShaderOper Oper)
@ -528,23 +528,23 @@ namespace Ryujinx.Graphics.Gal.Shader
//TODO: Handle the case where position + length //TODO: Handle the case where position + length
//is greater than the word size, in this case the sign bit //is greater than the word size, in this case the sign bit
//needs to be replicated to fill the remaining space. //needs to be replicated to fill the remaining space.
bool NegB = ((OpCode >> 48) & 1) != 0; bool NegB = OpCode.Read(48);
bool NegA = ((OpCode >> 49) & 1) != 0; bool NegA = OpCode.Read(49);
ShaderIrNode OperA = GetOperGpr8(OpCode), OperB; ShaderIrNode OperA = OpCode.Gpr8(), OperB;
switch (Oper) switch (Oper)
{ {
case ShaderOper.CR: OperB = GetOperCbuf34 (OpCode); break; case ShaderOper.CR: OperB = OpCode.Cbuf34(); break;
case ShaderOper.Imm: OperB = GetOperImm19_20(OpCode); break; case ShaderOper.Imm: OperB = OpCode.Imm19_20(); break;
case ShaderOper.RR: OperB = GetOperGpr20 (OpCode); break; case ShaderOper.RR: OperB = OpCode.Gpr20(); break;
default: throw new ArgumentException(nameof(Oper)); default: throw new ArgumentException(nameof(Oper));
} }
ShaderIrNode Op; ShaderIrNode Op;
bool Signed = ((OpCode >> 48) & 1) != 0; //? bool Signed = OpCode.Read(48); //?
if (OperB is ShaderIrOperImm PosLen) if (OperB is ShaderIrOperImm PosLen)
{ {
@ -576,25 +576,25 @@ namespace Ryujinx.Graphics.Gal.Shader
Op = ExtendTo32(Op, Signed, OpLen); Op = ExtendTo32(Op, Signed, OpLen);
} }
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op)));
} }
private static void EmitFadd(ShaderIrBlock Block, long OpCode, ShaderOper Oper) private static void EmitFadd(ShaderIrBlock Block, long OpCode, ShaderOper Oper)
{ {
bool NegB = ((OpCode >> 45) & 1) != 0; bool NegB = OpCode.Read(45);
bool AbsA = ((OpCode >> 46) & 1) != 0; bool AbsA = OpCode.Read(46);
bool NegA = ((OpCode >> 48) & 1) != 0; bool NegA = OpCode.Read(48);
bool AbsB = ((OpCode >> 49) & 1) != 0; bool AbsB = OpCode.Read(49);
ShaderIrNode OperA = GetOperGpr8(OpCode), OperB; ShaderIrNode OperA = OpCode.Gpr8(), OperB;
OperA = GetAluFabsFneg(OperA, AbsA, NegA); OperA = GetAluFabsFneg(OperA, AbsA, NegA);
switch (Oper) switch (Oper)
{ {
case ShaderOper.CR: OperB = GetOperCbuf34 (OpCode); break; case ShaderOper.CR: OperB = OpCode.Cbuf34(); break;
case ShaderOper.Immf: OperB = GetOperImmf19_20(OpCode); break; case ShaderOper.Immf: OperB = OpCode.Immf19_20(); break;
case ShaderOper.RR: OperB = GetOperGpr20 (OpCode); break; case ShaderOper.RR: OperB = OpCode.Gpr20(); break;
default: throw new ArgumentException(nameof(Oper)); default: throw new ArgumentException(nameof(Oper));
} }
@ -603,20 +603,20 @@ namespace Ryujinx.Graphics.Gal.Shader
ShaderIrNode Op = new ShaderIrOp(ShaderIrInst.Fadd, OperA, OperB); ShaderIrNode Op = new ShaderIrOp(ShaderIrInst.Fadd, OperA, OperB);
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op)));
} }
private static void EmitFmul(ShaderIrBlock Block, long OpCode, ShaderOper Oper) private static void EmitFmul(ShaderIrBlock Block, long OpCode, ShaderOper Oper)
{ {
bool NegB = ((OpCode >> 48) & 1) != 0; bool NegB = OpCode.Read(48);
ShaderIrNode OperA = GetOperGpr8(OpCode), OperB; ShaderIrNode OperA = OpCode.Gpr8(), OperB;
switch (Oper) switch (Oper)
{ {
case ShaderOper.CR: OperB = GetOperCbuf34 (OpCode); break; case ShaderOper.CR: OperB = OpCode.Cbuf34(); break;
case ShaderOper.Immf: OperB = GetOperImmf19_20(OpCode); break; case ShaderOper.Immf: OperB = OpCode.Immf19_20(); break;
case ShaderOper.RR: OperB = GetOperGpr20 (OpCode); break; case ShaderOper.RR: OperB = OpCode.Gpr20(); break;
default: throw new ArgumentException(nameof(Oper)); default: throw new ArgumentException(nameof(Oper));
} }
@ -625,22 +625,22 @@ namespace Ryujinx.Graphics.Gal.Shader
ShaderIrNode Op = new ShaderIrOp(ShaderIrInst.Fmul, OperA, OperB); ShaderIrNode Op = new ShaderIrOp(ShaderIrInst.Fmul, OperA, OperB);
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op)));
} }
private static void EmitFfma(ShaderIrBlock Block, long OpCode, ShaderOper Oper) private static void EmitFfma(ShaderIrBlock Block, long OpCode, ShaderOper Oper)
{ {
bool NegB = ((OpCode >> 48) & 1) != 0; bool NegB = OpCode.Read(48);
bool NegC = ((OpCode >> 49) & 1) != 0; bool NegC = OpCode.Read(49);
ShaderIrNode OperA = GetOperGpr8(OpCode), OperB, OperC; ShaderIrNode OperA = OpCode.Gpr8(), OperB, OperC;
switch (Oper) switch (Oper)
{ {
case ShaderOper.CR: OperB = GetOperCbuf34 (OpCode); break; case ShaderOper.CR: OperB = OpCode.Cbuf34(); break;
case ShaderOper.Immf: OperB = GetOperImmf19_20(OpCode); break; case ShaderOper.Immf: OperB = OpCode.Immf19_20(); break;
case ShaderOper.RC: OperB = GetOperGpr39 (OpCode); break; case ShaderOper.RC: OperB = OpCode.Gpr39(); break;
case ShaderOper.RR: OperB = GetOperGpr20 (OpCode); break; case ShaderOper.RR: OperB = OpCode.Gpr20(); break;
default: throw new ArgumentException(nameof(Oper)); default: throw new ArgumentException(nameof(Oper));
} }
@ -649,62 +649,62 @@ namespace Ryujinx.Graphics.Gal.Shader
if (Oper == ShaderOper.RC) if (Oper == ShaderOper.RC)
{ {
OperC = GetAluFneg(GetOperCbuf34(OpCode), NegC); OperC = GetAluFneg(OpCode.Cbuf34(), NegC);
} }
else else
{ {
OperC = GetAluFneg(GetOperGpr39(OpCode), NegC); OperC = GetAluFneg(OpCode.Gpr39(), NegC);
} }
ShaderIrOp Op = new ShaderIrOp(ShaderIrInst.Ffma, OperA, OperB, OperC); ShaderIrOp Op = new ShaderIrOp(ShaderIrInst.Ffma, OperA, OperB, OperC);
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op)));
} }
private static void EmitIadd(ShaderIrBlock Block, long OpCode, ShaderOper Oper) private static void EmitIadd(ShaderIrBlock Block, long OpCode, ShaderOper Oper)
{ {
ShaderIrNode OperA = GetOperGpr8(OpCode); ShaderIrNode OperA = OpCode.Gpr8();
ShaderIrNode OperB; ShaderIrNode OperB;
switch (Oper) switch (Oper)
{ {
case ShaderOper.CR: OperB = GetOperCbuf34 (OpCode); break; case ShaderOper.CR: OperB = OpCode.Cbuf34(); break;
case ShaderOper.Imm: OperB = GetOperImm19_20(OpCode); break; case ShaderOper.Imm: OperB = OpCode.Imm19_20(); break;
case ShaderOper.RR: OperB = GetOperGpr20 (OpCode); break; case ShaderOper.RR: OperB = OpCode.Gpr20(); break;
default: throw new ArgumentException(nameof(Oper)); default: throw new ArgumentException(nameof(Oper));
} }
bool NegA = ((OpCode >> 49) & 1) != 0; bool NegA = OpCode.Read(49);
bool NegB = ((OpCode >> 48) & 1) != 0; bool NegB = OpCode.Read(48);
OperA = GetAluIneg(OperA, NegA); OperA = GetAluIneg(OperA, NegA);
OperB = GetAluIneg(OperB, NegB); OperB = GetAluIneg(OperB, NegB);
ShaderIrOp Op = new ShaderIrOp(ShaderIrInst.Add, OperA, OperB); ShaderIrOp Op = new ShaderIrOp(ShaderIrInst.Add, OperA, OperB);
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op)));
} }
private static void EmitIadd3(ShaderIrBlock Block, long OpCode, ShaderOper Oper) private static void EmitIadd3(ShaderIrBlock Block, long OpCode, ShaderOper Oper)
{ {
int Mode = (int)((OpCode >> 37) & 3); int Mode = OpCode.Read(37, 3);
bool Neg1 = ((OpCode >> 51) & 1) != 0; bool Neg1 = OpCode.Read(51);
bool Neg2 = ((OpCode >> 50) & 1) != 0; bool Neg2 = OpCode.Read(50);
bool Neg3 = ((OpCode >> 49) & 1) != 0; bool Neg3 = OpCode.Read(49);
int Height1 = (int)((OpCode >> 35) & 3); int Height1 = OpCode.Read(35, 3);
int Height2 = (int)((OpCode >> 33) & 3); int Height2 = OpCode.Read(33, 3);
int Height3 = (int)((OpCode >> 31) & 3); int Height3 = OpCode.Read(31, 3);
ShaderIrNode OperB; ShaderIrNode OperB;
switch (Oper) switch (Oper)
{ {
case ShaderOper.CR: OperB = GetOperCbuf34 (OpCode); break; case ShaderOper.CR: OperB = OpCode.Cbuf34(); break;
case ShaderOper.Imm: OperB = GetOperImm19_20(OpCode); break; case ShaderOper.Imm: OperB = OpCode.Imm19_20(); break;
case ShaderOper.RR: OperB = GetOperGpr20 (OpCode); break; case ShaderOper.RR: OperB = OpCode.Gpr20(); break;
default: throw new ArgumentException(nameof(Oper)); default: throw new ArgumentException(nameof(Oper));
} }
@ -726,9 +726,9 @@ namespace Ryujinx.Graphics.Gal.Shader
} }
} }
ShaderIrNode Src1 = GetAluIneg(ApplyHeight(GetOperGpr8(OpCode), Height1), Neg1); ShaderIrNode Src1 = GetAluIneg(ApplyHeight(OpCode.Gpr8(), Height1), Neg1);
ShaderIrNode Src2 = GetAluIneg(ApplyHeight(OperB, Height2), Neg2); ShaderIrNode Src2 = GetAluIneg(ApplyHeight(OperB, Height2), Neg2);
ShaderIrNode Src3 = GetAluIneg(ApplyHeight(GetOperGpr39(OpCode), Height3), Neg3); ShaderIrNode Src3 = GetAluIneg(ApplyHeight(OpCode.Gpr39(), Height3), Neg3);
ShaderIrOp Sum = new ShaderIrOp(ShaderIrInst.Add, Src1, Src2); ShaderIrOp Sum = new ShaderIrOp(ShaderIrInst.Add, Src1, Src2);
@ -744,23 +744,23 @@ namespace Ryujinx.Graphics.Gal.Shader
//Note: Here there should be a "+ 1" when carry flag is set //Note: Here there should be a "+ 1" when carry flag is set
//but since carry is mostly ignored by other instructions, it's excluded for now //but since carry is mostly ignored by other instructions, it's excluded for now
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), new ShaderIrOp(ShaderIrInst.Add, Sum, Src3)), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), new ShaderIrOp(ShaderIrInst.Add, Sum, Src3))));
} }
private static void EmitIscadd(ShaderIrBlock Block, long OpCode, ShaderOper Oper) private static void EmitIscadd(ShaderIrBlock Block, long OpCode, ShaderOper Oper)
{ {
bool NegB = ((OpCode >> 48) & 1) != 0; bool NegB = OpCode.Read(48);
bool NegA = ((OpCode >> 49) & 1) != 0; bool NegA = OpCode.Read(49);
ShaderIrNode OperA = GetOperGpr8(OpCode), OperB; ShaderIrNode OperA = OpCode.Gpr8(), OperB;
ShaderIrOperImm Scale = GetOperImm5_39(OpCode); ShaderIrOperImm Scale = OpCode.Imm5_39();
switch (Oper) switch (Oper)
{ {
case ShaderOper.CR: OperB = GetOperCbuf34 (OpCode); break; case ShaderOper.CR: OperB = OpCode.Cbuf34(); break;
case ShaderOper.Imm: OperB = GetOperImm19_20(OpCode); break; case ShaderOper.Imm: OperB = OpCode.Imm19_20(); break;
case ShaderOper.RR: OperB = GetOperGpr20 (OpCode); break; case ShaderOper.RR: OperB = OpCode.Gpr20(); break;
default: throw new ArgumentException(nameof(Oper)); default: throw new ArgumentException(nameof(Oper));
} }
@ -771,7 +771,7 @@ namespace Ryujinx.Graphics.Gal.Shader
ShaderIrOp ScaleOp = new ShaderIrOp(ShaderIrInst.Lsl, OperA, Scale); ShaderIrOp ScaleOp = new ShaderIrOp(ShaderIrInst.Lsl, OperA, Scale);
ShaderIrOp AddOp = new ShaderIrOp(ShaderIrInst.Add, OperB, ScaleOp); ShaderIrOp AddOp = new ShaderIrOp(ShaderIrInst.Add, OperB, ScaleOp);
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), AddOp), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), AddOp)));
} }
private static void EmitFmnmx(ShaderIrBlock Block, long OpCode, ShaderOper Oper) private static void EmitFmnmx(ShaderIrBlock Block, long OpCode, ShaderOper Oper)
@ -786,12 +786,12 @@ namespace Ryujinx.Graphics.Gal.Shader
private static void EmitMnmx(ShaderIrBlock Block, long OpCode, bool IsFloat, ShaderOper Oper) private static void EmitMnmx(ShaderIrBlock Block, long OpCode, bool IsFloat, ShaderOper Oper)
{ {
bool NegB = ((OpCode >> 45) & 1) != 0; bool NegB = OpCode.Read(45);
bool AbsA = ((OpCode >> 46) & 1) != 0; bool AbsA = OpCode.Read(46);
bool NegA = ((OpCode >> 48) & 1) != 0; bool NegA = OpCode.Read(48);
bool AbsB = ((OpCode >> 49) & 1) != 0; bool AbsB = OpCode.Read(49);
ShaderIrNode OperA = GetOperGpr8(OpCode), OperB; ShaderIrNode OperA = OpCode.Gpr8(), OperB;
if (IsFloat) if (IsFloat)
{ {
@ -804,10 +804,10 @@ namespace Ryujinx.Graphics.Gal.Shader
switch (Oper) switch (Oper)
{ {
case ShaderOper.CR: OperB = GetOperCbuf34 (OpCode); break; case ShaderOper.CR: OperB = OpCode.Cbuf34(); break;
case ShaderOper.Imm: OperB = GetOperImm19_20 (OpCode); break; case ShaderOper.Imm: OperB = OpCode.Imm19_20(); break;
case ShaderOper.Immf: OperB = GetOperImmf19_20(OpCode); break; case ShaderOper.Immf: OperB = OpCode.Immf19_20(); break;
case ShaderOper.RR: OperB = GetOperGpr20 (OpCode); break; case ShaderOper.RR: OperB = OpCode.Gpr20(); break;
default: throw new ArgumentException(nameof(Oper)); default: throw new ArgumentException(nameof(Oper));
} }
@ -821,7 +821,7 @@ namespace Ryujinx.Graphics.Gal.Shader
OperB = GetAluIabsIneg(OperB, AbsB, NegB); OperB = GetAluIabsIneg(OperB, AbsB, NegB);
} }
ShaderIrOperPred Pred = GetOperPred39(OpCode); ShaderIrOperPred Pred = OpCode.Pred39();
ShaderIrOp Op; ShaderIrOp Op;
@ -830,26 +830,26 @@ namespace Ryujinx.Graphics.Gal.Shader
if (Pred.IsConst) if (Pred.IsConst)
{ {
bool IsMax = ((OpCode >> 42) & 1) != 0; bool IsMax = OpCode.Read(42);
Op = new ShaderIrOp(IsMax Op = new ShaderIrOp(IsMax
? MaxInst ? MaxInst
: MinInst, OperA, OperB); : MinInst, OperA, OperB);
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op)));
} }
else else
{ {
ShaderIrNode PredN = GetOperPred39N(OpCode); ShaderIrNode PredN = OpCode.Pred39N();
ShaderIrOp OpMax = new ShaderIrOp(MaxInst, OperA, OperB); ShaderIrOp OpMax = new ShaderIrOp(MaxInst, OperA, OperB);
ShaderIrOp OpMin = new ShaderIrOp(MinInst, OperA, OperB); ShaderIrOp OpMin = new ShaderIrOp(MinInst, OperA, OperB);
ShaderIrAsg AsgMax = new ShaderIrAsg(GetOperGpr0(OpCode), OpMax); ShaderIrAsg AsgMax = new ShaderIrAsg(OpCode.Gpr0(), OpMax);
ShaderIrAsg AsgMin = new ShaderIrAsg(GetOperGpr0(OpCode), OpMin); ShaderIrAsg AsgMin = new ShaderIrAsg(OpCode.Gpr0(), OpMin);
Block.AddNode(GetPredNode(new ShaderIrCond(PredN, AsgMax, Not: true), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrCond(PredN, AsgMax, Not: true)));
Block.AddNode(GetPredNode(new ShaderIrCond(PredN, AsgMin, Not: false), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrCond(PredN, AsgMin, Not: false)));
} }
} }
@ -857,16 +857,16 @@ namespace Ryujinx.Graphics.Gal.Shader
{ {
//Note: this is a range reduction instruction and is supposed to //Note: this is a range reduction instruction and is supposed to
//be used with Mufu, here it just moves the value and ignores the operation. //be used with Mufu, here it just moves the value and ignores the operation.
bool NegA = ((OpCode >> 45) & 1) != 0; bool NegA = OpCode.Read(45);
bool AbsA = ((OpCode >> 49) & 1) != 0; bool AbsA = OpCode.Read(49);
ShaderIrNode OperA; ShaderIrNode OperA;
switch (Oper) switch (Oper)
{ {
case ShaderOper.CR: OperA = GetOperCbuf34 (OpCode); break; case ShaderOper.CR: OperA = OpCode.Cbuf34(); break;
case ShaderOper.Immf: OperA = GetOperImmf19_20(OpCode); break; case ShaderOper.Immf: OperA = OpCode.Immf19_20(); break;
case ShaderOper.RR: OperA = GetOperGpr20 (OpCode); break; case ShaderOper.RR: OperA = OpCode.Gpr20(); break;
default: throw new ArgumentException(nameof(Oper)); default: throw new ArgumentException(nameof(Oper));
} }
@ -875,7 +875,7 @@ namespace Ryujinx.Graphics.Gal.Shader
Block.AddNode(new ShaderIrCmnt("Stubbed.")); Block.AddNode(new ShaderIrCmnt("Stubbed."));
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), OperA), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), OperA)));
} }
private static void EmitFset(ShaderIrBlock Block, long OpCode, ShaderOper Oper) private static void EmitFset(ShaderIrBlock Block, long OpCode, ShaderOper Oper)
@ -890,21 +890,21 @@ namespace Ryujinx.Graphics.Gal.Shader
private static void EmitSet(ShaderIrBlock Block, long OpCode, bool IsFloat, ShaderOper Oper) private static void EmitSet(ShaderIrBlock Block, long OpCode, bool IsFloat, ShaderOper Oper)
{ {
bool NegA = ((OpCode >> 43) & 1) != 0; bool NegA = OpCode.Read(43);
bool AbsB = ((OpCode >> 44) & 1) != 0; bool AbsB = OpCode.Read(44);
bool NegB = ((OpCode >> 53) & 1) != 0; bool NegB = OpCode.Read(53);
bool AbsA = ((OpCode >> 54) & 1) != 0; bool AbsA = OpCode.Read(54);
bool BoolFloat = ((OpCode >> (IsFloat ? 52 : 44)) & 1) != 0; bool BoolFloat = OpCode.Read(IsFloat ? 52 : 44);
ShaderIrNode OperA = GetOperGpr8(OpCode), OperB; ShaderIrNode OperA = OpCode.Gpr8(), OperB;
switch (Oper) switch (Oper)
{ {
case ShaderOper.CR: OperB = GetOperCbuf34 (OpCode); break; case ShaderOper.CR: OperB = OpCode.Cbuf34(); break;
case ShaderOper.Imm: OperB = GetOperImm19_20 (OpCode); break; case ShaderOper.Imm: OperB = OpCode.Imm19_20(); break;
case ShaderOper.Immf: OperB = GetOperImmf19_20(OpCode); break; case ShaderOper.Immf: OperB = OpCode.Immf19_20(); break;
case ShaderOper.RR: OperB = GetOperGpr20 (OpCode); break; case ShaderOper.RR: OperB = OpCode.Gpr20(); break;
default: throw new ArgumentException(nameof(Oper)); default: throw new ArgumentException(nameof(Oper));
} }
@ -916,18 +916,18 @@ namespace Ryujinx.Graphics.Gal.Shader
OperA = GetAluFabsFneg(OperA, AbsA, NegA); OperA = GetAluFabsFneg(OperA, AbsA, NegA);
OperB = GetAluFabsFneg(OperB, AbsB, NegB); OperB = GetAluFabsFneg(OperB, AbsB, NegB);
CmpInst = GetCmpF(OpCode); CmpInst = OpCode.CmpF();
} }
else else
{ {
CmpInst = GetCmp(OpCode); CmpInst = OpCode.Cmp();
} }
ShaderIrOp Op = new ShaderIrOp(CmpInst, OperA, OperB); ShaderIrOp Op = new ShaderIrOp(CmpInst, OperA, OperB);
ShaderIrInst LopInst = GetBLop45(OpCode); ShaderIrInst LopInst = OpCode.BLop45();
ShaderIrOperPred PNode = GetOperPred39(OpCode); ShaderIrOperPred PNode = OpCode.Pred39();
ShaderIrNode Imm0, Imm1; ShaderIrNode Imm0, Imm1;
@ -942,8 +942,8 @@ namespace Ryujinx.Graphics.Gal.Shader
Imm1 = new ShaderIrOperImm(-1); Imm1 = new ShaderIrOperImm(-1);
} }
ShaderIrNode Asg0 = new ShaderIrAsg(GetOperGpr0(OpCode), Imm0); ShaderIrNode Asg0 = new ShaderIrAsg(OpCode.Gpr0(), Imm0);
ShaderIrNode Asg1 = new ShaderIrAsg(GetOperGpr0(OpCode), Imm1); ShaderIrNode Asg1 = new ShaderIrAsg(OpCode.Gpr0(), Imm1);
if (LopInst != ShaderIrInst.Band || !PNode.IsConst) if (LopInst != ShaderIrInst.Band || !PNode.IsConst)
{ {
@ -958,8 +958,8 @@ namespace Ryujinx.Graphics.Gal.Shader
Asg1 = new ShaderIrCond(Op, Asg1, Not: false); Asg1 = new ShaderIrCond(Op, Asg1, Not: false);
} }
Block.AddNode(GetPredNode(Asg0, OpCode)); Block.AddNode(OpCode.PredNode(Asg0));
Block.AddNode(GetPredNode(Asg1, OpCode)); Block.AddNode(OpCode.PredNode(Asg1));
} }
private static void EmitFsetp(ShaderIrBlock Block, long OpCode, ShaderOper Oper) private static void EmitFsetp(ShaderIrBlock Block, long OpCode, ShaderOper Oper)
@ -974,19 +974,19 @@ namespace Ryujinx.Graphics.Gal.Shader
private static void EmitSetp(ShaderIrBlock Block, long OpCode, bool IsFloat, ShaderOper Oper) private static void EmitSetp(ShaderIrBlock Block, long OpCode, bool IsFloat, ShaderOper Oper)
{ {
bool AbsA = ((OpCode >> 7) & 1) != 0; bool AbsA = OpCode.Read(7);
bool NegP = ((OpCode >> 42) & 1) != 0; bool NegP = OpCode.Read(42);
bool NegA = ((OpCode >> 43) & 1) != 0; bool NegA = OpCode.Read(43);
bool AbsB = ((OpCode >> 44) & 1) != 0; bool AbsB = OpCode.Read(44);
ShaderIrNode OperA = GetOperGpr8(OpCode), OperB; ShaderIrNode OperA = OpCode.Gpr8(), OperB;
switch (Oper) switch (Oper)
{ {
case ShaderOper.CR: OperB = GetOperCbuf34 (OpCode); break; case ShaderOper.CR: OperB = OpCode.Cbuf34(); break;
case ShaderOper.Imm: OperB = GetOperImm19_20 (OpCode); break; case ShaderOper.Imm: OperB = OpCode.Imm19_20(); break;
case ShaderOper.Immf: OperB = GetOperImmf19_20(OpCode); break; case ShaderOper.Immf: OperB = OpCode.Immf19_20(); break;
case ShaderOper.RR: OperB = GetOperGpr20 (OpCode); break; case ShaderOper.RR: OperB = OpCode.Gpr20(); break;
default: throw new ArgumentException(nameof(Oper)); default: throw new ArgumentException(nameof(Oper));
} }
@ -998,22 +998,22 @@ namespace Ryujinx.Graphics.Gal.Shader
OperA = GetAluFabsFneg(OperA, AbsA, NegA); OperA = GetAluFabsFneg(OperA, AbsA, NegA);
OperB = GetAluFabs (OperB, AbsB); OperB = GetAluFabs (OperB, AbsB);
CmpInst = GetCmpF(OpCode); CmpInst = OpCode.CmpF();
} }
else else
{ {
CmpInst = GetCmp(OpCode); CmpInst = OpCode.Cmp();
} }
ShaderIrOp Op = new ShaderIrOp(CmpInst, OperA, OperB); ShaderIrOp Op = new ShaderIrOp(CmpInst, OperA, OperB);
ShaderIrOperPred P0Node = GetOperPred3 (OpCode); ShaderIrOperPred P0Node = OpCode.Pred3();
ShaderIrOperPred P1Node = GetOperPred0 (OpCode); ShaderIrOperPred P1Node = OpCode.Pred0();
ShaderIrOperPred P2Node = GetOperPred39(OpCode); ShaderIrOperPred P2Node = OpCode.Pred39();
Block.AddNode(GetPredNode(new ShaderIrAsg(P0Node, Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(P0Node, Op)));
ShaderIrInst LopInst = GetBLop45(OpCode); ShaderIrInst LopInst = OpCode.BLop45();
if (LopInst == ShaderIrInst.Band && P1Node.IsConst && P2Node.IsConst) if (LopInst == ShaderIrInst.Band && P1Node.IsConst && P2Node.IsConst)
{ {
@ -1031,19 +1031,19 @@ namespace Ryujinx.Graphics.Gal.Shader
Op = new ShaderIrOp(LopInst, Op, P2NNode); Op = new ShaderIrOp(LopInst, Op, P2NNode);
Block.AddNode(GetPredNode(new ShaderIrAsg(P1Node, Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(P1Node, Op)));
Op = new ShaderIrOp(LopInst, P0Node, P2NNode); Op = new ShaderIrOp(LopInst, P0Node, P2NNode);
Block.AddNode(GetPredNode(new ShaderIrAsg(P0Node, Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(P0Node, Op)));
} }
private static void EmitLop(ShaderIrBlock Block, long OpCode, ShaderOper Oper) private static void EmitLop(ShaderIrBlock Block, long OpCode, ShaderOper Oper)
{ {
int SubOp = (int)(OpCode >> 41) & 3; int SubOp = OpCode.Read(41, 3);
bool InvA = ((OpCode >> 39) & 1) != 0; bool InvA = OpCode.Read(39);
bool InvB = ((OpCode >> 40) & 1) != 0; bool InvB = OpCode.Read(40);
ShaderIrInst Inst = 0; ShaderIrInst Inst = 0;
@ -1054,14 +1054,14 @@ namespace Ryujinx.Graphics.Gal.Shader
case 2: Inst = ShaderIrInst.Xor; break; case 2: Inst = ShaderIrInst.Xor; break;
} }
ShaderIrNode OperA = GetAluNot(GetOperGpr8(OpCode), InvA); ShaderIrNode OperA = GetAluNot(OpCode.Gpr8(), InvA);
ShaderIrNode OperB; ShaderIrNode OperB;
switch (Oper) switch (Oper)
{ {
case ShaderOper.CR: OperB = GetOperCbuf34 (OpCode); break; case ShaderOper.CR: OperB = OpCode.Cbuf34(); break;
case ShaderOper.Imm: OperB = GetOperImm19_20(OpCode); break; case ShaderOper.Imm: OperB = OpCode.Imm19_20(); break;
case ShaderOper.RR: OperB = GetOperGpr20 (OpCode); break; case ShaderOper.RR: OperB = OpCode.Gpr20(); break;
default: throw new ArgumentException(nameof(Oper)); default: throw new ArgumentException(nameof(Oper));
} }
@ -1081,23 +1081,23 @@ namespace Ryujinx.Graphics.Gal.Shader
ShaderIrNode Compare = new ShaderIrOp(ShaderIrInst.Cne, Op, new ShaderIrOperImm(0)); ShaderIrNode Compare = new ShaderIrOp(ShaderIrInst.Cne, Op, new ShaderIrOperImm(0));
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperPred48(OpCode), Compare), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Pred48(), Compare)));
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op)));
} }
private static void EmitXmad(ShaderIrBlock Block, long OpCode, ShaderOper Oper) private static void EmitXmad(ShaderIrBlock Block, long OpCode, ShaderOper Oper)
{ {
//TODO: Confirm SignAB/C, it is just a guess. //TODO: Confirm SignAB/C, it is just a guess.
//TODO: Implement Mode 3 (CSFU), what it does? //TODO: Implement Mode 3 (CSFU), what it does?
bool SignAB = ((OpCode >> 48) & 1) != 0; bool SignAB = OpCode.Read(48);
bool SignC = ((OpCode >> 49) & 1) != 0; bool SignC = OpCode.Read(49);
bool HighB = ((OpCode >> 52) & 1) != 0; bool HighB = OpCode.Read(52);
bool HighA = ((OpCode >> 53) & 1) != 0; bool HighA = OpCode.Read(53);
int Mode = (int)(OpCode >> 50) & 7; int Mode = OpCode.Read(50, 7);
ShaderIrNode OperA = GetOperGpr8(OpCode), OperB, OperC; ShaderIrNode OperA = OpCode.Gpr8(), OperB, OperC;
ShaderIrOperImm Imm16 = new ShaderIrOperImm(16); ShaderIrOperImm Imm16 = new ShaderIrOperImm(16);
ShaderIrOperImm ImmMsk = new ShaderIrOperImm(0xffff); ShaderIrOperImm ImmMsk = new ShaderIrOperImm(0xffff);
@ -1112,10 +1112,10 @@ namespace Ryujinx.Graphics.Gal.Shader
switch (Oper) switch (Oper)
{ {
case ShaderOper.CR: OperB = GetOperCbuf34 (OpCode); break; case ShaderOper.CR: OperB = OpCode.Cbuf34(); break;
case ShaderOper.Imm: OperB = GetOperImm19_20(OpCode); break; case ShaderOper.Imm: OperB = OpCode.Imm19_20(); break;
case ShaderOper.RC: OperB = GetOperGpr39 (OpCode); break; case ShaderOper.RC: OperB = OpCode.Gpr39(); break;
case ShaderOper.RR: OperB = GetOperGpr20 (OpCode); break; case ShaderOper.RR: OperB = OpCode.Gpr20(); break;
default: throw new ArgumentException(nameof(Oper)); default: throw new ArgumentException(nameof(Oper));
} }
@ -1124,14 +1124,14 @@ namespace Ryujinx.Graphics.Gal.Shader
if (Oper == ShaderOper.RC) if (Oper == ShaderOper.RC)
{ {
OperC = GetOperCbuf34(OpCode); OperC = OpCode.Cbuf34();
} }
else else
{ {
OperC = GetOperGpr39(OpCode); OperC = OpCode.Gpr39();
ProductShiftLeft = ((OpCode >> 36) & 1) != 0; ProductShiftLeft = OpCode.Read(36);
Merge = ((OpCode >> 37) & 1) != 0; Merge = OpCode.Read(37);
} }
switch (Mode) switch (Mode)
@ -1172,7 +1172,7 @@ namespace Ryujinx.Graphics.Gal.Shader
AddOp = new ShaderIrOp(ShaderIrInst.Or, AddOp, OperB); AddOp = new ShaderIrOp(ShaderIrInst.Or, AddOp, OperB);
} }
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), AddOp), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), AddOp)));
} }
} }
} }

12
Ryujinx.Graphics/Gal/Shader/ShaderDecodeFlow.cs
View file

@ -15,11 +15,11 @@ namespace Ryujinx.Graphics.Gal.Shader
throw new NotImplementedException(); throw new NotImplementedException();
} }
int Target = ((int)(OpCode >> 20) << 8) >> 8; int Target = OpCode.Branch();
ShaderIrOperImm Imm = new ShaderIrOperImm(Target); ShaderIrOperImm Imm = new ShaderIrOperImm(Target);
Block.AddNode(GetPredNode(new ShaderIrOp(ShaderIrInst.Bra, Imm), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrOp(ShaderIrInst.Bra, Imm)));
} }
public static void Exit(ShaderIrBlock Block, long OpCode, long Position) public static void Exit(ShaderIrBlock Block, long OpCode, long Position)
@ -29,14 +29,14 @@ namespace Ryujinx.Graphics.Gal.Shader
//TODO: Figure out what the other condition codes mean... //TODO: Figure out what the other condition codes mean...
if (CCode == 0xf) if (CCode == 0xf)
{ {
Block.AddNode(GetPredNode(new ShaderIrOp(ShaderIrInst.Exit), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrOp(ShaderIrInst.Exit)));
} }
} }
public static void Kil(ShaderIrBlock Block, long OpCode, long Position) public static void Kil(ShaderIrBlock Block, long OpCode, long Position)
{ {
Block.AddNode(GetPredNode(new ShaderIrOp(ShaderIrInst.Kil), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrOp(ShaderIrInst.Kil)));
} }
public static void Ssy(ShaderIrBlock Block, long OpCode, long Position) public static void Ssy(ShaderIrBlock Block, long OpCode, long Position)
@ -48,7 +48,7 @@ namespace Ryujinx.Graphics.Gal.Shader
throw new NotImplementedException(); throw new NotImplementedException();
} }
int Offset = ((int)(OpCode >> 20) << 8) >> 8; int Offset = OpCode.Branch();
int Target = (int)(Position + Offset); int Target = (int)(Position + Offset);
@ -61,7 +61,7 @@ namespace Ryujinx.Graphics.Gal.Shader
{ {
//TODO: Implement Sync condition codes //TODO: Implement Sync condition codes
Block.AddNode(GetPredNode(new ShaderIrOp(ShaderIrInst.Sync), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrOp(ShaderIrInst.Sync)));
} }
} }
} }

238
Ryujinx.Graphics/Gal/Shader/ShaderDecodeHelper.cs
View file

@ -4,244 +4,6 @@ namespace Ryujinx.Graphics.Gal.Shader
{ {
static class ShaderDecodeHelper static class ShaderDecodeHelper
{ {
public static ShaderIrOperAbuf[] GetOperAbuf20(long OpCode)
{
int Abuf = (int)(OpCode >> 20) & 0x3ff;
int Size = (int)(OpCode >> 47) & 3;
ShaderIrOperGpr Vertex = GetOperGpr39(OpCode);
ShaderIrOperAbuf[] Opers = new ShaderIrOperAbuf[Size + 1];
for (int Index = 0; Index <= Size; Index++)
{
Opers[Index] = new ShaderIrOperAbuf(Abuf + Index * 4, Vertex);
}
return Opers;
}
public static ShaderIrOperAbuf GetOperAbuf28(long OpCode)
{
int Abuf = (int)(OpCode >> 28) & 0x3ff;
return new ShaderIrOperAbuf(Abuf, GetOperGpr39(OpCode));
}
public static ShaderIrOperCbuf GetOperCbuf34(long OpCode)
{
return new ShaderIrOperCbuf(
(int)(OpCode >> 34) & 0x1f,
(int)(OpCode >> 20) & 0x3fff);
}
public static ShaderIrOperGpr GetOperGpr8(long OpCode)
{
return new ShaderIrOperGpr((int)(OpCode >> 8) & 0xff);
}
public static ShaderIrOperGpr GetOperGpr20(long OpCode)
{
return new ShaderIrOperGpr((int)(OpCode >> 20) & 0xff);
}
public static ShaderIrOperGpr GetOperGpr39(long OpCode)
{
return new ShaderIrOperGpr((int)(OpCode >> 39) & 0xff);
}
public static ShaderIrOperGpr GetOperGpr0(long OpCode)
{
return new ShaderIrOperGpr((int)(OpCode >> 0) & 0xff);
}
public static ShaderIrOperGpr GetOperGpr28(long OpCode)
{
return new ShaderIrOperGpr((int)(OpCode >> 28) & 0xff);
}
public static ShaderIrOperImm GetOperImm5_39(long OpCode)
{
return new ShaderIrOperImm((int)(OpCode >> 39) & 0x1f);
}
public static ShaderIrOperImm GetOperImm13_36(long OpCode)
{
return new ShaderIrOperImm((int)(OpCode >> 36) & 0x1fff);
}
public static ShaderIrOperImm GetOperImm32_20(long OpCode)
{
return new ShaderIrOperImm((int)(OpCode >> 20));
}
public static ShaderIrOperImmf GetOperImmf32_20(long OpCode)
{
return new ShaderIrOperImmf(BitConverter.Int32BitsToSingle((int)(OpCode >> 20)));
}
public static ShaderIrOperImm GetOperImm19_20(long OpCode)
{
int Value = (int)(OpCode >> 20) & 0x7ffff;
bool Neg = ((OpCode >> 56) & 1) != 0;
if (Neg)
{
Value = -Value;
}
return new ShaderIrOperImm((int)Value);
}
public static ShaderIrOperImmf GetOperImmf19_20(long OpCode)
{
uint Imm = (uint)(OpCode >> 20) & 0x7ffff;
bool Neg = ((OpCode >> 56) & 1) != 0;
Imm <<= 12;
if (Neg)
{
Imm |= 0x80000000;
}
float Value = BitConverter.Int32BitsToSingle((int)Imm);
return new ShaderIrOperImmf(Value);
}
public static ShaderIrOperPred GetOperPred0(long OpCode)
{
return new ShaderIrOperPred((int)(OpCode >> 0) & 7);
}
public static ShaderIrOperPred GetOperPred3(long OpCode)
{
return new ShaderIrOperPred((int)(OpCode >> 3) & 7);
}
public static ShaderIrOperPred GetOperPred12(long OpCode)
{
return new ShaderIrOperPred((int)(OpCode >> 12) & 7);
}
public static ShaderIrOperPred GetOperPred29(long OpCode)
{
return new ShaderIrOperPred((int)(OpCode >> 29) & 7);
}
public static ShaderIrNode GetOperPred39N(long OpCode)
{
ShaderIrNode Node = GetOperPred39(OpCode);
if (((OpCode >> 42) & 1) != 0)
{
Node = new ShaderIrOp(ShaderIrInst.Bnot, Node);
}
return Node;
}
public static ShaderIrOperPred GetOperPred39(long OpCode)
{
return new ShaderIrOperPred((int)(OpCode >> 39) & 7);
}
public static ShaderIrOperPred GetOperPred48(long OpCode)
{
return new ShaderIrOperPred((int)((OpCode >> 48) & 7));
}
public static ShaderIrInst GetCmp(long OpCode)
{
switch ((int)(OpCode >> 49) & 7)
{
case 1: return ShaderIrInst.Clt;
case 2: return ShaderIrInst.Ceq;
case 3: return ShaderIrInst.Cle;
case 4: return ShaderIrInst.Cgt;
case 5: return ShaderIrInst.Cne;
case 6: return ShaderIrInst.Cge;
}
throw new ArgumentException(nameof(OpCode));
}
public static ShaderIrInst GetCmpF(long OpCode)
{
switch ((int)(OpCode >> 48) & 0xf)
{
case 0x1: return ShaderIrInst.Fclt;
case 0x2: return ShaderIrInst.Fceq;
case 0x3: return ShaderIrInst.Fcle;
case 0x4: return ShaderIrInst.Fcgt;
case 0x5: return ShaderIrInst.Fcne;
case 0x6: return ShaderIrInst.Fcge;
case 0x7: return ShaderIrInst.Fcnum;
case 0x8: return ShaderIrInst.Fcnan;
case 0x9: return ShaderIrInst.Fcltu;
case 0xa: return ShaderIrInst.Fcequ;
case 0xb: return ShaderIrInst.Fcleu;
case 0xc: return ShaderIrInst.Fcgtu;
case 0xd: return ShaderIrInst.Fcneu;
case 0xe: return ShaderIrInst.Fcgeu;
}
throw new ArgumentException(nameof(OpCode));
}
public static ShaderIrInst GetBLop45(long OpCode)
{
switch ((int)(OpCode >> 45) & 3)
{
case 0: return ShaderIrInst.Band;
case 1: return ShaderIrInst.Bor;
case 2: return ShaderIrInst.Bxor;
}
throw new ArgumentException(nameof(OpCode));
}
public static ShaderIrInst GetBLop24(long OpCode)
{
switch ((int)(OpCode >> 24) & 3)
{
case 0: return ShaderIrInst.Band;
case 1: return ShaderIrInst.Bor;
case 2: return ShaderIrInst.Bxor;
}
throw new ArgumentException(nameof(OpCode));
}
public static ShaderIrNode GetPredNode(ShaderIrNode Node, long OpCode)
{
ShaderIrOperPred Pred = GetPredNode(OpCode);
if (Pred.Index != ShaderIrOperPred.UnusedIndex)
{
bool Inv = ((OpCode >> 19) & 1) != 0;
Node = new ShaderIrCond(Pred, Node, Inv);
}
return Node;
}
private static ShaderIrOperPred GetPredNode(long OpCode)
{
int Pred = (int)(OpCode >> 16) & 0xf;
if (Pred != 0xf)
{
Pred &= 7;
}
return new ShaderIrOperPred(Pred);
}
public static ShaderIrNode GetAluFabsFneg(ShaderIrNode Node, bool Abs, bool Neg) public static ShaderIrNode GetAluFabsFneg(ShaderIrNode Node, bool Abs, bool Neg)
{ {
return GetAluFneg(GetAluFabs(Node, Abs), Neg); return GetAluFneg(GetAluFabs(Node, Abs), Neg);

76
Ryujinx.Graphics/Gal/Shader/ShaderDecodeMem.cs
View file

@ -33,28 +33,28 @@ namespace Ryujinx.Graphics.Gal.Shader
public static void Ld_A(ShaderIrBlock Block, long OpCode, long Position) public static void Ld_A(ShaderIrBlock Block, long OpCode, long Position)
{ {
ShaderIrNode[] Opers = GetOperAbuf20(OpCode); ShaderIrNode[] Opers = OpCode.Abuf20();
//Used by GS //Used by GS
ShaderIrOperGpr Vertex = GetOperGpr39(OpCode); ShaderIrOperGpr Vertex = OpCode.Gpr39();
int Index = 0; int Index = 0;
foreach (ShaderIrNode OperA in Opers) foreach (ShaderIrNode OperA in Opers)
{ {
ShaderIrOperGpr OperD = GetOperGpr0(OpCode); ShaderIrOperGpr OperD = OpCode.Gpr0();
OperD.Index += Index++; OperD.Index += Index++;
Block.AddNode(GetPredNode(new ShaderIrAsg(OperD, OperA), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OperD, OperA)));
} }
} }
public static void Ld_C(ShaderIrBlock Block, long OpCode, long Position) public static void Ld_C(ShaderIrBlock Block, long OpCode, long Position)
{ {
int CbufPos = (int)(OpCode >> 22) & 0x3fff; int CbufPos = OpCode.Read(22, 0x3fff);
int CbufIndex = (int)(OpCode >> 36) & 0x1f; int CbufIndex = OpCode.Read(36, 0x1f);
int Type = (int)(OpCode >> 48) & 7; int Type = OpCode.Read(48, 7);
if (Type > 5) if (Type > 5)
{ {
@ -63,7 +63,7 @@ namespace Ryujinx.Graphics.Gal.Shader
ShaderIrOperGpr Temp = ShaderIrOperGpr.MakeTemporary(); ShaderIrOperGpr Temp = ShaderIrOperGpr.MakeTemporary();
Block.AddNode(new ShaderIrAsg(Temp, GetOperGpr8(OpCode))); Block.AddNode(new ShaderIrAsg(Temp, OpCode.Gpr8()));
int Count = Type == 5 ? 2 : 1; int Count = Type == 5 ? 2 : 1;
@ -71,7 +71,7 @@ namespace Ryujinx.Graphics.Gal.Shader
{ {
ShaderIrOperCbuf OperA = new ShaderIrOperCbuf(CbufIndex, CbufPos, Temp); ShaderIrOperCbuf OperA = new ShaderIrOperCbuf(CbufIndex, CbufPos, Temp);
ShaderIrOperGpr OperD = GetOperGpr0(OpCode); ShaderIrOperGpr OperD = OpCode.Gpr0();
OperA.Pos += Index; OperA.Pos += Index;
OperD.Index += Index; OperD.Index += Index;
@ -93,43 +93,43 @@ namespace Ryujinx.Graphics.Gal.Shader
Node = ExtendTo32(Node, Signed, Size); Node = ExtendTo32(Node, Signed, Size);
} }
Block.AddNode(GetPredNode(new ShaderIrAsg(OperD, Node), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OperD, Node)));
} }
} }
public static void St_A(ShaderIrBlock Block, long OpCode, long Position) public static void St_A(ShaderIrBlock Block, long OpCode, long Position)
{ {
ShaderIrNode[] Opers = GetOperAbuf20(OpCode); ShaderIrNode[] Opers = OpCode.Abuf20();
int Index = 0; int Index = 0;
foreach (ShaderIrNode OperA in Opers) foreach (ShaderIrNode OperA in Opers)
{ {
ShaderIrOperGpr OperD = GetOperGpr0(OpCode); ShaderIrOperGpr OperD = OpCode.Gpr0();
OperD.Index += Index++; OperD.Index += Index++;
Block.AddNode(GetPredNode(new ShaderIrAsg(OperA, OperD), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OperA, OperD)));
} }
} }
public static void Texq(ShaderIrBlock Block, long OpCode, long Position) public static void Texq(ShaderIrBlock Block, long OpCode, long Position)
{ {
ShaderIrNode OperD = GetOperGpr0(OpCode); ShaderIrNode OperD = OpCode.Gpr0();
ShaderIrNode OperA = GetOperGpr8(OpCode); ShaderIrNode OperA = OpCode.Gpr8();
ShaderTexqInfo Info = (ShaderTexqInfo)((OpCode >> 22) & 0x1f); ShaderTexqInfo Info = (ShaderTexqInfo)(OpCode.Read(22, 0x1f));
ShaderIrMetaTexq Meta0 = new ShaderIrMetaTexq(Info, 0); ShaderIrMetaTexq Meta0 = new ShaderIrMetaTexq(Info, 0);
ShaderIrMetaTexq Meta1 = new ShaderIrMetaTexq(Info, 1); ShaderIrMetaTexq Meta1 = new ShaderIrMetaTexq(Info, 1);
ShaderIrNode OperC = GetOperImm13_36(OpCode); ShaderIrNode OperC = OpCode.Imm13_36();
ShaderIrOp Op0 = new ShaderIrOp(ShaderIrInst.Texq, OperA, null, OperC, Meta0); ShaderIrOp Op0 = new ShaderIrOp(ShaderIrInst.Texq, OperA, null, OperC, Meta0);
ShaderIrOp Op1 = new ShaderIrOp(ShaderIrInst.Texq, OperA, null, OperC, Meta1); ShaderIrOp Op1 = new ShaderIrOp(ShaderIrInst.Texq, OperA, null, OperC, Meta1);
Block.AddNode(GetPredNode(new ShaderIrAsg(OperD, Op0), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OperD, Op0)));
Block.AddNode(GetPredNode(new ShaderIrAsg(OperA, Op1), OpCode)); //Is this right? Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OperA, Op1))); //Is this right?
} }
public static void Tex(ShaderIrBlock Block, long OpCode, long Position) public static void Tex(ShaderIrBlock Block, long OpCode, long Position)
@ -149,7 +149,7 @@ namespace Ryujinx.Graphics.Gal.Shader
for (int Index = 0; Index < Coords.Length; Index++) for (int Index = 0; Index < Coords.Length; Index++)
{ {
Coords[Index] = GetOperGpr8(OpCode); Coords[Index] = OpCode.Gpr8();
Coords[Index].Index += Index; Coords[Index].Index += Index;
@ -159,11 +159,11 @@ namespace Ryujinx.Graphics.Gal.Shader
} }
} }
int ChMask = (int)(OpCode >> 31) & 0xf; int ChMask = OpCode.Read(31, 0xf);
ShaderIrNode OperC = GprHandle ShaderIrNode OperC = GprHandle
? (ShaderIrNode)GetOperGpr20 (OpCode) ? (ShaderIrNode)OpCode.Gpr20()
: (ShaderIrNode)GetOperImm13_36(OpCode); : (ShaderIrNode)OpCode.Imm13_36();
ShaderIrInst Inst = GprHandle ? ShaderIrInst.Texb : ShaderIrInst.Texs; ShaderIrInst Inst = GprHandle ? ShaderIrInst.Texb : ShaderIrInst.Texs;
@ -175,7 +175,7 @@ namespace Ryujinx.Graphics.Gal.Shader
ShaderIrOp Op = new ShaderIrOp(Inst, Coords[0], Coords[1], OperC, Meta); ShaderIrOp Op = new ShaderIrOp(Inst, Coords[0], Coords[1], OperC, Meta);
Block.AddNode(GetPredNode(new ShaderIrAsg(Dst, Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(Dst, Op)));
} }
int RegInc = 0; int RegInc = 0;
@ -189,7 +189,7 @@ namespace Ryujinx.Graphics.Gal.Shader
ShaderIrOperGpr Src = new ShaderIrOperGpr(TempRegStart + Ch); ShaderIrOperGpr Src = new ShaderIrOperGpr(TempRegStart + Ch);
ShaderIrOperGpr Dst = GetOperGpr0(OpCode); ShaderIrOperGpr Dst = OpCode.Gpr0();
Dst.Index += RegInc++; Dst.Index += RegInc++;
@ -198,7 +198,7 @@ namespace Ryujinx.Graphics.Gal.Shader
continue; continue;
} }
Block.AddNode(GetPredNode(new ShaderIrAsg(Dst, Src), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(Dst, Src)));
} }
} }
@ -215,14 +215,14 @@ namespace Ryujinx.Graphics.Gal.Shader
private static void EmitTexs(ShaderIrBlock Block, long OpCode, ShaderIrInst Inst) private static void EmitTexs(ShaderIrBlock Block, long OpCode, ShaderIrInst Inst)
{ {
//TODO: Support other formats. //TODO: Support other formats.
ShaderIrNode OperA = GetOperGpr8 (OpCode); ShaderIrNode OperA = OpCode.Gpr8();
ShaderIrNode OperB = GetOperGpr20 (OpCode); ShaderIrNode OperB = OpCode.Gpr20();
ShaderIrNode OperC = GetOperImm13_36(OpCode); ShaderIrNode OperC = OpCode.Imm13_36();
int LutIndex; int LutIndex;
LutIndex = GetOperGpr0 (OpCode).Index != ShaderIrOperGpr.ZRIndex ? 1 : 0; LutIndex = OpCode.Gpr0 ().Index != ShaderIrOperGpr.ZRIndex ? 1 : 0;
LutIndex |= GetOperGpr28(OpCode).Index != ShaderIrOperGpr.ZRIndex ? 2 : 0; LutIndex |= OpCode.Gpr28().Index != ShaderIrOperGpr.ZRIndex ? 2 : 0;
if (LutIndex == 0) if (LutIndex == 0)
{ {
@ -231,7 +231,7 @@ namespace Ryujinx.Graphics.Gal.Shader
return; return;
} }
int ChMask = MaskLut[LutIndex, (OpCode >> 50) & 7]; int ChMask = MaskLut[LutIndex, OpCode.Read(50, 7)];
for (int Ch = 0; Ch < 4; Ch++) for (int Ch = 0; Ch < 4; Ch++)
{ {
@ -241,7 +241,7 @@ namespace Ryujinx.Graphics.Gal.Shader
ShaderIrOp Op = new ShaderIrOp(Inst, OperA, OperB, OperC, Meta); ShaderIrOp Op = new ShaderIrOp(Inst, OperA, OperB, OperC, Meta);
Block.AddNode(GetPredNode(new ShaderIrAsg(Dst, Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(Dst, Op)));
} }
int RegInc = 0; int RegInc = 0;
@ -252,11 +252,11 @@ namespace Ryujinx.Graphics.Gal.Shader
switch (LutIndex) switch (LutIndex)
{ {
case 1: Dst = GetOperGpr0 (OpCode); break; case 1: Dst = OpCode.Gpr0(); break;
case 2: Dst = GetOperGpr28(OpCode); break; case 2: Dst = OpCode.Gpr28(); break;
case 3: Dst = (RegInc >> 1) != 0 case 3: Dst = (RegInc >> 1) != 0
? GetOperGpr28(OpCode) ? OpCode.Gpr28()
: GetOperGpr0 (OpCode); break; : OpCode.Gpr0 (); break;
default: throw new InvalidOperationException(); default: throw new InvalidOperationException();
} }
@ -279,7 +279,7 @@ namespace Ryujinx.Graphics.Gal.Shader
if (Dst.Index != ShaderIrOperGpr.ZRIndex) if (Dst.Index != ShaderIrOperGpr.ZRIndex)
{ {
Block.AddNode(GetPredNode(new ShaderIrAsg(Dst, Src), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(Dst, Src)));
} }
} }
} }

98
Ryujinx.Graphics/Gal/Shader/ShaderDecodeMove.cs
View file

@ -92,35 +92,35 @@ namespace Ryujinx.Graphics.Gal.Shader
Block.AddNode(new ShaderIrCmnt("Stubbed.")); Block.AddNode(new ShaderIrCmnt("Stubbed."));
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), GetOperGpr8(OpCode)), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), OpCode.Gpr8())));
} }
public static void Mov_C(ShaderIrBlock Block, long OpCode, long Position) public static void Mov_C(ShaderIrBlock Block, long OpCode, long Position)
{ {
ShaderIrOperCbuf Cbuf = GetOperCbuf34(OpCode); ShaderIrOperCbuf Cbuf = OpCode.Cbuf34();
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Cbuf), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Cbuf)));
} }
public static void Mov_I(ShaderIrBlock Block, long OpCode, long Position) public static void Mov_I(ShaderIrBlock Block, long OpCode, long Position)
{ {
ShaderIrOperImm Imm = GetOperImm19_20(OpCode); ShaderIrOperImm Imm = OpCode.Imm19_20();
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Imm), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Imm)));
} }
public static void Mov_I32(ShaderIrBlock Block, long OpCode, long Position) public static void Mov_I32(ShaderIrBlock Block, long OpCode, long Position)
{ {
ShaderIrOperImm Imm = GetOperImm32_20(OpCode); ShaderIrOperImm Imm = OpCode.Imm32_20();
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Imm), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Imm)));
} }
public static void Mov_R(ShaderIrBlock Block, long OpCode, long Position) public static void Mov_R(ShaderIrBlock Block, long OpCode, long Position)
{ {
ShaderIrOperGpr Gpr = GetOperGpr20(OpCode); ShaderIrOperGpr Gpr = OpCode.Gpr20();
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Gpr), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Gpr)));
} }
public static void Sel_C(ShaderIrBlock Block, long OpCode, long Position) public static void Sel_C(ShaderIrBlock Block, long OpCode, long Position)
@ -145,21 +145,21 @@ namespace Ryujinx.Graphics.Gal.Shader
//Zero is used as a special number to get a valid "0 * 0 + VertexIndex" in a GS //Zero is used as a special number to get a valid "0 * 0 + VertexIndex" in a GS
ShaderIrNode Source = new ShaderIrOperImm(0); ShaderIrNode Source = new ShaderIrOperImm(0);
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Source), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Source)));
} }
private static void EmitF2f(ShaderIrBlock Block, long OpCode, ShaderOper Oper) private static void EmitF2f(ShaderIrBlock Block, long OpCode, ShaderOper Oper)
{ {
bool NegA = ((OpCode >> 45) & 1) != 0; bool NegA = OpCode.Read(45);
bool AbsA = ((OpCode >> 49) & 1) != 0; bool AbsA = OpCode.Read(49);
ShaderIrNode OperA; ShaderIrNode OperA;
switch (Oper) switch (Oper)
{ {
case ShaderOper.CR: OperA = GetOperCbuf34 (OpCode); break; case ShaderOper.CR: OperA = OpCode.Cbuf34(); break;
case ShaderOper.Immf: OperA = GetOperImmf19_20(OpCode); break; case ShaderOper.Immf: OperA = OpCode.Immf19_20(); break;
case ShaderOper.RR: OperA = GetOperGpr20 (OpCode); break; case ShaderOper.RR: OperA = OpCode.Gpr20(); break;
default: throw new ArgumentException(nameof(Oper)); default: throw new ArgumentException(nameof(Oper));
} }
@ -173,7 +173,7 @@ namespace Ryujinx.Graphics.Gal.Shader
OperA = new ShaderIrOp(RoundInst, OperA); OperA = new ShaderIrOp(RoundInst, OperA);
} }
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), OperA), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), OperA)));
} }
private static void EmitF2i(ShaderIrBlock Block, long OpCode, ShaderOper Oper) private static void EmitF2i(ShaderIrBlock Block, long OpCode, ShaderOper Oper)
@ -188,16 +188,16 @@ namespace Ryujinx.Graphics.Gal.Shader
throw new NotImplementedException(); throw new NotImplementedException();
} }
bool NegA = ((OpCode >> 45) & 1) != 0; bool NegA = OpCode.Read(45);
bool AbsA = ((OpCode >> 49) & 1) != 0; bool AbsA = OpCode.Read(49);
ShaderIrNode OperA; ShaderIrNode OperA;
switch (Oper) switch (Oper)
{ {
case ShaderOper.CR: OperA = GetOperCbuf34 (OpCode); break; case ShaderOper.CR: OperA = OpCode.Cbuf34(); break;
case ShaderOper.Immf: OperA = GetOperImmf19_20(OpCode); break; case ShaderOper.Immf: OperA = OpCode.Immf19_20(); break;
case ShaderOper.RR: OperA = GetOperGpr20 (OpCode); break; case ShaderOper.RR: OperA = OpCode.Gpr20(); break;
default: throw new ArgumentException(nameof(Oper)); default: throw new ArgumentException(nameof(Oper));
} }
@ -242,7 +242,7 @@ namespace Ryujinx.Graphics.Gal.Shader
ShaderIrNode Op = new ShaderIrOp(Inst, OperA); ShaderIrNode Op = new ShaderIrOp(Inst, OperA);
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op)));
} }
private static void EmitI2f(ShaderIrBlock Block, long OpCode, ShaderOper Oper) private static void EmitI2f(ShaderIrBlock Block, long OpCode, ShaderOper Oper)
@ -257,18 +257,18 @@ namespace Ryujinx.Graphics.Gal.Shader
throw new NotImplementedException(); throw new NotImplementedException();
} }
int Sel = (int)(OpCode >> 41) & 3; int Sel = OpCode.Read(41, 3);
bool NegA = ((OpCode >> 45) & 1) != 0; bool NegA = OpCode.Read(45);
bool AbsA = ((OpCode >> 49) & 1) != 0; bool AbsA = OpCode.Read(49);
ShaderIrNode OperA; ShaderIrNode OperA;
switch (Oper) switch (Oper)
{ {
case ShaderOper.CR: OperA = GetOperCbuf34 (OpCode); break; case ShaderOper.CR: OperA = OpCode.Cbuf34(); break;
case ShaderOper.Imm: OperA = GetOperImm19_20(OpCode); break; case ShaderOper.Imm: OperA = OpCode.Imm19_20(); break;
case ShaderOper.RR: OperA = GetOperGpr20 (OpCode); break; case ShaderOper.RR: OperA = OpCode.Gpr20(); break;
default: throw new ArgumentException(nameof(Oper)); default: throw new ArgumentException(nameof(Oper));
} }
@ -297,7 +297,7 @@ namespace Ryujinx.Graphics.Gal.Shader
ShaderIrNode Op = new ShaderIrOp(Inst, OperA); ShaderIrNode Op = new ShaderIrOp(Inst, OperA);
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Op), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op)));
} }
private static void EmitI2i(ShaderIrBlock Block, long OpCode, ShaderOper Oper) private static void EmitI2i(ShaderIrBlock Block, long OpCode, ShaderOper Oper)
@ -312,19 +312,19 @@ namespace Ryujinx.Graphics.Gal.Shader
throw new NotImplementedException(); throw new NotImplementedException();
} }
int Sel = (int)(OpCode >> 41) & 3; int Sel = OpCode.Read(41, 3);
bool NegA = ((OpCode >> 45) & 1) != 0; bool NegA = OpCode.Read(45);
bool AbsA = ((OpCode >> 49) & 1) != 0; bool AbsA = OpCode.Read(49);
bool SatA = ((OpCode >> 50) & 1) != 0; bool SatA = OpCode.Read(50);
ShaderIrNode OperA; ShaderIrNode OperA;
switch (Oper) switch (Oper)
{ {
case ShaderOper.CR: OperA = GetOperCbuf34 (OpCode); break; case ShaderOper.CR: OperA = OpCode.Cbuf34(); break;
case ShaderOper.Immf: OperA = GetOperImmf19_20(OpCode); break; case ShaderOper.Immf: OperA = OpCode.Immf19_20(); break;
case ShaderOper.RR: OperA = GetOperGpr20 (OpCode); break; case ShaderOper.RR: OperA = OpCode.Gpr20(); break;
default: throw new ArgumentException(nameof(Oper)); default: throw new ArgumentException(nameof(Oper));
} }
@ -372,36 +372,36 @@ namespace Ryujinx.Graphics.Gal.Shader
} }
} }
Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), OperA), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), OperA)));
} }
private static void EmitSel(ShaderIrBlock Block, long OpCode, ShaderOper Oper) private static void EmitSel(ShaderIrBlock Block, long OpCode, ShaderOper Oper)
{ {
ShaderIrOperGpr Dst = GetOperGpr0 (OpCode); ShaderIrOperGpr Dst = OpCode.Gpr0();
ShaderIrNode Pred = GetOperPred39N(OpCode); ShaderIrNode Pred = OpCode.Pred39N();
ShaderIrNode ResultA = GetOperGpr8(OpCode); ShaderIrNode ResultA = OpCode.Gpr8();
ShaderIrNode ResultB; ShaderIrNode ResultB;
switch (Oper) switch (Oper)
{ {
case ShaderOper.CR: ResultB = GetOperCbuf34 (OpCode); break; case ShaderOper.CR: ResultB = OpCode.Cbuf34(); break;
case ShaderOper.Imm: ResultB = GetOperImm19_20(OpCode); break; case ShaderOper.Imm: ResultB = OpCode.Imm19_20(); break;
case ShaderOper.RR: ResultB = GetOperGpr20 (OpCode); break; case ShaderOper.RR: ResultB = OpCode.Gpr20(); break;
default: throw new ArgumentException(nameof(Oper)); default: throw new ArgumentException(nameof(Oper));
} }
Block.AddNode(GetPredNode(new ShaderIrCond(Pred, new ShaderIrAsg(Dst, ResultA), false), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrCond(Pred, new ShaderIrAsg(Dst, ResultA), false)));
Block.AddNode(GetPredNode(new ShaderIrCond(Pred, new ShaderIrAsg(Dst, ResultB), true), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrCond(Pred, new ShaderIrAsg(Dst, ResultB), true)));
} }
private static IntType GetIntType(long OpCode) private static IntType GetIntType(long OpCode)
{ {
bool Signed = ((OpCode >> 13) & 1) != 0; bool Signed = OpCode.Read(13);
IntType Type = (IntType)((OpCode >> 10) & 3); IntType Type = (IntType)(OpCode.Read(10, 3));
if (Signed) if (Signed)
{ {
@ -413,12 +413,12 @@ namespace Ryujinx.Graphics.Gal.Shader
private static FloatType GetFloatType(long OpCode) private static FloatType GetFloatType(long OpCode)
{ {
return (FloatType)((OpCode >> 8) & 3); return (FloatType)(OpCode.Read(8, 3));
} }
private static ShaderIrInst GetRoundInst(long OpCode) private static ShaderIrInst GetRoundInst(long OpCode)
{ {
switch ((OpCode >> 39) & 3) switch (OpCode.Read(39, 3))
{ {
case 1: return ShaderIrInst.Floor; case 1: return ShaderIrInst.Floor;
case 2: return ShaderIrInst.Ceil; case 2: return ShaderIrInst.Ceil;

260
Ryujinx.Graphics/Gal/Shader/ShaderDecodeOpCode.cs Normal file
View file

@ -0,0 +1,260 @@
using System;
namespace Ryujinx.Graphics.Gal.Shader
{
static partial class ShaderDecode
{
private static int Read(this long OpCode, int Position, int Mask)
{
return (int)(OpCode >> Position) & Mask;
}
private static bool Read(this long OpCode, int Position)
{
return ((OpCode >> Position) & 1) != 0;
}
private static int Branch(this long OpCode)
{
return ((int)(OpCode >> 20) << 8) >> 8;
}
private static ShaderIrOperAbuf[] Abuf20(this long OpCode)
{
int Abuf = OpCode.Read(20, 0x3ff);
int Size = OpCode.Read(47, 3);
ShaderIrOperGpr Vertex = OpCode.Gpr39();
ShaderIrOperAbuf[] Opers = new ShaderIrOperAbuf[Size + 1];
for (int Index = 0; Index <= Size; Index++)
{
Opers[Index] = new ShaderIrOperAbuf(Abuf + Index * 4, Vertex);
}
return Opers;
}
private static ShaderIrOperAbuf Abuf28(this long OpCode)
{
int Abuf = OpCode.Read(28, 0x3ff);
return new ShaderIrOperAbuf(Abuf, OpCode.Gpr39());
}
private static ShaderIrOperCbuf Cbuf34(this long OpCode)
{
return new ShaderIrOperCbuf(
OpCode.Read(34, 0x1f),
OpCode.Read(20, 0x3fff));
}
private static ShaderIrOperGpr Gpr8(this long OpCode)
{
return new ShaderIrOperGpr(OpCode.Read(8, 0xff));
}
private static ShaderIrOperGpr Gpr20(this long OpCode)
{
return new ShaderIrOperGpr(OpCode.Read(20, 0xff));
}
private static ShaderIrOperGpr Gpr39(this long OpCode)
{
return new ShaderIrOperGpr(OpCode.Read(39, 0xff));
}
private static ShaderIrOperGpr Gpr0(this long OpCode)
{
return new ShaderIrOperGpr(OpCode.Read(0, 0xff));
}
private static ShaderIrOperGpr Gpr28(this long OpCode)
{
return new ShaderIrOperGpr(OpCode.Read(28, 0xff));
}
private static ShaderIrOperImm Imm5_39(this long OpCode)
{
return new ShaderIrOperImm(OpCode.Read(39, 0x1f));
}
private static ShaderIrOperImm Imm13_36(this long OpCode)
{
return new ShaderIrOperImm(OpCode.Read(36, 0x1fff));
}
private static ShaderIrOperImm Imm32_20(this long OpCode)
{
return new ShaderIrOperImm((int)(OpCode >> 20));
}
private static ShaderIrOperImmf Immf32_20(this long OpCode)
{
return new ShaderIrOperImmf(BitConverter.Int32BitsToSingle((int)(OpCode >> 20)));
}
private static ShaderIrOperImm Imm19_20(this long OpCode)
{
int Value = OpCode.Read(20, 0x7ffff);
bool Neg = OpCode.Read(56);
if (Neg)
{
Value = -Value;
}
return new ShaderIrOperImm(Value);
}
private static ShaderIrOperImmf Immf19_20(this long OpCode)
{
uint Imm = (uint)(OpCode >> 20) & 0x7ffff;
bool Neg = OpCode.Read(56);
Imm <<= 12;
if (Neg)
{
Imm |= 0x80000000;
}
float Value = BitConverter.Int32BitsToSingle((int)Imm);
return new ShaderIrOperImmf(Value);
}
private static ShaderIrOperPred Pred0(this long OpCode)
{
return new ShaderIrOperPred(OpCode.Read(0, 7));
}
private static ShaderIrOperPred Pred3(this long OpCode)
{
return new ShaderIrOperPred(OpCode.Read(3, 7));
}
private static ShaderIrOperPred Pred12(this long OpCode)
{
return new ShaderIrOperPred(OpCode.Read(12, 7));
}
private static ShaderIrOperPred Pred29(this long OpCode)
{
return new ShaderIrOperPred(OpCode.Read(29, 7));
}
private static ShaderIrNode Pred39N(this long OpCode)
{
ShaderIrNode Node = OpCode.Pred39();
if (OpCode.Read(42))
{
Node = new ShaderIrOp(ShaderIrInst.Bnot, Node);
}
return Node;
}
private static ShaderIrOperPred Pred39(this long OpCode)
{
return new ShaderIrOperPred(OpCode.Read(39, 7));
}
private static ShaderIrOperPred Pred48(this long OpCode)
{
return new ShaderIrOperPred(OpCode.Read(48, 7));
}
private static ShaderIrInst Cmp(this long OpCode)
{
switch (OpCode.Read(49, 7))
{
case 1: return ShaderIrInst.Clt;
case 2: return ShaderIrInst.Ceq;
case 3: return ShaderIrInst.Cle;
case 4: return ShaderIrInst.Cgt;
case 5: return ShaderIrInst.Cne;
case 6: return ShaderIrInst.Cge;
}
throw new ArgumentException(nameof(OpCode));
}
private static ShaderIrInst CmpF(this long OpCode)
{
switch (OpCode.Read(48, 0xf))
{
case 0x1: return ShaderIrInst.Fclt;
case 0x2: return ShaderIrInst.Fceq;
case 0x3: return ShaderIrInst.Fcle;
case 0x4: return ShaderIrInst.Fcgt;
case 0x5: return ShaderIrInst.Fcne;
case 0x6: return ShaderIrInst.Fcge;
case 0x7: return ShaderIrInst.Fcnum;
case 0x8: return ShaderIrInst.Fcnan;
case 0x9: return ShaderIrInst.Fcltu;
case 0xa: return ShaderIrInst.Fcequ;
case 0xb: return ShaderIrInst.Fcleu;
case 0xc: return ShaderIrInst.Fcgtu;
case 0xd: return ShaderIrInst.Fcneu;
case 0xe: return ShaderIrInst.Fcgeu;
}
throw new ArgumentException(nameof(OpCode));
}
private static ShaderIrInst BLop45(this long OpCode)
{
switch (OpCode.Read(45, 3))
{
case 0: return ShaderIrInst.Band;
case 1: return ShaderIrInst.Bor;
case 2: return ShaderIrInst.Bxor;
}
throw new ArgumentException(nameof(OpCode));
}
private static ShaderIrInst BLop24(this long OpCode)
{
switch (OpCode.Read(24, 3))
{
case 0: return ShaderIrInst.Band;
case 1: return ShaderIrInst.Bor;
case 2: return ShaderIrInst.Bxor;
}
throw new ArgumentException(nameof(OpCode));
}
private static ShaderIrNode PredNode(this long OpCode, ShaderIrNode Node)
{
ShaderIrOperPred Pred = OpCode.PredNode();
if (Pred.Index != ShaderIrOperPred.UnusedIndex)
{
bool Inv = OpCode.Read(19);
Node = new ShaderIrCond(Pred, Node, Inv);
}
return Node;
}
private static ShaderIrOperPred PredNode(this long OpCode)
{
int Pred = OpCode.Read(16, 0xf);
if (Pred != 0xf)
{
Pred &= 7;
}
return new ShaderIrOperPred(Pred);
}
}
}

12
Ryujinx.Graphics/Gal/Shader/ShaderDecodeSpecial.cs
View file

@ -7,20 +7,20 @@ namespace Ryujinx.Graphics.Gal.Shader
public static void Out_R(ShaderIrBlock Block, long OpCode, long Position) public static void Out_R(ShaderIrBlock Block, long OpCode, long Position)
{ {
//TODO: Those registers have to be used for something //TODO: Those registers have to be used for something
ShaderIrOperGpr Gpr0 = GetOperGpr0(OpCode); ShaderIrOperGpr Gpr0 = OpCode.Gpr0();
ShaderIrOperGpr Gpr8 = GetOperGpr8(OpCode); ShaderIrOperGpr Gpr8 = OpCode.Gpr8();
ShaderIrOperGpr Gpr20 = GetOperGpr20(OpCode); ShaderIrOperGpr Gpr20 = OpCode.Gpr20();
int Type = (int)((OpCode >> 39) & 3); int Type = OpCode.Read(39, 3);
if ((Type & 1) != 0) if ((Type & 1) != 0)
{ {
Block.AddNode(GetPredNode(new ShaderIrOp(ShaderIrInst.Emit), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrOp(ShaderIrInst.Emit)));
} }
if ((Type & 2) != 0) if ((Type & 2) != 0)
{ {
Block.AddNode(GetPredNode(new ShaderIrOp(ShaderIrInst.Cut), OpCode)); Block.AddNode(OpCode.PredNode(new ShaderIrOp(ShaderIrInst.Cut)));
} }
} }
} }

4
Ryujinx.HLE/Gpu/Engines/INvGpuEngine.cs → Ryujinx.Graphics/INvGpuEngine.cs
View file

@ -1,6 +1,6 @@
using Ryujinx.HLE.Gpu.Memory; using Ryujinx.Graphics.Memory;
namespace Ryujinx.HLE.Gpu.Engines namespace Ryujinx.Graphics
{ {
interface INvGpuEngine interface INvGpuEngine
{ {

4
Ryujinx.HLE/Gpu/Engines/MacroInterpreter.cs → Ryujinx.Graphics/MacroInterpreter.cs
View file

@ -1,8 +1,8 @@
using Ryujinx.HLE.Gpu.Memory; using Ryujinx.Graphics.Memory;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Ryujinx.HLE.Gpu.Engines namespace Ryujinx.Graphics
{ {
class MacroInterpreter class MacroInterpreter
{ {

4
Ryujinx.HLE/Gpu/Memory/NvGpuBufferType.cs → Ryujinx.Graphics/Memory/NvGpuBufferType.cs
View file

@ -1,6 +1,6 @@
namespace Ryujinx.HLE.Gpu.Memory namespace Ryujinx.Graphics.Memory
{ {
enum NvGpuBufferType public enum NvGpuBufferType
{ {
Index, Index,
Vertex, Vertex,

4
Ryujinx.HLE/Gpu/Memory/NvGpuPBEntry.cs → Ryujinx.Graphics/Memory/NvGpuPBEntry.cs
View file

@ -1,9 +1,9 @@
using System; using System;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
namespace Ryujinx.HLE.Gpu.Memory namespace Ryujinx.Graphics.Memory
{ {
struct NvGpuPBEntry public struct NvGpuPBEntry
{ {
public int Method { get; private set; } public int Method { get; private set; }

4
Ryujinx.HLE/Gpu/Memory/NvGpuPushBuffer.cs → Ryujinx.Graphics/Memory/NvGpuPushBuffer.cs
View file

@ -1,9 +1,9 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
namespace Ryujinx.HLE.Gpu.Memory namespace Ryujinx.Graphics.Memory
{ {
static class NvGpuPushBuffer public static class NvGpuPushBuffer
{ {
private enum SubmissionMode private enum SubmissionMode
{ {

4
Ryujinx.HLE/Gpu/Memory/NvGpuVmm.cs → Ryujinx.Graphics/Memory/NvGpuVmm.cs
View file

@ -2,9 +2,9 @@ using ChocolArm64.Memory;
using Ryujinx.Graphics.Gal; using Ryujinx.Graphics.Gal;
using System; using System;
namespace Ryujinx.HLE.Gpu.Memory namespace Ryujinx.Graphics.Memory
{ {
class NvGpuVmm : IAMemory, IGalMemory public class NvGpuVmm : IAMemory, IGalMemory
{ {
public const long AddrSize = 1L << 40; public const long AddrSize = 1L << 40;

7
Ryujinx.HLE/Gpu/Memory/NvGpuVmmCache.cs → Ryujinx.Graphics/Memory/NvGpuVmmCache.cs
View file

@ -1,12 +1,13 @@
using ChocolArm64.Memory; using ChocolArm64.Memory;
using Ryujinx.HLE.Memory;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Ryujinx.HLE.Gpu.Memory namespace Ryujinx.Graphics.Memory
{ {
class NvGpuVmmCache class NvGpuVmmCache
{ {
private const long RamSize = 4L * 1024 * 1024 * 1024;
private const int MaxCpCount = 10000; private const int MaxCpCount = 10000;
private const int MaxCpTimeDelta = 60000; private const int MaxCpTimeDelta = 60000;
@ -226,7 +227,7 @@ namespace Ryujinx.HLE.Gpu.Memory
{ {
if (Residency == null) if (Residency == null)
{ {
Residency = new HashSet<long>[DeviceMemory.RamSize / PageSize]; Residency = new HashSet<long>[RamSize / PageSize];
for (int i = 0; i < Residency.Length; i++) for (int i = 0; i < Residency.Length; i++)
{ {

6
Ryujinx.HLE/Gpu/NvGpu.cs → Ryujinx.Graphics/NvGpu.cs
View file

@ -1,9 +1,9 @@
using Ryujinx.Graphics.Gal; using Ryujinx.Graphics.Gal;
using Ryujinx.HLE.Gpu.Engines; using Ryujinx.Graphics;
namespace Ryujinx.HLE.Gpu namespace Ryujinx.Graphics
{ {
class NvGpu public class NvGpu
{ {
public IGalRenderer Renderer { get; private set; } public IGalRenderer Renderer { get; private set; }

2
Ryujinx.HLE/Gpu/Engines/NvGpuEngine.cs → Ryujinx.Graphics/NvGpuEngine.cs
View file

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.Gpu.Engines namespace Ryujinx.Graphics
{ {
enum NvGpuEngine enum NvGpuEngine
{ {

18
Ryujinx.HLE/Gpu/Engines/NvGpuEngine2d.cs → Ryujinx.Graphics/NvGpuEngine2d.cs
View file

@ -1,12 +1,12 @@
using Ryujinx.Graphics.Gal; using Ryujinx.Graphics.Gal;
using Ryujinx.HLE.Gpu.Memory; using Ryujinx.Graphics.Memory;
using Ryujinx.HLE.Gpu.Texture; using Ryujinx.Graphics.Texture;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Ryujinx.HLE.Gpu.Engines namespace Ryujinx.Graphics
{ {
class NvGpuEngine2d : INvGpuEngine public class NvGpuEngine2d : INvGpuEngine
{ {
private enum CopyOperation private enum CopyOperation
{ {
@ -103,7 +103,7 @@ namespace Ryujinx.HLE.Gpu.Engines
SrcPitch, SrcPitch,
SrcBlockHeight, 1, SrcBlockHeight, 1,
SrcSwizzle, SrcSwizzle,
GalTextureFormat.A8B8G8R8); GalImageFormat.A8B8G8R8 | GalImageFormat.Unorm);
} }
TextureInfo DstTexture() TextureInfo DstTexture()
@ -115,7 +115,7 @@ namespace Ryujinx.HLE.Gpu.Engines
DstPitch, DstPitch,
DstBlockHeight, 1, DstBlockHeight, 1,
DstSwizzle, DstSwizzle,
GalTextureFormat.A8B8G8R8); GalImageFormat.A8B8G8R8 | GalImageFormat.Unorm);
} }
//TODO: fb -> fb copies, tex -> fb copies, formats other than RGBA8, //TODO: fb -> fb copies, tex -> fb copies, formats other than RGBA8,
@ -123,7 +123,7 @@ namespace Ryujinx.HLE.Gpu.Engines
if (IsSrcFb && IsDstFb) if (IsSrcFb && IsDstFb)
{ {
//Frame Buffer -> Frame Buffer copy. //Frame Buffer -> Frame Buffer copy.
Gpu.Renderer.FrameBuffer.Copy( Gpu.Renderer.RenderTarget.Copy(
SrcKey, SrcKey,
DstKey, DstKey,
0, 0,
@ -138,7 +138,7 @@ namespace Ryujinx.HLE.Gpu.Engines
if (IsSrcFb) if (IsSrcFb)
{ {
//Frame Buffer -> Texture copy. //Frame Buffer -> Texture copy.
Gpu.Renderer.FrameBuffer.GetBufferData(SrcKey, (byte[] Buffer) => Gpu.Renderer.RenderTarget.GetBufferData(SrcKey, (byte[] Buffer) =>
{ {
TextureInfo Src = SrcTexture(); TextureInfo Src = SrcTexture();
TextureInfo Dst = DstTexture(); TextureInfo Dst = DstTexture();
@ -156,7 +156,7 @@ namespace Ryujinx.HLE.Gpu.Engines
{ {
byte[] Buffer = TextureReader.Read(Vmm, SrcTexture()); byte[] Buffer = TextureReader.Read(Vmm, SrcTexture());
Gpu.Renderer.FrameBuffer.SetBufferData( Gpu.Renderer.RenderTarget.SetBufferData(
DstKey, DstKey,
DstWidth, DstWidth,
DstHeight, DstHeight,

2
Ryujinx.HLE/Gpu/Engines/NvGpuEngine2dReg.cs → Ryujinx.Graphics/NvGpuEngine2dReg.cs
View file

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.Gpu.Engines namespace Ryujinx.Graphics
{ {
enum NvGpuEngine2dReg enum NvGpuEngine2dReg
{ {

37
Ryujinx.HLE/Gpu/Engines/NvGpuEngine3d.cs → Ryujinx.Graphics/NvGpuEngine3d.cs
View file

@ -1,12 +1,12 @@
using Ryujinx.Graphics.Gal; using Ryujinx.Graphics.Gal;
using Ryujinx.HLE.Gpu.Memory; using Ryujinx.Graphics.Memory;
using Ryujinx.HLE.Gpu.Texture; using Ryujinx.Graphics.Texture;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Ryujinx.HLE.Gpu.Engines namespace Ryujinx.Graphics
{ {
class NvGpuEngine3d : INvGpuEngine public class NvGpuEngine3d : INvGpuEngine
{ {
public int[] Registers { get; private set; } public int[] Registers { get; private set; }
@ -158,6 +158,7 @@ namespace Ryujinx.HLE.Gpu.Engines
int Stencil = ReadRegister(NvGpuEngine3dReg.ClearStencil); int Stencil = ReadRegister(NvGpuEngine3dReg.ClearStencil);
SetFrameBuffer(Vmm, FbIndex); SetFrameBuffer(Vmm, FbIndex);
SetZeta(Vmm); SetZeta(Vmm);
Gpu.Renderer.Rasterizer.ClearBuffers( Gpu.Renderer.Rasterizer.ClearBuffers(
@ -176,7 +177,7 @@ namespace Ryujinx.HLE.Gpu.Engines
if (VA == 0 || Format == 0) if (VA == 0 || Format == 0)
{ {
Gpu.Renderer.FrameBuffer.UnbindColor(FbIndex); Gpu.Renderer.RenderTarget.UnbindColor(FbIndex);
return; return;
} }
@ -200,16 +201,17 @@ namespace Ryujinx.HLE.Gpu.Engines
int VpW = (int)(TX + MathF.Abs(SX)) - VpX; int VpW = (int)(TX + MathF.Abs(SX)) - VpX;
int VpH = (int)(TY + MathF.Abs(SY)) - VpY; int VpH = (int)(TY + MathF.Abs(SY)) - VpY;
GalImageFormat ImageFormat = ImageFormatConverter.ConvertFrameBuffer((GalFrameBufferFormat)Format); GalImageFormat ImageFormat = ImageUtils.ConvertSurface((GalSurfaceFormat)Format);
GalImage Image = new GalImage(Width, Height, ImageFormat); GalImage Image = new GalImage(Width, Height, ImageFormat);
long Size = TextureHelper.GetTextureSize(Image); long Size = ImageUtils.GetSize(Image);
Gpu.Renderer.Texture.CreateFb(Key, Size, Image); Gpu.Renderer.Texture.CreateFb(Key, Size, Image);
Gpu.Renderer.FrameBuffer.BindColor(Key, FbIndex);
Gpu.Renderer.FrameBuffer.SetViewport(VpX, VpY, VpW, VpH); Gpu.Renderer.RenderTarget.BindColor(Key, FbIndex);
Gpu.Renderer.RenderTarget.SetViewport(VpX, VpY, VpW, VpH);
} }
private void SetZeta(NvGpuVmm Vmm) private void SetZeta(NvGpuVmm Vmm)
@ -222,7 +224,7 @@ namespace Ryujinx.HLE.Gpu.Engines
if (ZA == 0 || Format == 0 || !ZetaEnable) if (ZA == 0 || Format == 0 || !ZetaEnable)
{ {
Gpu.Renderer.FrameBuffer.UnbindZeta(); Gpu.Renderer.RenderTarget.UnbindZeta();
return; return;
} }
@ -232,14 +234,15 @@ namespace Ryujinx.HLE.Gpu.Engines
int Width = ReadRegister(NvGpuEngine3dReg.ZetaHoriz); int Width = ReadRegister(NvGpuEngine3dReg.ZetaHoriz);
int Height = ReadRegister(NvGpuEngine3dReg.ZetaVert); int Height = ReadRegister(NvGpuEngine3dReg.ZetaVert);
GalImageFormat ImageFormat = ImageFormatConverter.ConvertZeta((GalZetaFormat)Format); GalImageFormat ImageFormat = ImageUtils.ConvertZeta((GalZetaFormat)Format);
GalImage Image = new GalImage(Width, Height, ImageFormat); GalImage Image = new GalImage(Width, Height, ImageFormat);
long Size = TextureHelper.GetTextureSize(Image); long Size = ImageUtils.GetSize(Image);
Gpu.Renderer.Texture.CreateFb(Key, Size, Image); Gpu.Renderer.Texture.CreateFb(Key, Size, Image);
Gpu.Renderer.FrameBuffer.BindZeta(Key);
Gpu.Renderer.RenderTarget.BindZeta(Key);
} }
private long[] UploadShaders(NvGpuVmm Vmm) private long[] UploadShaders(NvGpuVmm Vmm)
@ -441,11 +444,11 @@ namespace Ryujinx.HLE.Gpu.Engines
Map[i] = (int)((Control >> Shift) & 7); Map[i] = (int)((Control >> Shift) & 7);
} }
Gpu.Renderer.FrameBuffer.SetMap(Map); Gpu.Renderer.RenderTarget.SetMap(Map);
} }
else else
{ {
Gpu.Renderer.FrameBuffer.SetMap(null); Gpu.Renderer.RenderTarget.SetMap(null);
} }
} }
@ -519,13 +522,13 @@ namespace Ryujinx.HLE.Gpu.Engines
//we shouldn't read anything from memory and bind //we shouldn't read anything from memory and bind
//the frame buffer texture instead, since we're not //the frame buffer texture instead, since we're not
//really writing anything to memory. //really writing anything to memory.
Gpu.Renderer.FrameBuffer.BindTexture(Key, TexIndex); Gpu.Renderer.RenderTarget.BindTexture(Key, TexIndex);
} }
else else
{ {
GalImage NewImage = TextureFactory.MakeTexture(Vmm, TicPosition); GalImage NewImage = TextureFactory.MakeTexture(Vmm, TicPosition);
long Size = (uint)TextureHelper.GetTextureSize(NewImage); long Size = (uint)ImageUtils.GetSize(NewImage);
bool HasCachedTexture = false; bool HasCachedTexture = false;

2
Ryujinx.HLE/Gpu/Engines/NvGpuEngine3dReg.cs → Ryujinx.Graphics/NvGpuEngine3dReg.cs
View file

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.Gpu.Engines namespace Ryujinx.Graphics
{ {
enum NvGpuEngine3dReg enum NvGpuEngine3dReg
{ {

8
Ryujinx.HLE/Gpu/Engines/NvGpuEngineDma.cs → Ryujinx.Graphics/NvGpuEngineDma.cs
View file

@ -1,10 +1,10 @@
using Ryujinx.HLE.Gpu.Memory; using Ryujinx.Graphics.Memory;
using Ryujinx.HLE.Gpu.Texture; using Ryujinx.Graphics.Texture;
using System.Collections.Generic; using System.Collections.Generic;
namespace Ryujinx.HLE.Gpu.Engines namespace Ryujinx.Graphics
{ {
class NvGpuEngineDma : INvGpuEngine public class NvGpuEngineDma : INvGpuEngine
{ {
public int[] Registers { get; private set; } public int[] Registers { get; private set; }

2
Ryujinx.HLE/Gpu/Engines/NvGpuEngineDmaReg.cs → Ryujinx.Graphics/NvGpuEngineDmaReg.cs
View file

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.Gpu.Engines namespace Ryujinx.Graphics
{ {
enum NvGpuEngineDmaReg enum NvGpuEngineDmaReg
{ {

6
Ryujinx.HLE/Gpu/Engines/NvGpuFifo.cs → Ryujinx.Graphics/NvGpuFifo.cs
View file

@ -1,10 +1,10 @@
using Ryujinx.HLE.Gpu.Memory; using Ryujinx.Graphics.Memory;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Threading; using System.Threading;
namespace Ryujinx.HLE.Gpu.Engines namespace Ryujinx.Graphics
{ {
class NvGpuFifo public class NvGpuFifo
{ {
private const int MacrosCount = 0x80; private const int MacrosCount = 0x80;
private const int MacroIndexMask = MacrosCount - 1; private const int MacroIndexMask = MacrosCount - 1;

2
Ryujinx.HLE/Gpu/Engines/NvGpuFifoMeth.cs → Ryujinx.Graphics/NvGpuFifoMeth.cs
View file

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.Gpu.Engines namespace Ryujinx.Graphics
{ {
enum NvGpuFifoMeth enum NvGpuFifoMeth
{ {

4
Ryujinx.HLE/Gpu/Engines/NvGpuMethod.cs → Ryujinx.Graphics/NvGpuMethod.cs
View file

@ -1,6 +1,6 @@
using Ryujinx.HLE.Gpu.Memory; using Ryujinx.Graphics.Memory;
namespace Ryujinx.HLE.Gpu.Engines namespace Ryujinx.Graphics
{ {
delegate void NvGpuMethod(NvGpuVmm Vmm, NvGpuPBEntry PBEntry); delegate void NvGpuMethod(NvGpuVmm Vmm, NvGpuPBEntry PBEntry);
} }

2
Ryujinx.Graphics/Gal/Texture/ASTCDecoder.cs → Ryujinx.Graphics/Texture/ASTCDecoder.cs
View file

@ -4,7 +4,7 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
namespace Ryujinx.Graphics.Gal.Texture namespace Ryujinx.Graphics.Texture
{ {
public class ASTCDecoderException : Exception public class ASTCDecoderException : Exception
{ {

2
Ryujinx.Graphics/Gal/Texture/ASTCPixel.cs → Ryujinx.Graphics/Texture/ASTCPixel.cs
View file

@ -1,7 +1,7 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
namespace Ryujinx.Graphics.Gal.Texture namespace Ryujinx.Graphics.Texture
{ {
class ASTCPixel class ASTCPixel
{ {

3
Ryujinx.Graphics/Gal/Texture/BitArrayStream.cs → Ryujinx.Graphics/Texture/BitArrayStream.cs
View file

@ -1,11 +1,12 @@
using System; using System;
using System.Collections; using System.Collections;
namespace Ryujinx.Graphics.Gal.Texture namespace Ryujinx.Graphics.Texture
{ {
public class BitArrayStream public class BitArrayStream
{ {
public BitArray BitsArray; public BitArray BitsArray;
public int Position { get; private set; } public int Position { get; private set; }
public BitArrayStream(BitArray BitArray) public BitArrayStream(BitArray BitArray)

2
Ryujinx.HLE/Gpu/Texture/BlockLinearSwizzle.cs → Ryujinx.Graphics/Texture/BlockLinearSwizzle.cs
View file

@ -1,6 +1,6 @@
using System; using System;
namespace Ryujinx.HLE.Gpu.Texture namespace Ryujinx.Graphics.Texture
{ {
class BlockLinearSwizzle : ISwizzle class BlockLinearSwizzle : ISwizzle
{ {

2
Ryujinx.HLE/Gpu/Texture/ISwizzle.cs → Ryujinx.Graphics/Texture/ISwizzle.cs
View file

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.Gpu.Texture namespace Ryujinx.Graphics.Texture
{ {
interface ISwizzle interface ISwizzle
{ {

24
Ryujinx.Graphics/Texture/ImageConverter.cs Normal file
View file

@ -0,0 +1,24 @@
namespace Ryujinx.Graphics.Texture
{
static class ImageConverter
{
public static byte[] G8R8ToR8G8(
byte[] Data,
int Width,
int Height,
int Depth)
{
int Texels = Width * Height * Depth;
byte[] Output = new byte[Texels * 2];
for (int Texel = 0; Texel < Texels; Texel++)
{
Output[Texel * 2 + 0] = Data[Texel * 2 + 1];
Output[Texel * 2 + 1] = Data[Texel * 2 + 0];
}
return Output;
}
}
}

357
Ryujinx.Graphics/Texture/ImageUtils.cs Normal file
View file

@ -0,0 +1,357 @@
using Ryujinx.Graphics.Gal;
using System;
using System.Collections.Generic;
namespace Ryujinx.Graphics.Texture
{
static class ImageUtils
{
struct ImageDescriptor
{
public TextureReaderDelegate Reader;
public bool HasColor;
public bool HasDepth;
public bool HasStencil;
public bool Compressed;
public ImageDescriptor(
TextureReaderDelegate Reader,
bool HasColor,
bool HasDepth,
bool HasStencil,
bool Compressed)
{
this.Reader = Reader;
this.HasColor = HasColor;
this.HasDepth = HasDepth;
this.HasStencil = HasStencil;
this.Compressed = Compressed;
}
}
private const GalImageFormat Snorm = GalImageFormat.Snorm;
private const GalImageFormat Unorm = GalImageFormat.Unorm;
private const GalImageFormat Sint = GalImageFormat.Sint;
private const GalImageFormat Uint = GalImageFormat.Uint;
private const GalImageFormat Sfloat = GalImageFormat.Sfloat;
private static readonly Dictionary<GalTextureFormat, GalImageFormat> s_TextureTable =
new Dictionary<GalTextureFormat, GalImageFormat>()
{
{ GalTextureFormat.R32G32B32A32, GalImageFormat.R32G32B32A32 | Sint | Uint | Sfloat },
{ GalTextureFormat.R16G16B16A16, GalImageFormat.R16G16B16A16 | Snorm | Unorm | Sint | Uint | Sfloat },
{ GalTextureFormat.R32G32, GalImageFormat.R32G32 | Sint | Uint | Sfloat },
{ GalTextureFormat.A8B8G8R8, GalImageFormat.A8B8G8R8 | Snorm | Unorm | Sint | Uint },
{ GalTextureFormat.A2B10G10R10, GalImageFormat.A2B10G10R10 | Snorm | Unorm | Sint | Uint },
{ GalTextureFormat.G8R8, GalImageFormat.G8R8 | Snorm | Unorm | Sint | Uint },
{ GalTextureFormat.R16, GalImageFormat.R16 | Snorm | Unorm | Sint | Uint | Sfloat },
{ GalTextureFormat.R8, GalImageFormat.R8 | Snorm | Unorm | Sint | Uint },
{ GalTextureFormat.R32, GalImageFormat.R32 | Sint | Uint | Sfloat },
{ GalTextureFormat.A4B4G4R4, GalImageFormat.A4B4G4R4 | Unorm },
{ GalTextureFormat.A1B5G5R5, GalImageFormat.A1R5G5B5 | Unorm },
{ GalTextureFormat.B5G6R5, GalImageFormat.B5G6R5 | Unorm },
{ GalTextureFormat.BF10GF11RF11, GalImageFormat.B10G11R11 | Sfloat },
{ GalTextureFormat.Z24S8, GalImageFormat.D24_S8 | Unorm },
{ GalTextureFormat.ZF32, GalImageFormat.D32 | Sfloat },
{ GalTextureFormat.ZF32_X24S8, GalImageFormat.D32_S8 | Unorm },
//Compressed formats
{ GalTextureFormat.BC6H_SF16, GalImageFormat.BC6H_SF16 | Unorm },
{ GalTextureFormat.BC6H_UF16, GalImageFormat.BC6H_UF16 | Unorm },
{ GalTextureFormat.BC7U, GalImageFormat.BC7 | Unorm },
{ GalTextureFormat.BC1, GalImageFormat.BC1_RGBA | Unorm },
{ GalTextureFormat.BC2, GalImageFormat.BC2 | Unorm },
{ GalTextureFormat.BC3, GalImageFormat.BC3 | Unorm },
{ GalTextureFormat.BC4, GalImageFormat.BC4 | Unorm | Snorm },
{ GalTextureFormat.BC5, GalImageFormat.BC5 | Unorm | Snorm },
{ GalTextureFormat.Astc2D4x4, GalImageFormat.ASTC_4x4 | Unorm },
{ GalTextureFormat.Astc2D5x5, GalImageFormat.ASTC_5x5 | Unorm },
{ GalTextureFormat.Astc2D6x6, GalImageFormat.ASTC_6x6 | Unorm },
{ GalTextureFormat.Astc2D8x8, GalImageFormat.ASTC_8x8 | Unorm },
{ GalTextureFormat.Astc2D10x10, GalImageFormat.ASTC_10x10 | Unorm },
{ GalTextureFormat.Astc2D12x12, GalImageFormat.ASTC_12x12 | Unorm },
{ GalTextureFormat.Astc2D5x4, GalImageFormat.ASTC_5x4 | Unorm },
{ GalTextureFormat.Astc2D6x5, GalImageFormat.ASTC_6x5 | Unorm },
{ GalTextureFormat.Astc2D8x6, GalImageFormat.ASTC_8x6 | Unorm },
{ GalTextureFormat.Astc2D10x8, GalImageFormat.ASTC_10x8 | Unorm },
{ GalTextureFormat.Astc2D12x10, GalImageFormat.ASTC_12x10 | Unorm },
{ GalTextureFormat.Astc2D8x5, GalImageFormat.ASTC_8x5 | Unorm },
{ GalTextureFormat.Astc2D10x5, GalImageFormat.ASTC_10x5 | Unorm },
{ GalTextureFormat.Astc2D10x6, GalImageFormat.ASTC_10x6 | Unorm }
};
private static readonly Dictionary<GalImageFormat, ImageDescriptor> s_ImageTable =
new Dictionary<GalImageFormat, ImageDescriptor>()
{
{ GalImageFormat.R32G32B32A32, new ImageDescriptor(TextureReader.Read16Bpp, true, false, false, false) },
{ GalImageFormat.R16G16B16A16, new ImageDescriptor(TextureReader.Read8Bpp, true, false, false, false) },
{ GalImageFormat.R32G32, new ImageDescriptor(TextureReader.Read8Bpp, true, false, false, false) },
{ GalImageFormat.A8B8G8R8, new ImageDescriptor(TextureReader.Read4Bpp, true, false, false, false) },
{ GalImageFormat.A2B10G10R10, new ImageDescriptor(TextureReader.Read4Bpp, true, false, false, false) },
{ GalImageFormat.R32, new ImageDescriptor(TextureReader.Read4Bpp, true, false, false, false) },
{ GalImageFormat.A4B4G4R4, new ImageDescriptor(TextureReader.Read2Bpp, true, false, false, false) },
{ GalImageFormat.BC6H_SF16, new ImageDescriptor(TextureReader.Read16BptCompressedTexture4x4, true, false, false, true) },
{ GalImageFormat.BC6H_UF16, new ImageDescriptor(TextureReader.Read16BptCompressedTexture4x4, true, false, false, true) },
{ GalImageFormat.A1R5G5B5, new ImageDescriptor(TextureReader.Read5551, true, false, false, false) },
{ GalImageFormat.B5G6R5, new ImageDescriptor(TextureReader.Read565, true, false, false, false) },
{ GalImageFormat.BC7, new ImageDescriptor(TextureReader.Read16BptCompressedTexture4x4, true, false, false, true) },
{ GalImageFormat.R16G16, new ImageDescriptor(TextureReader.Read4Bpp, true, false, false, false) },
{ GalImageFormat.R8G8, new ImageDescriptor(TextureReader.Read2Bpp, true, false, false, false) },
{ GalImageFormat.G8R8, new ImageDescriptor(TextureReader.Read2Bpp, true, false, false, false) },
{ GalImageFormat.R16, new ImageDescriptor(TextureReader.Read2Bpp, true, false, false, false) },
{ GalImageFormat.R8, new ImageDescriptor(TextureReader.Read1Bpp, true, false, false, false) },
{ GalImageFormat.B10G11R11, new ImageDescriptor(TextureReader.Read4Bpp, true, false, false, false) },
{ GalImageFormat.A8B8G8R8_SRGB, new ImageDescriptor(TextureReader.Read4Bpp, true, false, false, false) },
{ GalImageFormat.BC1_RGBA, new ImageDescriptor(TextureReader.Read8Bpt4x4, true, false, false, true) },
{ GalImageFormat.BC2, new ImageDescriptor(TextureReader.Read16BptCompressedTexture4x4, true, false, false, true) },
{ GalImageFormat.BC3, new ImageDescriptor(TextureReader.Read16BptCompressedTexture4x4, true, false, false, true) },
{ GalImageFormat.BC4, new ImageDescriptor(TextureReader.Read8Bpt4x4, true, false, false, true) },
{ GalImageFormat.BC5, new ImageDescriptor(TextureReader.Read16BptCompressedTexture4x4, true, false, false, true) },
{ GalImageFormat.ASTC_4x4, new ImageDescriptor(TextureReader.Read16BptCompressedTexture4x4, true, false, false, true) },
{ GalImageFormat.ASTC_5x5, new ImageDescriptor(TextureReader.Read16BptCompressedTexture5x5, true, false, false, true) },
{ GalImageFormat.ASTC_6x6, new ImageDescriptor(TextureReader.Read16BptCompressedTexture6x6, true, false, false, true) },
{ GalImageFormat.ASTC_8x8, new ImageDescriptor(TextureReader.Read16BptCompressedTexture8x8, true, false, false, true) },
{ GalImageFormat.ASTC_10x10, new ImageDescriptor(TextureReader.Read16BptCompressedTexture10x10, true, false, false, true) },
{ GalImageFormat.ASTC_12x12, new ImageDescriptor(TextureReader.Read16BptCompressedTexture12x12, true, false, false, true) },
{ GalImageFormat.ASTC_5x4, new ImageDescriptor(TextureReader.Read16BptCompressedTexture5x4, true, false, false, true) },
{ GalImageFormat.ASTC_6x5, new ImageDescriptor(TextureReader.Read16BptCompressedTexture6x5, true, false, false, true) },
{ GalImageFormat.ASTC_8x6, new ImageDescriptor(TextureReader.Read16BptCompressedTexture8x6, true, false, false, true) },
{ GalImageFormat.ASTC_10x8, new ImageDescriptor(TextureReader.Read16BptCompressedTexture10x8, true, false, false, true) },
{ GalImageFormat.ASTC_12x10, new ImageDescriptor(TextureReader.Read16BptCompressedTexture12x10, true, false, false, true) },
{ GalImageFormat.ASTC_8x5, new ImageDescriptor(TextureReader.Read16BptCompressedTexture8x5, true, false, false, true) },
{ GalImageFormat.ASTC_10x5, new ImageDescriptor(TextureReader.Read16BptCompressedTexture10x5, true, false, false, true) },
{ GalImageFormat.ASTC_10x6, new ImageDescriptor(TextureReader.Read16BptCompressedTexture10x6, true, false, false, true) },
{ GalImageFormat.D24_S8, new ImageDescriptor(TextureReader.Read4Bpp, false, true, true, false) },
{ GalImageFormat.D32, new ImageDescriptor(TextureReader.Read4Bpp, false, true, false, false) },
{ GalImageFormat.D16, new ImageDescriptor(TextureReader.Read2Bpp, false, true, false, false) },
{ GalImageFormat.D32_S8, new ImageDescriptor(TextureReader.Read8Bpp, false, true, true, false) },
};
public static GalImageFormat ConvertTexture(
GalTextureFormat Format,
GalTextureType RType,
GalTextureType GType,
GalTextureType BType,
GalTextureType AType)
{
if (RType != GType || RType != BType || RType != AType)
{
throw new NotImplementedException("Per component types are not implemented");
}
if (!s_TextureTable.TryGetValue(Format, out GalImageFormat ImageFormat))
{
throw new NotImplementedException("Texture with format " + ((int)Format).ToString("x2") + " not implemented");
}
GalTextureType Type = RType;
GalImageFormat FormatType = GetFormatType(RType);
if (ImageFormat.HasFlag(FormatType))
{
return (ImageFormat & GalImageFormat.FormatMask) | FormatType;
}
else
{
throw new NotImplementedException("Texture with format " + Format +
" and component type " + Type + " is not implemented");
}
}
public static GalImageFormat ConvertSurface(GalSurfaceFormat Format)
{
switch (Format)
{
case GalSurfaceFormat.RGBA32Float: return GalImageFormat.R32G32B32A32 | Sfloat;
case GalSurfaceFormat.RGBA16Float: return GalImageFormat.R16G16B16A16 | Sfloat;
case GalSurfaceFormat.RG32Float: return GalImageFormat.R32G32 | Sfloat;
case GalSurfaceFormat.RG32Sint: return GalImageFormat.R32G32 | Sint;
case GalSurfaceFormat.RG32Uint: return GalImageFormat.R32G32 | Uint;
case GalSurfaceFormat.BGRA8Unorm: return GalImageFormat.R8G8B8A8 | Unorm; //Is this right?
case GalSurfaceFormat.BGRA8Srgb: return GalImageFormat.A8B8G8R8_SRGB; //This one might be wrong
case GalSurfaceFormat.RGB10A2Unorm: return GalImageFormat.A2B10G10R10 | Unorm;
case GalSurfaceFormat.RGBA8Unorm: return GalImageFormat.A8B8G8R8 | Unorm;
case GalSurfaceFormat.RGBA8Srgb: return GalImageFormat.A8B8G8R8_SRGB;
case GalSurfaceFormat.RGBA8Snorm: return GalImageFormat.A8B8G8R8 | Snorm;
case GalSurfaceFormat.RG16Snorm: return GalImageFormat.R16G16 | Snorm;
case GalSurfaceFormat.RG16Float: return GalImageFormat.R16G16 | Sfloat;
case GalSurfaceFormat.R11G11B10Float: return GalImageFormat.B10G11R11 | Sfloat;
case GalSurfaceFormat.R32Float: return GalImageFormat.R32 | Sfloat;
case GalSurfaceFormat.RG8Unorm: return GalImageFormat.R8G8 | Unorm;
case GalSurfaceFormat.RG8Snorm: return GalImageFormat.R8 | Snorm;
case GalSurfaceFormat.R16Float: return GalImageFormat.R16 | Sfloat;
case GalSurfaceFormat.R8Unorm: return GalImageFormat.R8 | Unorm;
}
throw new NotImplementedException(Format.ToString());
}
public static GalImageFormat ConvertZeta(GalZetaFormat Format)
{
switch (Format)
{
case GalZetaFormat.Z32Float: return GalImageFormat.D32 | Sfloat;
case GalZetaFormat.S8Z24Unorm: return GalImageFormat.D24_S8 | Unorm;
case GalZetaFormat.Z16Unorm: return GalImageFormat.D16 | Unorm;
//This one might not be Uint, change when a texture uses this format
case GalZetaFormat.Z32S8X24Float: return GalImageFormat.D32_S8 | Uint;
}
throw new NotImplementedException(Format.ToString());
}
public static TextureReaderDelegate GetReader(GalImageFormat Format)
{
return GetImageDescriptor(Format).Reader;
}
public static int GetSize(GalImage Image)
{
switch (Image.Format & GalImageFormat.FormatMask)
{
case GalImageFormat.R32G32B32A32:
return Image.Width * Image.Height * 16;
case GalImageFormat.R16G16B16A16:
case GalImageFormat.D32_S8:
case GalImageFormat.R32G32:
return Image.Width * Image.Height * 8;
case GalImageFormat.A8B8G8R8:
case GalImageFormat.A8B8G8R8_SRGB:
case GalImageFormat.A2B10G10R10:
case GalImageFormat.R16G16:
case GalImageFormat.R32:
case GalImageFormat.D32:
case GalImageFormat.B10G11R11:
case GalImageFormat.D24_S8:
return Image.Width * Image.Height * 4;
case GalImageFormat.B4G4R4A4:
case GalImageFormat.A1R5G5B5:
case GalImageFormat.B5G6R5:
case GalImageFormat.R8G8:
case GalImageFormat.R16:
case GalImageFormat.D16:
return Image.Width * Image.Height * 2;
case GalImageFormat.R8:
return Image.Width * Image.Height;
case GalImageFormat.BC1_RGBA:
case GalImageFormat.BC4:
{
return CompressedTextureSize(Image.Width, Image.Height, 4, 4, 8);
}
case GalImageFormat.BC6H_SF16:
case GalImageFormat.BC6H_UF16:
case GalImageFormat.BC7:
case GalImageFormat.BC2:
case GalImageFormat.BC3:
case GalImageFormat.BC5:
case GalImageFormat.ASTC_4x4:
return CompressedTextureSize(Image.Width, Image.Height, 4, 4, 16);
case GalImageFormat.ASTC_5x5:
return CompressedTextureSize(Image.Width, Image.Height, 5, 5, 16);
case GalImageFormat.ASTC_6x6:
return CompressedTextureSize(Image.Width, Image.Height, 6, 6, 16);
case GalImageFormat.ASTC_8x8:
return CompressedTextureSize(Image.Width, Image.Height, 8, 8, 16);
case GalImageFormat.ASTC_10x10:
return CompressedTextureSize(Image.Width, Image.Height, 10, 10, 16);
case GalImageFormat.ASTC_12x12:
return CompressedTextureSize(Image.Width, Image.Height, 12, 12, 16);
case GalImageFormat.ASTC_5x4:
return CompressedTextureSize(Image.Width, Image.Height, 5, 4, 16);
case GalImageFormat.ASTC_6x5:
return CompressedTextureSize(Image.Width, Image.Height, 6, 5, 16);
case GalImageFormat.ASTC_8x6:
return CompressedTextureSize(Image.Width, Image.Height, 8, 6, 16);
case GalImageFormat.ASTC_10x8:
return CompressedTextureSize(Image.Width, Image.Height, 10, 8, 16);
case GalImageFormat.ASTC_12x10:
return CompressedTextureSize(Image.Width, Image.Height, 12, 10, 16);
case GalImageFormat.ASTC_8x5:
return CompressedTextureSize(Image.Width, Image.Height, 8, 5, 16);
case GalImageFormat.ASTC_10x5:
return CompressedTextureSize(Image.Width, Image.Height, 10, 5, 16);
case GalImageFormat.ASTC_10x6:
return CompressedTextureSize(Image.Width, Image.Height, 10, 6, 16);
}
throw new NotImplementedException((Image.Format & GalImageFormat.FormatMask).ToString());
}
public static bool HasColor(GalImageFormat Format)
{
return GetImageDescriptor(Format).HasColor;
}
public static bool HasDepth(GalImageFormat Format)
{
return GetImageDescriptor(Format).HasDepth;
}
public static bool HasStencil(GalImageFormat Format)
{
return GetImageDescriptor(Format).HasStencil;
}
public static bool IsCompressed(GalImageFormat Format)
{
return GetImageDescriptor(Format).Compressed;
}
private static ImageDescriptor GetImageDescriptor(GalImageFormat Format)
{
GalImageFormat TypeLess = (Format & GalImageFormat.FormatMask);
if (s_ImageTable.TryGetValue(TypeLess, out ImageDescriptor Descriptor))
{
return Descriptor;
}
throw new NotImplementedException("Image with format " + TypeLess.ToString() + " not implemented");
}
private static GalImageFormat GetFormatType(GalTextureType Type)
{
switch (Type)
{
case GalTextureType.Snorm: return Snorm;
case GalTextureType.Unorm: return Unorm;
case GalTextureType.Sint: return Sint;
case GalTextureType.Uint: return Uint;
case GalTextureType.Float: return Sfloat;
default: throw new NotImplementedException(((int)Type).ToString());
}
}
private 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;
}
}
}

2
Ryujinx.Graphics/Gal/Texture/IntegerEncoded.cs → Ryujinx.Graphics/Texture/IntegerEncoded.cs
View file

@ -1,7 +1,7 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
namespace Ryujinx.Graphics.Gal.Texture namespace Ryujinx.Graphics.Texture
{ {
public struct IntegerEncoded public struct IntegerEncoded
{ {

2
Ryujinx.HLE/Gpu/Texture/LinearSwizzle.cs → Ryujinx.Graphics/Texture/LinearSwizzle.cs
View file

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.Gpu.Texture namespace Ryujinx.Graphics.Texture
{ {
class LinearSwizzle : ISwizzle class LinearSwizzle : ISwizzle
{ {

25
Ryujinx.HLE/Gpu/Texture/TextureFactory.cs → Ryujinx.Graphics/Texture/TextureFactory.cs
View file

@ -1,8 +1,8 @@
using Ryujinx.Graphics.Gal; using Ryujinx.Graphics.Gal;
using Ryujinx.HLE.Gpu.Memory; using Ryujinx.Graphics.Memory;
using System; using System;
namespace Ryujinx.HLE.Gpu.Texture namespace Ryujinx.Graphics.Texture
{ {
static class TextureFactory static class TextureFactory
{ {
@ -10,12 +10,7 @@ namespace Ryujinx.HLE.Gpu.Texture
{ {
int[] Tic = ReadWords(Vmm, TicPosition, 8); int[] Tic = ReadWords(Vmm, TicPosition, 8);
GalTextureType RType = (GalTextureType)((Tic[0] >> 7) & 7); GalImageFormat Format = GetImageFormat(Tic);
GalTextureType GType = (GalTextureType)((Tic[0] >> 10) & 7);
GalTextureType BType = (GalTextureType)((Tic[0] >> 13) & 7);
GalTextureType AType = (GalTextureType)((Tic[0] >> 16) & 7);
GalImageFormat Format = ImageFormatConverter.ConvertTexture((GalTextureFormat)(Tic[0] & 0x7f), RType, GType, BType, AType);
GalTextureSource XSource = (GalTextureSource)((Tic[0] >> 19) & 7); GalTextureSource XSource = (GalTextureSource)((Tic[0] >> 19) & 7);
GalTextureSource YSource = (GalTextureSource)((Tic[0] >> 22) & 7); GalTextureSource YSource = (GalTextureSource)((Tic[0] >> 22) & 7);
@ -39,7 +34,7 @@ namespace Ryujinx.HLE.Gpu.Texture
{ {
int[] Tic = ReadWords(Vmm, TicPosition, 8); int[] Tic = ReadWords(Vmm, TicPosition, 8);
GalTextureFormat Format = (GalTextureFormat)(Tic[0] & 0x7f); GalImageFormat Format = GetImageFormat(Tic);
long TextureAddress = (uint)Tic[1]; long TextureAddress = (uint)Tic[1];
@ -110,6 +105,18 @@ namespace Ryujinx.HLE.Gpu.Texture
BorderColor); BorderColor);
} }
private static GalImageFormat GetImageFormat(int[] Tic)
{
GalTextureType RType = (GalTextureType)((Tic[0] >> 7) & 7);
GalTextureType GType = (GalTextureType)((Tic[0] >> 10) & 7);
GalTextureType BType = (GalTextureType)((Tic[0] >> 13) & 7);
GalTextureType AType = (GalTextureType)((Tic[0] >> 16) & 7);
GalTextureFormat Format = (GalTextureFormat)(Tic[0] & 0x7f);
return ImageUtils.ConvertTexture(Format, RType, GType, BType, AType);
}
private static int[] ReadWords(NvGpuVmm Vmm, long Position, int Count) private static int[] ReadWords(NvGpuVmm Vmm, long Position, int Count)
{ {
int[] Words = new int[Count]; int[] Words = new int[Count];

45
Ryujinx.Graphics/Texture/TextureHelper.cs Normal file
View file

@ -0,0 +1,45 @@
using ChocolArm64.Memory;
using Ryujinx.Graphics.Gal;
using Ryujinx.Graphics.Memory;
using System;
namespace Ryujinx.Graphics.Texture
{
static class TextureHelper
{
public static ISwizzle GetSwizzle(TextureInfo Texture, int BlockWidth, int Bpp)
{
int Width = (Texture.Width + (BlockWidth - 1)) / BlockWidth;
int AlignMask = Texture.TileWidth * (64 / Bpp) - 1;
Width = (Width + AlignMask) & ~AlignMask;
switch (Texture.Swizzle)
{
case TextureSwizzle._1dBuffer:
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());
}
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);
}
}
}

10
Ryujinx.HLE/Gpu/Texture/TextureInfo.cs → Ryujinx.Graphics/Texture/TextureInfo.cs
View file

@ -1,8 +1,8 @@
using Ryujinx.Graphics.Gal; using Ryujinx.Graphics.Gal;
namespace Ryujinx.HLE.Gpu.Texture namespace Ryujinx.Graphics.Texture
{ {
struct TextureInfo public struct TextureInfo
{ {
public long Position { get; private set; } public long Position { get; private set; }
@ -15,7 +15,7 @@ namespace Ryujinx.HLE.Gpu.Texture
public TextureSwizzle Swizzle { get; private set; } public TextureSwizzle Swizzle { get; private set; }
public GalTextureFormat Format { get; private set; } public GalImageFormat Format { get; private set; }
public TextureInfo( public TextureInfo(
long Position, long Position,
@ -34,7 +34,7 @@ namespace Ryujinx.HLE.Gpu.Texture
Swizzle = TextureSwizzle.BlockLinear; Swizzle = TextureSwizzle.BlockLinear;
Format = GalTextureFormat.A8B8G8R8; Format = GalImageFormat.A8B8G8R8 | GalImageFormat.Unorm;
} }
public TextureInfo( public TextureInfo(
@ -45,7 +45,7 @@ namespace Ryujinx.HLE.Gpu.Texture
int BlockHeight, int BlockHeight,
int TileWidth, int TileWidth,
TextureSwizzle Swizzle, TextureSwizzle Swizzle,
GalTextureFormat Format) GalImageFormat Format)
{ {
this.Position = Position; this.Position = Position;
this.Width = Width; this.Width = Width;

140
Ryujinx.HLE/Gpu/Texture/TextureReader.cs → Ryujinx.Graphics/Texture/TextureReader.cs
View file

@ -2,58 +2,20 @@ using ChocolArm64.Memory;
using Ryujinx.Graphics.Gal; using Ryujinx.Graphics.Gal;
using System; using System;
namespace Ryujinx.HLE.Gpu.Texture namespace Ryujinx.Graphics.Texture
{ {
static class TextureReader delegate byte[] TextureReaderDelegate(IAMemory Memory, TextureInfo Texture);
public static class TextureReader
{ {
public static byte[] Read(IAMemory Memory, TextureInfo Texture) public static byte[] Read(IAMemory Memory, TextureInfo Texture)
{ {
switch (Texture.Format) TextureReaderDelegate Reader = ImageUtils.GetReader(Texture.Format);
{
case GalTextureFormat.R32G32B32A32: return Read16Bpp (Memory, Texture); return Reader(Memory, Texture);
case GalTextureFormat.R16G16B16A16: return Read8Bpp (Memory, Texture);
case GalTextureFormat.R32G32: return Read8Bpp (Memory, Texture);
case GalTextureFormat.A8B8G8R8: return Read4Bpp (Memory, Texture);
case GalTextureFormat.A2B10G10R10: return Read4Bpp (Memory, Texture);
case GalTextureFormat.R32: return Read4Bpp (Memory, Texture);
case GalTextureFormat.BF10GF11RF11: return Read4Bpp (Memory, Texture);
case GalTextureFormat.Z24S8: return Read4Bpp (Memory, Texture);
case GalTextureFormat.A1B5G5R5: return Read5551 (Memory, Texture);
case GalTextureFormat.B5G6R5: return Read565 (Memory, Texture);
case GalTextureFormat.A4B4G4R4: return Read2Bpp (Memory, Texture);
case GalTextureFormat.G8R8: return Read2Bpp (Memory, Texture);
case GalTextureFormat.R16: return Read2Bpp (Memory, Texture);
case GalTextureFormat.R8: return Read1Bpp (Memory, Texture);
case GalTextureFormat.BC6H_SF16: return Read16BptCompressedTexture(Memory, Texture, 4, 4);
case GalTextureFormat.BC6H_UF16: return Read16BptCompressedTexture(Memory, Texture, 4, 4);
case GalTextureFormat.BC7U: return Read16BptCompressedTexture(Memory, Texture, 4, 4);
case GalTextureFormat.BC1: return Read8Bpt4x4 (Memory, Texture);
case GalTextureFormat.BC2: return Read16BptCompressedTexture(Memory, Texture, 4, 4);
case GalTextureFormat.BC3: return Read16BptCompressedTexture(Memory, Texture, 4, 4);
case GalTextureFormat.BC4: return Read8Bpt4x4 (Memory, Texture);
case GalTextureFormat.BC5: return Read16BptCompressedTexture(Memory, Texture, 4, 4);
case GalTextureFormat.ZF32: return Read4Bpp (Memory, Texture);
case GalTextureFormat.ZF32_X24S8: return Read8Bpp (Memory, Texture);
case GalTextureFormat.Astc2D4x4: return Read16BptCompressedTexture(Memory, Texture, 4, 4);
case GalTextureFormat.Astc2D5x5: return Read16BptCompressedTexture(Memory, Texture, 5, 5);
case GalTextureFormat.Astc2D6x6: return Read16BptCompressedTexture(Memory, Texture, 6, 6);
case GalTextureFormat.Astc2D8x8: return Read16BptCompressedTexture(Memory, Texture, 8, 8);
case GalTextureFormat.Astc2D10x10: return Read16BptCompressedTexture(Memory, Texture, 10, 10);
case GalTextureFormat.Astc2D12x12: return Read16BptCompressedTexture(Memory, Texture, 12, 12);
case GalTextureFormat.Astc2D5x4: return Read16BptCompressedTexture(Memory, Texture, 5, 4);
case GalTextureFormat.Astc2D6x5: return Read16BptCompressedTexture(Memory, Texture, 6, 5);
case GalTextureFormat.Astc2D8x6: return Read16BptCompressedTexture(Memory, Texture, 8, 6);
case GalTextureFormat.Astc2D10x8: return Read16BptCompressedTexture(Memory, Texture, 10, 8);
case GalTextureFormat.Astc2D12x10: return Read16BptCompressedTexture(Memory, Texture, 12, 10);
case GalTextureFormat.Astc2D8x5: return Read16BptCompressedTexture(Memory, Texture, 8, 5);
case GalTextureFormat.Astc2D10x5: return Read16BptCompressedTexture(Memory, Texture, 10, 5);
case GalTextureFormat.Astc2D10x6: return Read16BptCompressedTexture(Memory, Texture, 10, 6);
} }
throw new NotImplementedException("0x" + ((int)Texture.Format).ToString("x2")); internal unsafe static byte[] Read1Bpp(IAMemory Memory, TextureInfo Texture)
}
private unsafe static byte[] Read1Bpp(IAMemory Memory, TextureInfo Texture)
{ {
int Width = Texture.Width; int Width = Texture.Width;
int Height = Texture.Height; int Height = Texture.Height;
@ -86,7 +48,7 @@ namespace Ryujinx.HLE.Gpu.Texture
return Output; return Output;
} }
private unsafe static byte[] Read5551(IAMemory Memory, TextureInfo Texture) internal unsafe static byte[] Read5551(IAMemory Memory, TextureInfo Texture)
{ {
int Width = Texture.Width; int Width = Texture.Width;
int Height = Texture.Height; int Height = Texture.Height;
@ -124,7 +86,7 @@ namespace Ryujinx.HLE.Gpu.Texture
return Output; return Output;
} }
private unsafe static byte[] Read565(IAMemory Memory, TextureInfo Texture) internal unsafe static byte[] Read565(IAMemory Memory, TextureInfo Texture)
{ {
int Width = Texture.Width; int Width = Texture.Width;
int Height = Texture.Height; int Height = Texture.Height;
@ -161,7 +123,7 @@ namespace Ryujinx.HLE.Gpu.Texture
return Output; return Output;
} }
private unsafe static byte[] Read2Bpp(IAMemory Memory, TextureInfo Texture) internal unsafe static byte[] Read2Bpp(IAMemory Memory, TextureInfo Texture)
{ {
int Width = Texture.Width; int Width = Texture.Width;
int Height = Texture.Height; int Height = Texture.Height;
@ -194,7 +156,7 @@ namespace Ryujinx.HLE.Gpu.Texture
return Output; return Output;
} }
private unsafe static byte[] Read4Bpp(IAMemory Memory, TextureInfo Texture) internal unsafe static byte[] Read4Bpp(IAMemory Memory, TextureInfo Texture)
{ {
int Width = Texture.Width; int Width = Texture.Width;
int Height = Texture.Height; int Height = Texture.Height;
@ -227,7 +189,7 @@ namespace Ryujinx.HLE.Gpu.Texture
return Output; return Output;
} }
private unsafe static byte[] Read8Bpp(IAMemory Memory, TextureInfo Texture) internal unsafe static byte[] Read8Bpp(IAMemory Memory, TextureInfo Texture)
{ {
int Width = Texture.Width; int Width = Texture.Width;
int Height = Texture.Height; int Height = Texture.Height;
@ -260,7 +222,7 @@ namespace Ryujinx.HLE.Gpu.Texture
return Output; return Output;
} }
private unsafe static byte[] Read16Bpp(IAMemory Memory, TextureInfo Texture) internal unsafe static byte[] Read16Bpp(IAMemory Memory, TextureInfo Texture)
{ {
int Width = Texture.Width; int Width = Texture.Width;
int Height = Texture.Height; int Height = Texture.Height;
@ -295,7 +257,7 @@ namespace Ryujinx.HLE.Gpu.Texture
return Output; return Output;
} }
private unsafe static byte[] Read8Bpt4x4(IAMemory Memory, TextureInfo Texture) internal unsafe static byte[] Read8Bpt4x4(IAMemory Memory, TextureInfo Texture)
{ {
int Width = (Texture.Width + 3) / 4; int Width = (Texture.Width + 3) / 4;
int Height = (Texture.Height + 3) / 4; int Height = (Texture.Height + 3) / 4;
@ -328,7 +290,7 @@ namespace Ryujinx.HLE.Gpu.Texture
return Output; return Output;
} }
private unsafe static byte[] Read16BptCompressedTexture(IAMemory Memory, TextureInfo Texture, int BlockWidth, int BlockHeight) internal unsafe static byte[] Read16BptCompressedTexture(IAMemory Memory, TextureInfo Texture, int BlockWidth, int BlockHeight)
{ {
int Width = (Texture.Width + (BlockWidth - 1)) / BlockWidth; int Width = (Texture.Width + (BlockWidth - 1)) / BlockWidth;
int Height = (Texture.Height + (BlockHeight - 1)) / BlockHeight; int Height = (Texture.Height + (BlockHeight - 1)) / BlockHeight;
@ -362,5 +324,75 @@ namespace Ryujinx.HLE.Gpu.Texture
return Output; return Output;
} }
internal static byte[] Read16BptCompressedTexture4x4(IAMemory Memory, TextureInfo Texture)
{
return Read16BptCompressedTexture(Memory, Texture, 4, 4);
}
internal static byte[] Read16BptCompressedTexture5x5(IAMemory Memory, TextureInfo Texture)
{
return Read16BptCompressedTexture(Memory, Texture, 5, 5);
}
internal static byte[] Read16BptCompressedTexture6x6(IAMemory Memory, TextureInfo Texture)
{
return Read16BptCompressedTexture(Memory, Texture, 6, 6);
}
internal static byte[] Read16BptCompressedTexture8x8(IAMemory Memory, TextureInfo Texture)
{
return Read16BptCompressedTexture(Memory, Texture, 8, 8);
}
internal static byte[] Read16BptCompressedTexture10x10(IAMemory Memory, TextureInfo Texture)
{
return Read16BptCompressedTexture(Memory, Texture, 10, 10);
}
internal static byte[] Read16BptCompressedTexture12x12(IAMemory Memory, TextureInfo Texture)
{
return Read16BptCompressedTexture(Memory, Texture, 12, 12);
}
internal static byte[] Read16BptCompressedTexture5x4(IAMemory Memory, TextureInfo Texture)
{
return Read16BptCompressedTexture(Memory, Texture, 5, 4);
}
internal static byte[] Read16BptCompressedTexture6x5(IAMemory Memory, TextureInfo Texture)
{
return Read16BptCompressedTexture(Memory, Texture, 6, 5);
}
internal static byte[] Read16BptCompressedTexture8x6(IAMemory Memory, TextureInfo Texture)
{
return Read16BptCompressedTexture(Memory, Texture, 8, 6);
}
internal static byte[] Read16BptCompressedTexture10x8(IAMemory Memory, TextureInfo Texture)
{
return Read16BptCompressedTexture(Memory, Texture, 10, 8);
}
internal static byte[] Read16BptCompressedTexture12x10(IAMemory Memory, TextureInfo Texture)
{
return Read16BptCompressedTexture(Memory, Texture, 12, 10);
}
internal static byte[] Read16BptCompressedTexture8x5(IAMemory Memory, TextureInfo Texture)
{
return Read16BptCompressedTexture(Memory, Texture, 5, 5);
}
internal static byte[] Read16BptCompressedTexture10x5(IAMemory Memory, TextureInfo Texture)
{
return Read16BptCompressedTexture(Memory, Texture, 10, 5);
}
internal static byte[] Read16BptCompressedTexture10x6(IAMemory Memory, TextureInfo Texture)
{
return Read16BptCompressedTexture(Memory, Texture, 10, 6);
}
} }
} }

4
Ryujinx.HLE/Gpu/Texture/TextureSwizzle.cs → Ryujinx.Graphics/Texture/TextureSwizzle.cs
View file

@ -1,6 +1,6 @@
namespace Ryujinx.HLE.Gpu.Texture namespace Ryujinx.Graphics.Texture
{ {
enum TextureSwizzle public enum TextureSwizzle
{ {
_1dBuffer = 0, _1dBuffer = 0,
PitchColorKey = 1, PitchColorKey = 1,

4
Ryujinx.HLE/Gpu/Texture/TextureWriter.cs → Ryujinx.Graphics/Texture/TextureWriter.cs
View file

@ -1,6 +1,8 @@
using ChocolArm64.Memory; using ChocolArm64.Memory;
using Ryujinx.Graphics.Gal;
using Ryujinx.Graphics.Memory;
namespace Ryujinx.HLE.Gpu.Texture namespace Ryujinx.Graphics.Texture
{ {
static class TextureWriter static class TextureWriter
{ {

204
Ryujinx.HLE/Gpu/Texture/TextureHelper.cs
View file

@ -1,204 +0,0 @@
using ChocolArm64.Memory;
using Ryujinx.Graphics.Gal;
using Ryujinx.HLE.Gpu.Memory;
using System;
namespace Ryujinx.HLE.Gpu.Texture
{
static class TextureHelper
{
public static ISwizzle GetSwizzle(TextureInfo Texture, int BlockWidth, int Bpp)
{
int Width = (Texture.Width + (BlockWidth - 1)) / BlockWidth;
int AlignMask = Texture.TileWidth * (64 / Bpp) - 1;
Width = (Width + AlignMask) & ~AlignMask;
switch (Texture.Swizzle)
{
case TextureSwizzle._1dBuffer:
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());
}
public static int GetTextureSize(GalImage Image)
{
switch (Image.Format)
{
case GalImageFormat.R32G32B32A32_SFLOAT:
case GalImageFormat.R32G32B32A32_SINT:
case GalImageFormat.R32G32B32A32_UINT:
return Image.Width * Image.Height * 16;
case GalImageFormat.R16G16B16A16_SFLOAT:
case GalImageFormat.R16G16B16A16_SINT:
case GalImageFormat.R16G16B16A16_SNORM:
case GalImageFormat.R16G16B16A16_UINT:
case GalImageFormat.R16G16B16A16_UNORM:
case GalImageFormat.D32_SFLOAT_S8_UINT:
case GalImageFormat.R32G32_SFLOAT:
case GalImageFormat.R32G32_SINT:
case GalImageFormat.R32G32_UINT:
return Image.Width * Image.Height * 8;
case GalImageFormat.A8B8G8R8_SINT_PACK32:
case GalImageFormat.A8B8G8R8_SNORM_PACK32:
case GalImageFormat.A8B8G8R8_UINT_PACK32:
case GalImageFormat.A8B8G8R8_UNORM_PACK32:
case GalImageFormat.A8B8G8R8_SRGB_PACK32:
case GalImageFormat.A2B10G10R10_SINT_PACK32:
case GalImageFormat.A2B10G10R10_SNORM_PACK32:
case GalImageFormat.A2B10G10R10_UINT_PACK32:
case GalImageFormat.A2B10G10R10_UNORM_PACK32:
case GalImageFormat.R16G16_SFLOAT:
case GalImageFormat.R16G16_SINT:
case GalImageFormat.R16G16_SNORM:
case GalImageFormat.R16G16_UINT:
case GalImageFormat.R16G16_UNORM:
case GalImageFormat.R32_SFLOAT:
case GalImageFormat.R32_SINT:
case GalImageFormat.R32_UINT:
case GalImageFormat.D32_SFLOAT:
case GalImageFormat.B10G11R11_UFLOAT_PACK32:
case GalImageFormat.D24_UNORM_S8_UINT:
return Image.Width * Image.Height * 4;
case GalImageFormat.B4G4R4A4_UNORM_PACK16:
case GalImageFormat.A1R5G5B5_UNORM_PACK16:
case GalImageFormat.B5G6R5_UNORM_PACK16:
case GalImageFormat.R8G8_SINT:
case GalImageFormat.R8G8_SNORM:
case GalImageFormat.R8G8_UINT:
case GalImageFormat.R8G8_UNORM:
case GalImageFormat.R16_SFLOAT:
case GalImageFormat.R16_SINT:
case GalImageFormat.R16_SNORM:
case GalImageFormat.R16_UINT:
case GalImageFormat.R16_UNORM:
case GalImageFormat.D16_UNORM:
return Image.Width * Image.Height * 2;
case GalImageFormat.R8_SINT:
case GalImageFormat.R8_SNORM:
case GalImageFormat.R8_UINT:
case GalImageFormat.R8_UNORM:
return Image.Width * Image.Height;
case GalImageFormat.BC1_RGBA_UNORM_BLOCK:
case GalImageFormat.BC4_SNORM_BLOCK:
case GalImageFormat.BC4_UNORM_BLOCK:
{
return CompressedTextureSize(Image.Width, Image.Height, 4, 4, 8);
}
case GalImageFormat.BC6H_SFLOAT_BLOCK:
case GalImageFormat.BC6H_UFLOAT_BLOCK:
case GalImageFormat.BC7_UNORM_BLOCK:
case GalImageFormat.BC2_UNORM_BLOCK:
case GalImageFormat.BC3_UNORM_BLOCK:
case GalImageFormat.BC5_SNORM_BLOCK:
case GalImageFormat.BC5_UNORM_BLOCK:
case GalImageFormat.ASTC_4x4_UNORM_BLOCK:
{
return CompressedTextureSize(Image.Width, Image.Height, 4, 4, 16);
}
case GalImageFormat.ASTC_5x5_UNORM_BLOCK:
{
return CompressedTextureSize(Image.Width, Image.Height, 5, 5, 16);
}
case GalImageFormat.ASTC_6x6_UNORM_BLOCK:
{
return CompressedTextureSize(Image.Width, Image.Height, 6, 6, 16);
}
case GalImageFormat.ASTC_8x8_UNORM_BLOCK:
{
return CompressedTextureSize(Image.Width, Image.Height, 8, 8, 16);
}
case GalImageFormat.ASTC_10x10_UNORM_BLOCK:
{
return CompressedTextureSize(Image.Width, Image.Height, 10, 10, 16);
}
case GalImageFormat.ASTC_12x12_UNORM_BLOCK:
{
return CompressedTextureSize(Image.Width, Image.Height, 12, 12, 16);
}
case GalImageFormat.ASTC_5x4_UNORM_BLOCK:
{
return CompressedTextureSize(Image.Width, Image.Height, 5, 4, 16);
}
case GalImageFormat.ASTC_6x5_UNORM_BLOCK:
{
return CompressedTextureSize(Image.Width, Image.Height, 6, 5, 16);
}
case GalImageFormat.ASTC_8x6_UNORM_BLOCK:
{
return CompressedTextureSize(Image.Width, Image.Height, 8, 6, 16);
}
case GalImageFormat.ASTC_10x8_UNORM_BLOCK:
{
return CompressedTextureSize(Image.Width, Image.Height, 10, 8, 16);
}
case GalImageFormat.ASTC_12x10_UNORM_BLOCK:
{
return CompressedTextureSize(Image.Width, Image.Height, 12, 10, 16);
}
case GalImageFormat.ASTC_8x5_UNORM_BLOCK:
{
return CompressedTextureSize(Image.Width, Image.Height, 8, 5, 16);
}
case GalImageFormat.ASTC_10x5_UNORM_BLOCK:
{
return CompressedTextureSize(Image.Width, Image.Height, 10, 5, 16);
}
case GalImageFormat.ASTC_10x6_UNORM_BLOCK:
{
return CompressedTextureSize(Image.Width, Image.Height, 10, 6, 16);
}
}
throw new NotImplementedException(Image.Format.ToString());
}
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;
}
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);
}
}
}

2
Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASCtx.cs
View file

@ -1,4 +1,4 @@
using Ryujinx.HLE.Gpu.Memory; using Ryujinx.Graphics.Memory;
using System.Collections.Generic; using System.Collections.Generic;
namespace Ryujinx.HLE.HOS.Services.Nv.NvGpuAS namespace Ryujinx.HLE.HOS.Services.Nv.NvGpuAS

2
Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASIoctl.cs
View file

@ -1,5 +1,5 @@
using ChocolArm64.Memory; using ChocolArm64.Memory;
using Ryujinx.HLE.Gpu.Memory; using Ryujinx.Graphics.Memory;
using Ryujinx.HLE.HOS.Services.Nv.NvMap; using Ryujinx.HLE.HOS.Services.Nv.NvMap;
using Ryujinx.HLE.Logging; using Ryujinx.HLE.Logging;
using System; using System;

2
Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs
View file

@ -1,5 +1,5 @@
using ChocolArm64.Memory; using ChocolArm64.Memory;
using Ryujinx.HLE.Gpu.Memory; using Ryujinx.Graphics.Memory;
using Ryujinx.HLE.HOS.Services.Nv.NvGpuAS; using Ryujinx.HLE.HOS.Services.Nv.NvGpuAS;
using Ryujinx.HLE.Logging; using Ryujinx.HLE.Logging;
using System; using System;

2
Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapIoctl.cs
View file

@ -1,5 +1,5 @@
using ChocolArm64.Memory; using ChocolArm64.Memory;
using Ryujinx.HLE.Gpu.Memory; using Ryujinx.Graphics.Memory;
using Ryujinx.HLE.Logging; using Ryujinx.HLE.Logging;
using Ryujinx.HLE.Utilities; using Ryujinx.HLE.Utilities;
using System.Collections.Concurrent; using System.Collections.Concurrent;

8
Ryujinx.HLE/HOS/Services/Vi/NvFlinger.cs
View file

@ -1,5 +1,5 @@
using Ryujinx.Graphics.Gal; using Ryujinx.Graphics.Gal;
using Ryujinx.HLE.Gpu.Texture; using Ryujinx.Graphics.Texture;
using Ryujinx.HLE.HOS.Kernel; using Ryujinx.HLE.HOS.Kernel;
using Ryujinx.HLE.HOS.Services.Nv.NvMap; using Ryujinx.HLE.HOS.Services.Nv.NvMap;
using Ryujinx.HLE.Logging; using Ryujinx.HLE.Logging;
@ -303,7 +303,7 @@ namespace Ryujinx.HLE.HOS.Services.Android
int Right = Crop.Right; int Right = Crop.Right;
int Bottom = Crop.Bottom; int Bottom = Crop.Bottom;
Renderer.QueueAction(() => Renderer.FrameBuffer.SetTransform(FlipX, FlipY, Top, Left, Right, Bottom)); Renderer.QueueAction(() => Renderer.RenderTarget.SetTransform(FlipX, FlipY, Top, Left, Right, Bottom));
//TODO: Support double buffering here aswell, it is broken for GPU //TODO: Support double buffering here aswell, it is broken for GPU
//frame buffers because it seems to be completely out of sync. //frame buffers because it seems to be completely out of sync.
@ -311,7 +311,7 @@ namespace Ryujinx.HLE.HOS.Services.Android
{ {
//Frame buffer is rendered to by the GPU, we can just //Frame buffer is rendered to by the GPU, we can just
//bind the frame buffer texture, it's not necessary to read anything. //bind the frame buffer texture, it's not necessary to read anything.
Renderer.QueueAction(() => Renderer.FrameBuffer.Set(FbAddr)); Renderer.QueueAction(() => Renderer.RenderTarget.Set(FbAddr));
} }
else else
{ {
@ -321,7 +321,7 @@ namespace Ryujinx.HLE.HOS.Services.Android
byte[] Data = TextureReader.Read(Context.Memory, Texture); byte[] Data = TextureReader.Read(Context.Memory, Texture);
Renderer.QueueAction(() => Renderer.FrameBuffer.Set(Data, FbWidth, FbHeight)); Renderer.QueueAction(() => Renderer.RenderTarget.Set(Data, FbWidth, FbHeight));
} }
Context.Device.Gpu.Renderer.QueueAction(() => ReleaseBuffer(Slot)); Context.Device.Gpu.Renderer.QueueAction(() => ReleaseBuffer(Slot));

2
Ryujinx.HLE/Switch.cs
View file

@ -1,6 +1,6 @@
using Ryujinx.Audio; using Ryujinx.Audio;
using Ryujinx.Graphics;
using Ryujinx.Graphics.Gal; using Ryujinx.Graphics.Gal;
using Ryujinx.HLE.Gpu;
using Ryujinx.HLE.HOS; using Ryujinx.HLE.HOS;
using Ryujinx.HLE.Input; using Ryujinx.HLE.Input;
using Ryujinx.HLE.Logging; using Ryujinx.HLE.Logging;

6
Ryujinx/Ui/GLScreen.cs
View file

@ -73,7 +73,7 @@ namespace Ryujinx
{ {
ResizeEvent = false; ResizeEvent = false;
Renderer.FrameBuffer.SetWindowSize(Width, Height); Renderer.RenderTarget.SetWindowSize(Width, Height);
} }
Ticks += Chrono.ElapsedTicks; Ticks += Chrono.ElapsedTicks;
@ -96,7 +96,7 @@ namespace Ryujinx
Visible = true; Visible = true;
Renderer.FrameBuffer.SetWindowSize(Width, Height); Renderer.RenderTarget.SetWindowSize(Width, Height);
Context.MakeCurrent(null); Context.MakeCurrent(null);
@ -251,7 +251,7 @@ namespace Ryujinx
private new void RenderFrame() private new void RenderFrame()
{ {
Renderer.FrameBuffer.Render(); Renderer.RenderTarget.Render();
Device.Statistics.RecordSystemFrameTime(); Device.Statistics.RecordSystemFrameTime();