diff options
| author | Alex Barney <thealexbarney@gmail.com> | 2019-03-03 19:45:25 -0600 |
|---|---|---|
| committer | jduncanator <1518948+jduncanator@users.noreply.github.com> | 2019-03-04 12:45:25 +1100 |
| commit | 1f554c1093dde6a4d3ed80fae2675abfb6c12fac (patch) | |
| tree | bbbdfb87999168288777ac404081f3e49c7440ae /Ryujinx.Graphics/Gal | |
| parent | 8e71ea0812f6b56ff819dbda951b463bcb5eb8dc (diff) | |
Do naming refactoring on Ryujinx.Graphics (#611)
* Renaming part 1
* Renaming part 2
* Renaming part 3
* Renaming part 4
* Renaming part 5
* Renaming part 6
* Renaming part 7
* Renaming part 8
* Renaming part 9
* Renaming part 10
* General cleanup
* Thought I got all of these
* Apply #595
* Additional renaming
* Tweaks from feedback
* Rename files
Diffstat (limited to 'Ryujinx.Graphics/Gal')
76 files changed, 4840 insertions, 4839 deletions
diff --git a/Ryujinx.Graphics/Gal/EmbeddedResource.cs b/Ryujinx.Graphics/Gal/EmbeddedResource.cs index 45b77da7..ba662499 100644 --- a/Ryujinx.Graphics/Gal/EmbeddedResource.cs +++ b/Ryujinx.Graphics/Gal/EmbeddedResource.cs @@ -5,15 +5,15 @@ namespace Ryujinx.Graphics.Gal { static class EmbeddedResource { - public static string GetString(string Name) + public static string GetString(string name) { - Assembly Asm = typeof(EmbeddedResource).Assembly; + Assembly asm = typeof(EmbeddedResource).Assembly; - using (Stream ResStream = Asm.GetManifestResourceStream(Name)) + using (Stream resStream = asm.GetManifestResourceStream(name)) { - StreamReader Reader = new StreamReader(ResStream); + StreamReader reader = new StreamReader(resStream); - return Reader.ReadToEnd(); + return reader.ReadToEnd(); } } } diff --git a/Ryujinx.Graphics/Gal/GalColorF.cs b/Ryujinx.Graphics/Gal/GalColorF.cs index 7cfb171d..e915870c 100644 --- a/Ryujinx.Graphics/Gal/GalColorF.cs +++ b/Ryujinx.Graphics/Gal/GalColorF.cs @@ -8,15 +8,15 @@ namespace Ryujinx.Graphics.Gal public float Alpha { get; private set; } public GalColorF( - float Red, - float Green, - float Blue, - float Alpha) + float red, + float green, + float blue, + float alpha) { - this.Red = Red; - this.Green = Green; - this.Blue = Blue; - this.Alpha = Alpha; + Red = red; + Green = green; + Blue = blue; + Alpha = alpha; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/GalFrontFace.cs b/Ryujinx.Graphics/Gal/GalFrontFace.cs index 17ad1126..6cc4a802 100644 --- a/Ryujinx.Graphics/Gal/GalFrontFace.cs +++ b/Ryujinx.Graphics/Gal/GalFrontFace.cs @@ -2,7 +2,7 @@ { public enum GalFrontFace { - CW = 0x900, - CCW = 0x901 + Cw = 0x900, + Ccw = 0x901 } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/GalImage.cs b/Ryujinx.Graphics/Gal/GalImage.cs index fb904b09..1345704d 100644 --- a/Ryujinx.Graphics/Gal/GalImage.cs +++ b/Ryujinx.Graphics/Gal/GalImage.cs @@ -25,63 +25,63 @@ namespace Ryujinx.Graphics.Gal public GalTextureTarget TextureTarget; public GalImage( - int Width, - int Height, - int Depth, - int LayerCount, - int TileWidth, - int GobBlockHeight, - int GobBlockDepth, - GalMemoryLayout Layout, - GalImageFormat Format, - GalTextureTarget TextureTarget, - int MaxMipmapLevel = 1, - GalTextureSource XSource = GalTextureSource.Red, - GalTextureSource YSource = GalTextureSource.Green, - GalTextureSource ZSource = GalTextureSource.Blue, - GalTextureSource WSource = GalTextureSource.Alpha) + int width, + int height, + int depth, + int layerCount, + int tileWidth, + int gobBlockHeight, + int gobBlockDepth, + GalMemoryLayout layout, + GalImageFormat format, + GalTextureTarget textureTarget, + int maxMipmapLevel = 1, + GalTextureSource xSource = GalTextureSource.Red, + GalTextureSource ySource = GalTextureSource.Green, + GalTextureSource zSource = GalTextureSource.Blue, + GalTextureSource wSource = GalTextureSource.Alpha) { - this.Width = Width; - this.Height = Height; - this.LayerCount = LayerCount; - this.Depth = Depth; - this.TileWidth = TileWidth; - this.GobBlockHeight = GobBlockHeight; - this.GobBlockDepth = GobBlockDepth; - this.Layout = Layout; - this.Format = Format; - this.MaxMipmapLevel = MaxMipmapLevel; - this.XSource = XSource; - this.YSource = YSource; - this.ZSource = ZSource; - this.WSource = WSource; - this.TextureTarget = TextureTarget; + Width = width; + Height = height; + LayerCount = layerCount; + Depth = depth; + TileWidth = tileWidth; + GobBlockHeight = gobBlockHeight; + GobBlockDepth = gobBlockDepth; + Layout = layout; + Format = format; + MaxMipmapLevel = maxMipmapLevel; + XSource = xSource; + YSource = ySource; + ZSource = zSource; + WSource = wSource; + TextureTarget = textureTarget; - Pitch = ImageUtils.GetPitch(Format, Width); + Pitch = ImageUtils.GetPitch(format, width); } - public bool SizeMatches(GalImage Image, bool IgnoreLayer = false) + public bool SizeMatches(GalImage image, bool ignoreLayer = false) { if (ImageUtils.GetBytesPerPixel(Format) != - ImageUtils.GetBytesPerPixel(Image.Format)) + ImageUtils.GetBytesPerPixel(image.Format)) { return false; } if (ImageUtils.GetAlignedWidth(this) != - ImageUtils.GetAlignedWidth(Image)) + ImageUtils.GetAlignedWidth(image)) { return false; } - bool Result = Height == Image.Height && Depth == Image.Depth; + bool result = Height == image.Height && Depth == image.Depth; - if (!IgnoreLayer) + if (!ignoreLayer) { - Result = Result && LayerCount == Image.LayerCount; + result = result && LayerCount == image.LayerCount; } - return Result; + return result; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/GalImageFormat.cs b/Ryujinx.Graphics/Gal/GalImageFormat.cs index 70998d11..8dcde182 100644 --- a/Ryujinx.Graphics/Gal/GalImageFormat.cs +++ b/Ryujinx.Graphics/Gal/GalImageFormat.cs @@ -22,23 +22,23 @@ namespace Ryujinx.Graphics.Gal Astc2D12x12, Astc2DEnd, - RGBA4, - RGB565, - BGR565, - BGR5A1, - RGB5A1, + Rgba4, + Rgb565, + Bgr565, + Bgr5A1, + Rgb5A1, R8, - RG8, - RGBX8, - RGBA8, - BGRA8, - RGB10A2, + Rg8, + Rgbx8, + Rgba8, + Bgra8, + Rgb10A2, R16, - RG16, - RGBA16, + Rg16, + Rgba16, R32, - RG32, - RGBA32, + Rg32, + Rgba32, R11G11B10, D16, D24, diff --git a/Ryujinx.Graphics/Gal/GalPipelineState.cs b/Ryujinx.Graphics/Gal/GalPipelineState.cs index 8deb68b4..c044a55f 100644 --- a/Ryujinx.Graphics/Gal/GalPipelineState.cs +++ b/Ryujinx.Graphics/Gal/GalPipelineState.cs @@ -2,7 +2,7 @@ { public struct ColorMaskState { - private static readonly ColorMaskState _Default = new ColorMaskState() + private static readonly ColorMaskState DefaultBackingField = new ColorMaskState() { Red = true, Green = true, @@ -10,7 +10,7 @@ Alpha = true }; - public static ColorMaskState Default => _Default; + public static ColorMaskState Default => DefaultBackingField; public bool Red; public bool Green; @@ -20,7 +20,7 @@ public struct BlendState { - private static readonly BlendState _Default = new BlendState() + private static readonly BlendState DefaultBackingField = new BlendState() { Enabled = false, SeparateAlpha = false, @@ -32,7 +32,7 @@ FuncDstAlpha = GalBlendFactor.Zero }; - public static BlendState Default => _Default; + public static BlendState Default => DefaultBackingField; public bool Enabled; public bool SeparateAlpha; @@ -111,9 +111,9 @@ { ConstBufferKeys = new long[Stages][]; - for (int Stage = 0; Stage < Stages; Stage++) + for (int stage = 0; stage < Stages; stage++) { - ConstBufferKeys[Stage] = new long[ConstBuffersPerStage]; + ConstBufferKeys[stage] = new long[ConstBuffersPerStage]; } Blends = new BlendState[RenderTargetsCount]; diff --git a/Ryujinx.Graphics/Gal/GalSurfaceFormat.cs b/Ryujinx.Graphics/Gal/GalSurfaceFormat.cs index 08bd622b..9cebcc27 100644 --- a/Ryujinx.Graphics/Gal/GalSurfaceFormat.cs +++ b/Ryujinx.Graphics/Gal/GalSurfaceFormat.cs @@ -4,48 +4,48 @@ { Bitmap = 0x1c, Unknown1D = 0x1d, - RGBA32Float = 0xc0, - RGBA32Sint = 0xc1, - RGBA32Uint = 0xc2, - RGBX32Float = 0xc3, - RGBX32Sint = 0xc4, - RGBX32Uint = 0xc5, - RGBA16Unorm = 0xc6, - RGBA16Snorm = 0xc7, - RGBA16Sint = 0xc8, - RGBA16Uint = 0xc9, - RGBA16Float = 0xca, - RG32Float = 0xcb, - RG32Sint = 0xcc, - RG32Uint = 0xcd, - RGBX16Float = 0xce, - BGRA8Unorm = 0xcf, - BGRA8Srgb = 0xd0, - RGB10A2Unorm = 0xd1, - RGB10A2Uint = 0xd2, - RGBA8Unorm = 0xd5, - RGBA8Srgb = 0xd6, - RGBA8Snorm = 0xd7, - RGBA8Sint = 0xd8, - RGBA8Uint = 0xd9, - RG16Unorm = 0xda, - RG16Snorm = 0xdb, - RG16Sint = 0xdc, - RG16Uint = 0xdd, - RG16Float = 0xde, - BGR10A2Unorm = 0xdf, + Rgba32Float = 0xc0, + Rgba32Sint = 0xc1, + Rgba32Uint = 0xc2, + Rgbx32Float = 0xc3, + Rgbx32Sint = 0xc4, + Rgbx32Uint = 0xc5, + Rgba16Unorm = 0xc6, + Rgba16Snorm = 0xc7, + Rgba16Sint = 0xc8, + Rgba16Uint = 0xc9, + Rgba16Float = 0xca, + Rg32Float = 0xcb, + Rg32Sint = 0xcc, + Rg32Uint = 0xcd, + Rgbx16Float = 0xce, + Bgra8Unorm = 0xcf, + Bgra8Srgb = 0xd0, + Rgb10A2Unorm = 0xd1, + Rgb10A2Uint = 0xd2, + Rgba8Unorm = 0xd5, + Rgba8Srgb = 0xd6, + Rgba8Snorm = 0xd7, + Rgba8Sint = 0xd8, + Rgba8Uint = 0xd9, + Rg16Unorm = 0xda, + Rg16Snorm = 0xdb, + Rg16Sint = 0xdc, + Rg16Uint = 0xdd, + Rg16Float = 0xde, + Bgr10A2Unorm = 0xdf, R11G11B10Float = 0xe0, R32Sint = 0xe3, R32Uint = 0xe4, R32Float = 0xe5, - BGRX8Unorm = 0xe6, - BGRX8Srgb = 0xe7, + Bgrx8Unorm = 0xe6, + Bgrx8Srgb = 0xe7, B5G6R5Unorm = 0xe8, - BGR5A1Unorm = 0xe9, - RG8Unorm = 0xea, - RG8Snorm = 0xeb, - RG8Sint = 0xec, - RG8Uint = 0xed, + Bgr5A1Unorm = 0xe9, + Rg8Unorm = 0xea, + Rg8Snorm = 0xeb, + Rg8Sint = 0xec, + Rg8Uint = 0xed, R16Unorm = 0xee, R16Snorm = 0xef, R16Sint = 0xf0, @@ -56,13 +56,13 @@ R8Sint = 0xf5, R8Uint = 0xf6, A8Unorm = 0xf7, - BGR5X1Unorm = 0xf8, - RGBX8Unorm = 0xf9, - RGBX8Srgb = 0xfa, - BGR5X1UnormUnknownFB = 0xfb, - BGR5X1UnormUnknownFC = 0xfc, - BGRX8UnormUnknownFD = 0xfd, - BGRX8UnormUnknownFE = 0xfe, + Bgr5x1Unorm = 0xf8, + Rgbx8Unorm = 0xf9, + Rgbx8Srgb = 0xfa, + Bgr5x1UnormUnknownFB = 0xfb, + Bgr5x1UnormUnknownFC = 0xfc, + Bgrx8UnormUnknownFD = 0xfd, + Bgrx8UnormUnknownFE = 0xfe, Y32UintUnknownFF = 0xff } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/GalTextureFormat.cs b/Ryujinx.Graphics/Gal/GalTextureFormat.cs index 51ce5779..ed27180a 100644 --- a/Ryujinx.Graphics/Gal/GalTextureFormat.cs +++ b/Ryujinx.Graphics/Gal/GalTextureFormat.cs @@ -2,20 +2,20 @@ namespace Ryujinx.Graphics.Gal { public enum GalTextureFormat { - RGBA32 = 0x1, - RGBA16 = 0x3, - RG32 = 0x4, - RGBA8 = 0x8, - RGB10A2 = 0x9, - RG16 = 0xc, + Rgba32 = 0x1, + Rgba16 = 0x3, + Rg32 = 0x4, + Rgba8 = 0x8, + Rgb10A2 = 0x9, + Rg16 = 0xc, R32 = 0xf, BptcSfloat = 0x10, BptcUfloat = 0x11, - RGBA4 = 0x12, - RGB5A1 = 0x14, - RGB565 = 0x15, + Rgba4 = 0x12, + Rgb5A1 = 0x14, + Rgb565 = 0x15, BptcUnorm = 0x17, - RG8 = 0x18, + Rg8 = 0x18, R16 = 0x1b, R8 = 0x1d, R11G11B10F = 0x21, @@ -26,7 +26,7 @@ namespace Ryujinx.Graphics.Gal BC5 = 0x28, D24S8 = 0x29, D32F = 0x2f, - D32FX24S8 = 0x30, + D32Fx24S8 = 0x30, D16 = 0x3a, Astc2D4x4 = 0x40, Astc2D5x5 = 0x41, diff --git a/Ryujinx.Graphics/Gal/GalTextureSampler.cs b/Ryujinx.Graphics/Gal/GalTextureSampler.cs index 1d658cea..2e57a130 100644 --- a/Ryujinx.Graphics/Gal/GalTextureSampler.cs +++ b/Ryujinx.Graphics/Gal/GalTextureSampler.cs @@ -16,26 +16,26 @@ namespace Ryujinx.Graphics.Gal public DepthCompareFunc DepthCompareFunc { get; private set; } public GalTextureSampler( - GalTextureWrap AddressU, - GalTextureWrap AddressV, - GalTextureWrap AddressP, - GalTextureFilter MinFilter, - GalTextureFilter MagFilter, - GalTextureMipFilter MipFilter, - GalColorF BorderColor, - bool DepthCompare, - DepthCompareFunc DepthCompareFunc) + GalTextureWrap addressU, + GalTextureWrap addressV, + GalTextureWrap addressP, + GalTextureFilter minFilter, + GalTextureFilter magFilter, + GalTextureMipFilter mipFilter, + GalColorF borderColor, + bool depthCompare, + DepthCompareFunc depthCompareFunc) { - this.AddressU = AddressU; - this.AddressV = AddressV; - this.AddressP = AddressP; - this.MinFilter = MinFilter; - this.MagFilter = MagFilter; - this.MipFilter = MipFilter; - this.BorderColor = BorderColor; + AddressU = addressU; + AddressV = addressV; + AddressP = addressP; + MinFilter = minFilter; + MagFilter = magFilter; + MipFilter = mipFilter; + BorderColor = borderColor; - this.DepthCompare = DepthCompare; - this.DepthCompareFunc = DepthCompareFunc; + DepthCompare = depthCompare; + DepthCompareFunc = depthCompareFunc; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/GalTextureType.cs b/Ryujinx.Graphics/Gal/GalTextureType.cs index f7dd16d1..b02b8b37 100644 --- a/Ryujinx.Graphics/Gal/GalTextureType.cs +++ b/Ryujinx.Graphics/Gal/GalTextureType.cs @@ -6,8 +6,8 @@ Unorm = 2, Sint = 3, Uint = 4, - Snorm_Force_Fp16 = 5, - Unorm_Force_Fp16 = 6, + SnormForceFp16 = 5, + UnormForceFp16 = 6, Float = 7 } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/GalVertexAttrib.cs b/Ryujinx.Graphics/Gal/GalVertexAttrib.cs index 31b648df..feca5aea 100644 --- a/Ryujinx.Graphics/Gal/GalVertexAttrib.cs +++ b/Ryujinx.Graphics/Gal/GalVertexAttrib.cs @@ -13,21 +13,21 @@ namespace Ryujinx.Graphics.Gal public bool IsBgra { get; private set; } public GalVertexAttrib( - int Index, - bool IsConst, - int Offset, - byte[] Data, - GalVertexAttribSize Size, - GalVertexAttribType Type, - bool IsBgra) + int index, + bool isConst, + int offset, + byte[] data, + GalVertexAttribSize size, + GalVertexAttribType type, + bool isBgra) { - this.Index = Index; - this.IsConst = IsConst; - this.Data = Data; - this.Offset = Offset; - this.Size = Size; - this.Type = Type; - this.IsBgra = IsBgra; + Index = index; + IsConst = isConst; + Data = data; + Offset = offset; + Size = size; + Type = type; + IsBgra = isBgra; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/IGalConstBuffer.cs b/Ryujinx.Graphics/Gal/IGalConstBuffer.cs index 0cdcc237..8c4e6d03 100644 --- a/Ryujinx.Graphics/Gal/IGalConstBuffer.cs +++ b/Ryujinx.Graphics/Gal/IGalConstBuffer.cs @@ -7,11 +7,11 @@ namespace Ryujinx.Graphics.Gal void LockCache(); void UnlockCache(); - void Create(long Key, long Size); + void Create(long key, long size); - bool IsCached(long Key, long Size); + bool IsCached(long key, long size); - void SetData(long Key, long Size, IntPtr HostAddress); - void SetData(long Key, byte[] Data); + void SetData(long key, long size, IntPtr hostAddress); + void SetData(long key, byte[] data); } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/IGalMemory.cs b/Ryujinx.Graphics/Gal/IGalMemory.cs index e6762b50..78eb7154 100644 --- a/Ryujinx.Graphics/Gal/IGalMemory.cs +++ b/Ryujinx.Graphics/Gal/IGalMemory.cs @@ -1,7 +1,7 @@ namespace Ryujinx.Graphics.Gal { - public unsafe interface IGalMemory + public interface IGalMemory { - int ReadInt32(long Position); + int ReadInt32(long position); } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/IGalPipeline.cs b/Ryujinx.Graphics/Gal/IGalPipeline.cs index cb470fb4..1ecb2602 100644 --- a/Ryujinx.Graphics/Gal/IGalPipeline.cs +++ b/Ryujinx.Graphics/Gal/IGalPipeline.cs @@ -2,10 +2,10 @@ { public interface IGalPipeline { - void Bind(GalPipelineState State); - void Unbind(GalPipelineState State); + void Bind(GalPipelineState state); + void Unbind(GalPipelineState state); void ResetDepthMask(); - void ResetColorMask(int Index); + void ResetColorMask(int index); } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/IGalRasterizer.cs b/Ryujinx.Graphics/Gal/IGalRasterizer.cs index 04f7aae5..33bdeaad 100644 --- a/Ryujinx.Graphics/Gal/IGalRasterizer.cs +++ b/Ryujinx.Graphics/Gal/IGalRasterizer.cs @@ -8,29 +8,29 @@ namespace Ryujinx.Graphics.Gal void UnlockCaches(); void ClearBuffers( - GalClearBufferFlags Flags, - int Attachment, - float Red, - float Green, - float Blue, - float Alpha, - float Depth, - int Stencil); + GalClearBufferFlags flags, + int attachment, + float red, + float green, + float blue, + float alpha, + float depth, + int stencil); - bool IsVboCached(long Key, long DataSize); + bool IsVboCached(long key, long dataSize); - bool IsIboCached(long Key, long DataSize); + bool IsIboCached(long key, long dataSize); - void CreateVbo(long Key, int DataSize, IntPtr HostAddress); - void CreateVbo(long Key, byte[] Data); + void CreateVbo(long key, int dataSize, IntPtr hostAddress); + void CreateVbo(long key, byte[] data); - void CreateIbo(long Key, int DataSize, IntPtr HostAddress); - void CreateIbo(long Key, int DataSize, byte[] Buffer); + void CreateIbo(long key, int dataSize, IntPtr hostAddress); + void CreateIbo(long key, int dataSize, byte[] buffer); - void SetIndexArray(int Size, GalIndexFormat Format); + void SetIndexArray(int size, GalIndexFormat format); - void DrawArrays(int First, int Count, GalPrimitiveType PrimType); + void DrawArrays(int first, int count, GalPrimitiveType primType); - void DrawElements(long IboKey, int First, int VertexBase, GalPrimitiveType PrimType); + void DrawElements(long iboKey, int first, int vertexBase, GalPrimitiveType primType); } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/IGalRenderTarget.cs b/Ryujinx.Graphics/Gal/IGalRenderTarget.cs index 90cad856..c281fe06 100644 --- a/Ryujinx.Graphics/Gal/IGalRenderTarget.cs +++ b/Ryujinx.Graphics/Gal/IGalRenderTarget.cs @@ -4,42 +4,42 @@ namespace Ryujinx.Graphics.Gal { void Bind(); - void BindColor(long Key, int Attachment); + void BindColor(long key, int attachment); - void UnbindColor(int Attachment); + void UnbindColor(int attachment); - void BindZeta(long Key); + void BindZeta(long key); void UnbindZeta(); - void Present(long Key); + void Present(long key); - void SetMap(int[] Map); + void SetMap(int[] map); - void SetTransform(bool FlipX, bool FlipY, int Top, int Left, int Right, int Bottom); + void SetTransform(bool flipX, bool flipY, int top, int left, int right, int bottom); - void SetWindowSize(int Width, int Height); + void SetWindowSize(int width, int height); - void SetViewport(int Attachment, int X, int Y, int Width, int Height); + void SetViewport(int attachment, int x, int y, int width, int height); void Render(); void Copy( - GalImage SrcImage, - GalImage DstImage, - long SrcKey, - long DstKey, - int SrcLayer, - int DstLayer, - int SrcX0, - int SrcY0, - int SrcX1, - int SrcY1, - int DstX0, - int DstY0, - int DstX1, - int DstY1); - - void Reinterpret(long Key, GalImage NewImage); + GalImage srcImage, + GalImage dstImage, + long srcKey, + long dstKey, + int srcLayer, + int dstLayer, + int srcX0, + int srcY0, + int srcX1, + int srcY1, + int dstX0, + int dstY0, + int dstX1, + int dstY1); + + void Reinterpret(long key, GalImage newImage); } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/IGalRenderer.cs b/Ryujinx.Graphics/Gal/IGalRenderer.cs index 41e95a87..1acc4d03 100644 --- a/Ryujinx.Graphics/Gal/IGalRenderer.cs +++ b/Ryujinx.Graphics/Gal/IGalRenderer.cs @@ -4,7 +4,7 @@ namespace Ryujinx.Graphics.Gal { public interface IGalRenderer { - void QueueAction(Action ActionMthd); + void QueueAction(Action actionMthd); void RunActions(); diff --git a/Ryujinx.Graphics/Gal/IGalShader.cs b/Ryujinx.Graphics/Gal/IGalShader.cs index 4b951fa6..99cd4d76 100644 --- a/Ryujinx.Graphics/Gal/IGalShader.cs +++ b/Ryujinx.Graphics/Gal/IGalShader.cs @@ -4,16 +4,16 @@ namespace Ryujinx.Graphics.Gal { public interface IGalShader { - void Create(IGalMemory Memory, long Key, GalShaderType Type); + void Create(IGalMemory memory, long key, GalShaderType type); - void Create(IGalMemory Memory, long VpAPos, long Key, GalShaderType Type); + void Create(IGalMemory memory, long vpAPos, long key, GalShaderType type); - IEnumerable<ShaderDeclInfo> GetConstBufferUsage(long Key); - IEnumerable<ShaderDeclInfo> GetTextureUsage(long Key); + IEnumerable<ShaderDeclInfo> GetConstBufferUsage(long key); + IEnumerable<ShaderDeclInfo> GetTextureUsage(long key); - void Bind(long Key); + void Bind(long key); - void Unbind(GalShaderType Type); + void Unbind(GalShaderType type); void BindProgram(); } diff --git a/Ryujinx.Graphics/Gal/IGalTexture.cs b/Ryujinx.Graphics/Gal/IGalTexture.cs index de4ba9cb..23ce054a 100644 --- a/Ryujinx.Graphics/Gal/IGalTexture.cs +++ b/Ryujinx.Graphics/Gal/IGalTexture.cs @@ -5,14 +5,14 @@ namespace Ryujinx.Graphics.Gal void LockCache(); void UnlockCache(); - void Create(long Key, int Size, GalImage Image); + void Create(long key, int size, GalImage image); - void Create(long Key, byte[] Data, GalImage Image); + void Create(long key, byte[] data, GalImage image); - bool TryGetImage(long Key, out GalImage Image); + bool TryGetImage(long key, out GalImage image); - void Bind(long Key, int Index, GalImage Image); + void Bind(long key, int index, GalImage image); - void SetSampler(GalImage Image, GalTextureSampler Sampler); + void SetSampler(GalImage image, GalTextureSampler sampler); } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/OpenGL/DeleteValueCallback.cs b/Ryujinx.Graphics/Gal/OpenGL/DeleteValueCallback.cs index acd8d72f..63b626f1 100644 --- a/Ryujinx.Graphics/Gal/OpenGL/DeleteValueCallback.cs +++ b/Ryujinx.Graphics/Gal/OpenGL/DeleteValueCallback.cs @@ -1,4 +1,4 @@ namespace Ryujinx.Graphics.Gal.OpenGL { - delegate void DeleteValue<T>(T Value); + delegate void DeleteValue<T>(T value); }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/OpenGL/ImageHandler.cs b/Ryujinx.Graphics/Gal/OpenGL/ImageHandler.cs index 5714f3d8..d7f6f004 100644 --- a/Ryujinx.Graphics/Gal/OpenGL/ImageHandler.cs +++ b/Ryujinx.Graphics/Gal/OpenGL/ImageHandler.cs @@ -18,10 +18,10 @@ namespace Ryujinx.Graphics.Gal.OpenGL public bool HasDepth => ImageUtils.HasDepth(Image.Format); public bool HasStencil => ImageUtils.HasStencil(Image.Format); - public ImageHandler(int Handle, GalImage Image) + public ImageHandler(int handle, GalImage image) { - this.Handle = Handle; - this.Image = Image; + Handle = handle; + Image = image; } } } diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLCachedResource.cs b/Ryujinx.Graphics/Gal/OpenGL/OGLCachedResource.cs deleted file mode 100644 index 6e17872b..00000000 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLCachedResource.cs +++ /dev/null @@ -1,191 +0,0 @@ -using Ryujinx.Common; -using System; -using System.Collections.Generic; - -namespace Ryujinx.Graphics.Gal.OpenGL -{ - class OGLCachedResource<T> - { - public delegate void DeleteValue(T Value); - - private const int MinTimeDelta = 5 * 60000; - private const int MaxRemovalsPerRun = 10; - - private struct CacheBucket - { - public T Value { get; private set; } - - public LinkedListNode<long> Node { get; private set; } - - public long DataSize { get; private set; } - - public long Timestamp { get; private set; } - - public CacheBucket(T Value, long DataSize, LinkedListNode<long> Node) - { - this.Value = Value; - this.DataSize = DataSize; - this.Node = Node; - - Timestamp = PerformanceCounter.ElapsedMilliseconds; - } - } - - private Dictionary<long, CacheBucket> Cache; - - private LinkedList<long> SortedCache; - - private DeleteValue DeleteValueCallback; - - private Queue<T> DeletePending; - - private bool Locked; - - private long MaxSize; - private long TotalSize; - - public OGLCachedResource(DeleteValue DeleteValueCallback, long MaxSize) - { - this.MaxSize = MaxSize; - - if (DeleteValueCallback == null) - { - throw new ArgumentNullException(nameof(DeleteValueCallback)); - } - - this.DeleteValueCallback = DeleteValueCallback; - - Cache = new Dictionary<long, CacheBucket>(); - - SortedCache = new LinkedList<long>(); - - DeletePending = new Queue<T>(); - } - - public void Lock() - { - Locked = true; - } - - public void Unlock() - { - Locked = false; - - while (DeletePending.TryDequeue(out T Value)) - { - DeleteValueCallback(Value); - } - - ClearCacheIfNeeded(); - } - - public void AddOrUpdate(long Key, T Value, long Size) - { - if (!Locked) - { - ClearCacheIfNeeded(); - } - - LinkedListNode<long> Node = SortedCache.AddLast(Key); - - CacheBucket NewBucket = new CacheBucket(Value, Size, Node); - - if (Cache.TryGetValue(Key, out CacheBucket Bucket)) - { - if (Locked) - { - DeletePending.Enqueue(Bucket.Value); - } - else - { - DeleteValueCallback(Bucket.Value); - } - - SortedCache.Remove(Bucket.Node); - - TotalSize -= Bucket.DataSize; - - Cache[Key] = NewBucket; - } - else - { - Cache.Add(Key, NewBucket); - } - - TotalSize += Size; - } - - public bool TryGetValue(long Key, out T Value) - { - if (Cache.TryGetValue(Key, out CacheBucket Bucket)) - { - Value = Bucket.Value; - - SortedCache.Remove(Bucket.Node); - - LinkedListNode<long> Node = SortedCache.AddLast(Key); - - Cache[Key] = new CacheBucket(Value, Bucket.DataSize, Node); - - return true; - } - - Value = default(T); - - return false; - } - - public bool TryGetSize(long Key, out long Size) - { - if (Cache.TryGetValue(Key, out CacheBucket Bucket)) - { - Size = Bucket.DataSize; - - return true; - } - - Size = 0; - - return false; - } - - private void ClearCacheIfNeeded() - { - long Timestamp = PerformanceCounter.ElapsedMilliseconds; - - int Count = 0; - - while (Count++ < MaxRemovalsPerRun) - { - LinkedListNode<long> Node = SortedCache.First; - - if (Node == null) - { - break; - } - - CacheBucket Bucket = Cache[Node.Value]; - - long TimeDelta = Timestamp - Bucket.Timestamp; - - if (TimeDelta <= MinTimeDelta && !UnderMemoryPressure()) - { - break; - } - - SortedCache.Remove(Node); - - Cache.Remove(Node.Value); - - DeleteValueCallback(Bucket.Value); - - TotalSize -= Bucket.DataSize; - } - } - - private bool UnderMemoryPressure() - { - return TotalSize >= MaxSize; - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLConstBuffer.cs b/Ryujinx.Graphics/Gal/OpenGL/OGLConstBuffer.cs deleted file mode 100644 index a12681c7..00000000 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLConstBuffer.cs +++ /dev/null @@ -1,74 +0,0 @@ -using OpenTK.Graphics.OpenGL; -using System; - -namespace Ryujinx.Graphics.Gal.OpenGL -{ - class OGLConstBuffer : IGalConstBuffer - { - private const long MaxConstBufferCacheSize = 64 * 1024 * 1024; - - private OGLCachedResource<OGLStreamBuffer> Cache; - - public OGLConstBuffer() - { - Cache = new OGLCachedResource<OGLStreamBuffer>(DeleteBuffer, MaxConstBufferCacheSize); - } - - public void LockCache() - { - Cache.Lock(); - } - - public void UnlockCache() - { - Cache.Unlock(); - } - - public void Create(long Key, long Size) - { - OGLStreamBuffer Buffer = new OGLStreamBuffer(BufferTarget.UniformBuffer, Size); - - Cache.AddOrUpdate(Key, Buffer, Size); - } - - public bool IsCached(long Key, long Size) - { - return Cache.TryGetSize(Key, out long CachedSize) && CachedSize == Size; - } - - public void SetData(long Key, long Size, IntPtr HostAddress) - { - if (Cache.TryGetValue(Key, out OGLStreamBuffer Buffer)) - { - Buffer.SetData(Size, HostAddress); - } - } - - public void SetData(long Key, byte[] Data) - { - if (Cache.TryGetValue(Key, out OGLStreamBuffer Buffer)) - { - Buffer.SetData(Data); - } - } - - public bool TryGetUbo(long Key, out int UboHandle) - { - if (Cache.TryGetValue(Key, out OGLStreamBuffer Buffer)) - { - UboHandle = Buffer.Handle; - - return true; - } - - UboHandle = 0; - - return false; - } - - private static void DeleteBuffer(OGLStreamBuffer Buffer) - { - Buffer.Dispose(); - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLExtension.cs b/Ryujinx.Graphics/Gal/OpenGL/OGLExtension.cs deleted file mode 100644 index eb06f83c..00000000 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLExtension.cs +++ /dev/null @@ -1,70 +0,0 @@ -using OpenTK.Graphics.OpenGL; -using Ryujinx.Common.Logging; -using System; - -namespace Ryujinx.Graphics.Gal.OpenGL -{ - static class OGLExtension - { - // Private lazy backing variables - private static Lazy<bool> s_EnhancedLayouts = new Lazy<bool>(() => HasExtension("GL_ARB_enhanced_layouts")); - private static Lazy<bool> s_TextureMirrorClamp = new Lazy<bool>(() => HasExtension("GL_EXT_texture_mirror_clamp")); - private static Lazy<bool> s_ViewportArray = new Lazy<bool>(() => HasExtension("GL_ARB_viewport_array")); - - private static Lazy<bool> s_NvidiaDriver = new Lazy<bool>(() => IsNvidiaDriver()); - - // Public accessors - public static bool EnhancedLayouts => s_EnhancedLayouts.Value; - public static bool TextureMirrorClamp => s_TextureMirrorClamp.Value; - public static bool ViewportArray => s_ViewportArray.Value; - - public static bool NvidiaDrvier => s_NvidiaDriver.Value; - - private static bool HasExtension(string Name) - { - int NumExtensions = GL.GetInteger(GetPName.NumExtensions); - - for (int Extension = 0; Extension < NumExtensions; Extension++) - { - if (GL.GetString(StringNameIndexed.Extensions, Extension) == Name) - { - return true; - } - } - - Logger.PrintInfo(LogClass.Gpu, $"OpenGL extension {Name} unavailable. You may experience some performance degredation"); - - return false; - } - - private static bool IsNvidiaDriver() - { - return GL.GetString(StringName.Vendor).Equals("NVIDIA Corporation"); - } - - public static class Required - { - // Public accessors - public static bool EnhancedLayouts => s_EnhancedLayoutsRequired.Value; - public static bool TextureMirrorClamp => s_TextureMirrorClampRequired.Value; - public static bool ViewportArray => s_ViewportArrayRequired.Value; - - // Private lazy backing variables - private static Lazy<bool> s_EnhancedLayoutsRequired = new Lazy<bool>(() => HasExtensionRequired(OGLExtension.EnhancedLayouts, "GL_ARB_enhanced_layouts")); - private static Lazy<bool> s_TextureMirrorClampRequired = new Lazy<bool>(() => HasExtensionRequired(OGLExtension.TextureMirrorClamp, "GL_EXT_texture_mirror_clamp")); - private static Lazy<bool> s_ViewportArrayRequired = new Lazy<bool>(() => HasExtensionRequired(OGLExtension.ViewportArray, "GL_ARB_viewport_array")); - - private static bool HasExtensionRequired(bool Value, string Name) - { - if (Value) - { - return true; - } - - Logger.PrintWarning(LogClass.Gpu, $"Required OpenGL extension {Name} unavailable. You may experience some rendering issues"); - - return false; - } - } - } -} diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLLimit.cs b/Ryujinx.Graphics/Gal/OpenGL/OGLLimit.cs deleted file mode 100644 index 6c385bc4..00000000 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLLimit.cs +++ /dev/null @@ -1,12 +0,0 @@ -using OpenTK.Graphics.OpenGL; -using System; - -namespace Ryujinx.Graphics.Gal.OpenGL -{ - static class OGLLimit - { - private static Lazy<int> s_MaxUboSize = new Lazy<int>(() => GL.GetInteger(GetPName.MaxUniformBlockSize)); - - public static int MaxUboSize => s_MaxUboSize.Value; - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLRasterizer.cs b/Ryujinx.Graphics/Gal/OpenGL/OGLRasterizer.cs deleted file mode 100644 index c4015d02..00000000 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLRasterizer.cs +++ /dev/null @@ -1,207 +0,0 @@ -using OpenTK.Graphics.OpenGL; -using System; - -namespace Ryujinx.Graphics.Gal.OpenGL -{ - class OGLRasterizer : IGalRasterizer - { - private const long MaxVertexBufferCacheSize = 128 * 1024 * 1024; - private const long MaxIndexBufferCacheSize = 64 * 1024 * 1024; - - private int[] VertexBuffers; - - private OGLCachedResource<int> VboCache; - private OGLCachedResource<int> IboCache; - - private struct IbInfo - { - public int Count; - public int ElemSizeLog2; - - public DrawElementsType Type; - } - - private IbInfo IndexBuffer; - - public OGLRasterizer() - { - VertexBuffers = new int[32]; - - VboCache = new OGLCachedResource<int>(GL.DeleteBuffer, MaxVertexBufferCacheSize); - IboCache = new OGLCachedResource<int>(GL.DeleteBuffer, MaxIndexBufferCacheSize); - - IndexBuffer = new IbInfo(); - } - - public void LockCaches() - { - VboCache.Lock(); - IboCache.Lock(); - } - - public void UnlockCaches() - { - VboCache.Unlock(); - IboCache.Unlock(); - } - - public void ClearBuffers( - GalClearBufferFlags Flags, - int Attachment, - float Red, - float Green, - float Blue, - float Alpha, - float Depth, - int Stencil) - { - GL.ColorMask( - Attachment, - Flags.HasFlag(GalClearBufferFlags.ColorRed), - Flags.HasFlag(GalClearBufferFlags.ColorGreen), - Flags.HasFlag(GalClearBufferFlags.ColorBlue), - Flags.HasFlag(GalClearBufferFlags.ColorAlpha)); - - GL.ClearBuffer(ClearBuffer.Color, Attachment, new float[] { Red, Green, Blue, Alpha }); - - GL.ColorMask(Attachment, true, true, true, true); - GL.DepthMask(true); - - if (Flags.HasFlag(GalClearBufferFlags.Depth)) - { - GL.ClearBuffer(ClearBuffer.Depth, 0, ref Depth); - } - - if (Flags.HasFlag(GalClearBufferFlags.Stencil)) - { - GL.ClearBuffer(ClearBuffer.Stencil, 0, ref Stencil); - } - } - - public bool IsVboCached(long Key, long DataSize) - { - return VboCache.TryGetSize(Key, out long Size) && Size == DataSize; - } - - public bool IsIboCached(long Key, long DataSize) - { - return IboCache.TryGetSize(Key, out long Size) && Size == DataSize; - } - - public void CreateVbo(long Key, int DataSize, IntPtr HostAddress) - { - int Handle = GL.GenBuffer(); - - VboCache.AddOrUpdate(Key, Handle, DataSize); - - IntPtr Length = new IntPtr(DataSize); - - GL.BindBuffer(BufferTarget.ArrayBuffer, Handle); - GL.BufferData(BufferTarget.ArrayBuffer, Length, HostAddress, BufferUsageHint.StreamDraw); - } - - public void CreateVbo(long Key, byte[] Data) - { - int Handle = GL.GenBuffer(); - - VboCache.AddOrUpdate(Key, Handle, Data.Length); - - IntPtr Length = new IntPtr(Data.Length); - - GL.BindBuffer(BufferTarget.ArrayBuffer, Handle); - GL.BufferData(BufferTarget.ArrayBuffer, Length, Data, BufferUsageHint.StreamDraw); - } - - public void CreateIbo(long Key, int DataSize, IntPtr HostAddress) - { - int Handle = GL.GenBuffer(); - - IboCache.AddOrUpdate(Key, Handle, (uint)DataSize); - - IntPtr Length = new IntPtr(DataSize); - - GL.BindBuffer(BufferTarget.ElementArrayBuffer, Handle); - GL.BufferData(BufferTarget.ElementArrayBuffer, Length, HostAddress, BufferUsageHint.StreamDraw); - } - - public void CreateIbo(long Key, int DataSize, byte[] Buffer) - { - int Handle = GL.GenBuffer(); - - IboCache.AddOrUpdate(Key, Handle, DataSize); - - IntPtr Length = new IntPtr(Buffer.Length); - - GL.BindBuffer(BufferTarget.ElementArrayBuffer, Handle); - GL.BufferData(BufferTarget.ElementArrayBuffer, Length, Buffer, BufferUsageHint.StreamDraw); - } - - public void SetIndexArray(int Size, GalIndexFormat Format) - { - IndexBuffer.Type = OGLEnumConverter.GetDrawElementsType(Format); - - IndexBuffer.Count = Size >> (int)Format; - - IndexBuffer.ElemSizeLog2 = (int)Format; - } - - public void DrawArrays(int First, int Count, GalPrimitiveType PrimType) - { - if (Count == 0) - { - return; - } - - if (PrimType == GalPrimitiveType.Quads) - { - for (int Offset = 0; Offset < Count; Offset += 4) - { - GL.DrawArrays(PrimitiveType.TriangleFan, First + Offset, 4); - } - } - else if (PrimType == GalPrimitiveType.QuadStrip) - { - GL.DrawArrays(PrimitiveType.TriangleFan, First, 4); - - for (int Offset = 2; Offset < Count; Offset += 2) - { - GL.DrawArrays(PrimitiveType.TriangleFan, First + Offset, 4); - } - } - else - { - GL.DrawArrays(OGLEnumConverter.GetPrimitiveType(PrimType), First, Count); - } - } - - public void DrawElements(long IboKey, int First, int VertexBase, GalPrimitiveType PrimType) - { - if (!IboCache.TryGetValue(IboKey, out int IboHandle)) - { - return; - } - - PrimitiveType Mode = OGLEnumConverter.GetPrimitiveType(PrimType); - - GL.BindBuffer(BufferTarget.ElementArrayBuffer, IboHandle); - - First <<= IndexBuffer.ElemSizeLog2; - - if (VertexBase != 0) - { - IntPtr Indices = new IntPtr(First); - - GL.DrawElementsBaseVertex(Mode, IndexBuffer.Count, IndexBuffer.Type, Indices, VertexBase); - } - else - { - GL.DrawElements(Mode, IndexBuffer.Count, IndexBuffer.Type, First); - } - } - - public bool TryGetVbo(long VboKey, out int VboHandle) - { - return VboCache.TryGetValue(VboKey, out VboHandle); - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLRenderTarget.cs b/Ryujinx.Graphics/Gal/OpenGL/OGLRenderTarget.cs deleted file mode 100644 index 53cfd4a6..00000000 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLRenderTarget.cs +++ /dev/null @@ -1,549 +0,0 @@ -using OpenTK.Graphics.OpenGL; -using Ryujinx.Graphics.Texture; -using System; - -namespace Ryujinx.Graphics.Gal.OpenGL -{ - class OGLRenderTarget : IGalRenderTarget - { - private const int NativeWidth = 1280; - private const int NativeHeight = 720; - - private const int RenderTargetsCount = GalPipelineState.RenderTargetsCount; - - private struct Rect - { - public int X { get; private set; } - public int Y { get; private set; } - public int Width { get; private set; } - public int Height { get; private set; } - - public Rect(int X, int Y, int Width, int Height) - { - this.X = X; - this.Y = Y; - this.Width = Width; - this.Height = Height; - } - } - - private class FrameBufferAttachments - { - public int MapCount { get; set; } - - public DrawBuffersEnum[] Map { get; private set; } - - public long[] Colors { get; private set; } - - public long Zeta { get; set; } - - public FrameBufferAttachments() - { - Colors = new long[RenderTargetsCount]; - - Map = new DrawBuffersEnum[RenderTargetsCount]; - } - - public void Update(FrameBufferAttachments Source) - { - for (int Index = 0; Index < RenderTargetsCount; Index++) - { - Map[Index] = Source.Map[Index]; - - Colors[Index] = Source.Colors[Index]; - } - - MapCount = Source.MapCount; - Zeta = Source.Zeta; - } - } - - private int[] ColorHandles; - private int ZetaHandle; - - private OGLTexture Texture; - - private ImageHandler ReadTex; - - private Rect Window; - - private float[] Viewports; - - private bool FlipX; - private bool FlipY; - - private int CropTop; - private int CropLeft; - private int CropRight; - private int CropBottom; - - //This framebuffer is used to attach guest rendertargets, - //think of it as a dummy OpenGL VAO - private int DummyFrameBuffer; - - //These framebuffers are used to blit images - private int SrcFb; - private int DstFb; - - private FrameBufferAttachments Attachments; - private FrameBufferAttachments OldAttachments; - - private int CopyPBO; - - public bool FramebufferSrgb { get; set; } - - public OGLRenderTarget(OGLTexture Texture) - { - Attachments = new FrameBufferAttachments(); - - OldAttachments = new FrameBufferAttachments(); - - ColorHandles = new int[RenderTargetsCount]; - - Viewports = new float[RenderTargetsCount * 4]; - - this.Texture = Texture; - - Texture.TextureDeleted += TextureDeletionHandler; - } - - private void TextureDeletionHandler(object Sender, int Handle) - { - //Texture was deleted, the handle is no longer valid, so - //reset all uses of this handle on a render target. - for (int Attachment = 0; Attachment < RenderTargetsCount; Attachment++) - { - if (ColorHandles[Attachment] == Handle) - { - ColorHandles[Attachment] = 0; - } - } - - if (ZetaHandle == Handle) - { - ZetaHandle = 0; - } - } - - public void Bind() - { - if (DummyFrameBuffer == 0) - { - DummyFrameBuffer = GL.GenFramebuffer(); - } - - GL.BindFramebuffer(FramebufferTarget.DrawFramebuffer, DummyFrameBuffer); - - ImageHandler CachedImage; - - for (int Attachment = 0; Attachment < RenderTargetsCount; Attachment++) - { - long Key = Attachments.Colors[Attachment]; - - int Handle = 0; - - if (Key != 0 && Texture.TryGetImageHandler(Key, out CachedImage)) - { - Handle = CachedImage.Handle; - } - - if (Handle == ColorHandles[Attachment]) - { - continue; - } - - GL.FramebufferTexture( - FramebufferTarget.DrawFramebuffer, - FramebufferAttachment.ColorAttachment0 + Attachment, - Handle, - 0); - - ColorHandles[Attachment] = Handle; - } - - if (Attachments.Zeta != 0 && Texture.TryGetImageHandler(Attachments.Zeta, out CachedImage)) - { - if (CachedImage.Handle != ZetaHandle) - { - if (CachedImage.HasDepth && CachedImage.HasStencil) - { - GL.FramebufferTexture( - FramebufferTarget.DrawFramebuffer, - FramebufferAttachment.DepthStencilAttachment, - CachedImage.Handle, - 0); - } - else if (CachedImage.HasDepth) - { - GL.FramebufferTexture( - FramebufferTarget.DrawFramebuffer, - FramebufferAttachment.DepthAttachment, - CachedImage.Handle, - 0); - - GL.FramebufferTexture( - FramebufferTarget.DrawFramebuffer, - FramebufferAttachment.StencilAttachment, - 0, - 0); - } - else - { - throw new InvalidOperationException("Invalid image format \"" + CachedImage.Format + "\" used as Zeta!"); - } - - ZetaHandle = CachedImage.Handle; - } - } - else if (ZetaHandle != 0) - { - GL.FramebufferTexture( - FramebufferTarget.DrawFramebuffer, - FramebufferAttachment.DepthStencilAttachment, - 0, - 0); - - ZetaHandle = 0; - } - - if (OGLExtension.ViewportArray) - { - GL.ViewportArray(0, RenderTargetsCount, Viewports); - } - else - { - GL.Viewport( - (int)Viewports[0], - (int)Viewports[1], - (int)Viewports[2], - (int)Viewports[3]); - } - - if (Attachments.MapCount > 1) - { - GL.DrawBuffers(Attachments.MapCount, Attachments.Map); - } - else if (Attachments.MapCount == 1) - { - GL.DrawBuffer((DrawBufferMode)Attachments.Map[0]); - } - else - { - GL.DrawBuffer(DrawBufferMode.None); - } - - OldAttachments.Update(Attachments); - } - - public void BindColor(long Key, int Attachment) - { - Attachments.Colors[Attachment] = Key; - } - - public void UnbindColor(int Attachment) - { - Attachments.Colors[Attachment] = 0; - } - - public void BindZeta(long Key) - { - Attachments.Zeta = Key; - } - - public void UnbindZeta() - { - Attachments.Zeta = 0; - } - - public void Present(long Key) - { - Texture.TryGetImageHandler(Key, out ReadTex); - } - - public void SetMap(int[] Map) - { - if (Map != null) - { - Attachments.MapCount = Map.Length; - - for (int Attachment = 0; Attachment < Attachments.MapCount; Attachment++) - { - Attachments.Map[Attachment] = DrawBuffersEnum.ColorAttachment0 + Map[Attachment]; - } - } - else - { - Attachments.MapCount = 0; - } - } - - public void SetTransform(bool FlipX, bool FlipY, int Top, int Left, int Right, int Bottom) - { - this.FlipX = FlipX; - this.FlipY = FlipY; - - CropTop = Top; - CropLeft = Left; - CropRight = Right; - CropBottom = Bottom; - } - - public void SetWindowSize(int Width, int Height) - { - Window = new Rect(0, 0, Width, Height); - } - - public void SetViewport(int Attachment, int X, int Y, int Width, int Height) - { - int Offset = Attachment * 4; - - Viewports[Offset + 0] = X; - Viewports[Offset + 1] = Y; - Viewports[Offset + 2] = Width; - Viewports[Offset + 3] = Height; - } - - public void Render() - { - if (ReadTex == null) - { - return; - } - - int SrcX0, SrcX1, SrcY0, SrcY1; - - if (CropLeft == 0 && CropRight == 0) - { - SrcX0 = 0; - SrcX1 = ReadTex.Width; - } - else - { - SrcX0 = CropLeft; - SrcX1 = CropRight; - } - - if (CropTop == 0 && CropBottom == 0) - { - SrcY0 = 0; - SrcY1 = ReadTex.Height; - } - else - { - SrcY0 = CropTop; - SrcY1 = CropBottom; - } - - float RatioX = MathF.Min(1f, (Window.Height * (float)NativeWidth) / ((float)NativeHeight * Window.Width)); - float RatioY = MathF.Min(1f, (Window.Width * (float)NativeHeight) / ((float)NativeWidth * Window.Height)); - - int DstWidth = (int)(Window.Width * RatioX); - int DstHeight = (int)(Window.Height * RatioY); - - int DstPaddingX = (Window.Width - DstWidth) / 2; - int DstPaddingY = (Window.Height - DstHeight) / 2; - - int DstX0 = FlipX ? Window.Width - DstPaddingX : DstPaddingX; - int DstX1 = FlipX ? DstPaddingX : Window.Width - DstPaddingX; - - int DstY0 = FlipY ? DstPaddingY : Window.Height - DstPaddingY; - int DstY1 = FlipY ? Window.Height - DstPaddingY : DstPaddingY; - - GL.Viewport(0, 0, Window.Width, Window.Height); - - if (SrcFb == 0) - { - SrcFb = GL.GenFramebuffer(); - } - - GL.BindFramebuffer(FramebufferTarget.ReadFramebuffer, SrcFb); - GL.BindFramebuffer(FramebufferTarget.DrawFramebuffer, 0); - - GL.FramebufferTexture(FramebufferTarget.ReadFramebuffer, FramebufferAttachment.ColorAttachment0, ReadTex.Handle, 0); - - GL.ReadBuffer(ReadBufferMode.ColorAttachment0); - - GL.Clear(ClearBufferMask.ColorBufferBit); - - GL.Disable(EnableCap.FramebufferSrgb); - - GL.BlitFramebuffer( - SrcX0, - SrcY0, - SrcX1, - SrcY1, - DstX0, - DstY0, - DstX1, - DstY1, - ClearBufferMask.ColorBufferBit, - BlitFramebufferFilter.Linear); - - if (FramebufferSrgb) - { - GL.Enable(EnableCap.FramebufferSrgb); - } - } - - public void Copy( - GalImage SrcImage, - GalImage DstImage, - long SrcKey, - long DstKey, - int SrcLayer, - int DstLayer, - int SrcX0, - int SrcY0, - int SrcX1, - int SrcY1, - int DstX0, - int DstY0, - int DstX1, - int DstY1) - { - if (Texture.TryGetImageHandler(SrcKey, out ImageHandler SrcTex) && - Texture.TryGetImageHandler(DstKey, out ImageHandler DstTex)) - { - if (SrcTex.HasColor != DstTex.HasColor || - SrcTex.HasDepth != DstTex.HasDepth || - SrcTex.HasStencil != DstTex.HasStencil) - { - throw new NotImplementedException(); - } - - if (SrcFb == 0) - { - SrcFb = GL.GenFramebuffer(); - } - - if (DstFb == 0) - { - DstFb = GL.GenFramebuffer(); - } - - GL.BindFramebuffer(FramebufferTarget.ReadFramebuffer, SrcFb); - GL.BindFramebuffer(FramebufferTarget.DrawFramebuffer, DstFb); - - FramebufferAttachment Attachment = GetAttachment(SrcTex); - - if (ImageUtils.IsArray(SrcImage.TextureTarget) && SrcLayer > 0) - { - GL.FramebufferTextureLayer(FramebufferTarget.ReadFramebuffer, Attachment, SrcTex.Handle, 0, SrcLayer); - } - else - { - GL.FramebufferTexture(FramebufferTarget.ReadFramebuffer, Attachment, SrcTex.Handle, 0); - } - - if (ImageUtils.IsArray(DstImage.TextureTarget) && DstLayer > 0) - { - GL.FramebufferTextureLayer(FramebufferTarget.DrawFramebuffer, Attachment, DstTex.Handle, 0, DstLayer); - } - else - { - GL.FramebufferTexture(FramebufferTarget.DrawFramebuffer, Attachment, DstTex.Handle, 0); - } - - - BlitFramebufferFilter Filter = BlitFramebufferFilter.Nearest; - - if (SrcTex.HasColor) - { - GL.DrawBuffer(DrawBufferMode.ColorAttachment0); - - Filter = BlitFramebufferFilter.Linear; - } - - ClearBufferMask Mask = GetClearMask(SrcTex); - - GL.BlitFramebuffer(SrcX0, SrcY0, SrcX1, SrcY1, DstX0, DstY0, DstX1, DstY1, Mask, Filter); - } - } - - public void Reinterpret(long Key, GalImage NewImage) - { - if (!Texture.TryGetImage(Key, out GalImage OldImage)) - { - return; - } - - if (NewImage.Format == OldImage.Format && - NewImage.Width == OldImage.Width && - NewImage.Height == OldImage.Height && - NewImage.Depth == OldImage.Depth && - NewImage.LayerCount == OldImage.LayerCount && - NewImage.TextureTarget == OldImage.TextureTarget) - { - return; - } - - if (CopyPBO == 0) - { - CopyPBO = GL.GenBuffer(); - } - - GL.BindBuffer(BufferTarget.PixelPackBuffer, CopyPBO); - - //The buffer should be large enough to hold the largest texture. - int BufferSize = Math.Max(ImageUtils.GetSize(OldImage), - ImageUtils.GetSize(NewImage)); - - GL.BufferData(BufferTarget.PixelPackBuffer, BufferSize, IntPtr.Zero, BufferUsageHint.StreamCopy); - - if (!Texture.TryGetImageHandler(Key, out ImageHandler CachedImage)) - { - throw new InvalidOperationException(); - } - - (_, PixelFormat Format, PixelType Type) = OGLEnumConverter.GetImageFormat(CachedImage.Format); - - TextureTarget Target = ImageUtils.GetTextureTarget(NewImage.TextureTarget); - - GL.BindTexture(Target, CachedImage.Handle); - - GL.GetTexImage(Target, 0, Format, Type, IntPtr.Zero); - - GL.BindBuffer(BufferTarget.PixelPackBuffer, 0); - GL.BindBuffer(BufferTarget.PixelUnpackBuffer, CopyPBO); - - GL.PixelStore(PixelStoreParameter.UnpackRowLength, OldImage.Width); - - Texture.Create(Key, ImageUtils.GetSize(NewImage), NewImage); - - GL.PixelStore(PixelStoreParameter.UnpackRowLength, 0); - - GL.BindBuffer(BufferTarget.PixelUnpackBuffer, 0); - } - - private static FramebufferAttachment GetAttachment(ImageHandler CachedImage) - { - if (CachedImage.HasColor) - { - return FramebufferAttachment.ColorAttachment0; - } - else if (CachedImage.HasDepth && CachedImage.HasStencil) - { - return FramebufferAttachment.DepthStencilAttachment; - } - else if (CachedImage.HasDepth) - { - return FramebufferAttachment.DepthAttachment; - } - else if (CachedImage.HasStencil) - { - return FramebufferAttachment.StencilAttachment; - } - else - { - throw new InvalidOperationException(); - } - } - - private static ClearBufferMask GetClearMask(ImageHandler CachedImage) - { - return (CachedImage.HasColor ? ClearBufferMask.ColorBufferBit : 0) | - (CachedImage.HasDepth ? ClearBufferMask.DepthBufferBit : 0) | - (CachedImage.HasStencil ? ClearBufferMask.StencilBufferBit : 0); - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLRenderer.cs b/Ryujinx.Graphics/Gal/OpenGL/OGLRenderer.cs deleted file mode 100644 index 14fb9018..00000000 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLRenderer.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using System.Collections.Concurrent; - -namespace Ryujinx.Graphics.Gal.OpenGL -{ - public class OGLRenderer : IGalRenderer - { - public IGalConstBuffer Buffer { get; private set; } - - public IGalRenderTarget RenderTarget { get; private set; } - - public IGalRasterizer Rasterizer { get; private set; } - - public IGalShader Shader { get; private set; } - - public IGalPipeline Pipeline { get; private set; } - - public IGalTexture Texture { get; private set; } - - private ConcurrentQueue<Action> ActionsQueue; - - public OGLRenderer() - { - Buffer = new OGLConstBuffer(); - - Texture = new OGLTexture(); - - RenderTarget = new OGLRenderTarget(Texture as OGLTexture); - - Rasterizer = new OGLRasterizer(); - - Shader = new OGLShader(Buffer as OGLConstBuffer); - - Pipeline = new OGLPipeline( - Buffer as OGLConstBuffer, - RenderTarget as OGLRenderTarget, - Rasterizer as OGLRasterizer, - Shader as OGLShader); - - ActionsQueue = new ConcurrentQueue<Action>(); - } - - public void QueueAction(Action ActionMthd) - { - ActionsQueue.Enqueue(ActionMthd); - } - - public void RunActions() - { - int Count = ActionsQueue.Count; - - while (Count-- > 0 && ActionsQueue.TryDequeue(out Action RenderAction)) - { - RenderAction(); - } - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLShader.cs b/Ryujinx.Graphics/Gal/OpenGL/OGLShader.cs deleted file mode 100644 index dc168ff9..00000000 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLShader.cs +++ /dev/null @@ -1,298 +0,0 @@ -using OpenTK.Graphics.OpenGL; -using Ryujinx.Graphics.Gal.Shader; -using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; - -namespace Ryujinx.Graphics.Gal.OpenGL -{ - class OGLShader : IGalShader - { - public const int ReservedCbufCount = 1; - - private const int ExtraDataSize = 4; - - public OGLShaderProgram Current; - - private ConcurrentDictionary<long, OGLShaderStage> Stages; - - private Dictionary<OGLShaderProgram, int> Programs; - - public int CurrentProgramHandle { get; private set; } - - private OGLConstBuffer Buffer; - - private int ExtraUboHandle; - - public OGLShader(OGLConstBuffer Buffer) - { - this.Buffer = Buffer; - - Stages = new ConcurrentDictionary<long, OGLShaderStage>(); - - Programs = new Dictionary<OGLShaderProgram, int>(); - } - - public void Create(IGalMemory Memory, long Key, GalShaderType Type) - { - Stages.GetOrAdd(Key, (Stage) => ShaderStageFactory(Memory, Key, 0, false, Type)); - } - - public void Create(IGalMemory Memory, long VpAPos, long Key, GalShaderType Type) - { - Stages.GetOrAdd(Key, (Stage) => ShaderStageFactory(Memory, VpAPos, Key, true, Type)); - } - - private OGLShaderStage ShaderStageFactory( - IGalMemory Memory, - long Position, - long PositionB, - bool IsDualVp, - GalShaderType Type) - { - GlslProgram Program; - - GlslDecompiler Decompiler = new GlslDecompiler(OGLLimit.MaxUboSize, OGLExtension.NvidiaDrvier); - - int ShaderDumpIndex = ShaderDumper.DumpIndex; - - if (IsDualVp) - { - ShaderDumper.Dump(Memory, Position, Type, "a"); - ShaderDumper.Dump(Memory, PositionB, Type, "b"); - - Program = Decompiler.Decompile(Memory, Position, PositionB, Type); - } - else - { - ShaderDumper.Dump(Memory, Position, Type); - - Program = Decompiler.Decompile(Memory, Position, Type); - } - - string Code = Program.Code; - - if (ShaderDumper.IsDumpEnabled()) - { - Code = "//Shader " + ShaderDumpIndex + Environment.NewLine + Code; - } - - return new OGLShaderStage(Type, Code, Program.Uniforms, Program.Textures); - } - - public IEnumerable<ShaderDeclInfo> GetConstBufferUsage(long Key) - { - if (Stages.TryGetValue(Key, out OGLShaderStage Stage)) - { - return Stage.ConstBufferUsage; - } - - return Enumerable.Empty<ShaderDeclInfo>(); - } - - public IEnumerable<ShaderDeclInfo> GetTextureUsage(long Key) - { - if (Stages.TryGetValue(Key, out OGLShaderStage Stage)) - { - return Stage.TextureUsage; - } - - return Enumerable.Empty<ShaderDeclInfo>(); - } - - public unsafe void SetExtraData(float FlipX, float FlipY, int Instance) - { - BindProgram(); - - EnsureExtraBlock(); - - GL.BindBuffer(BufferTarget.UniformBuffer, ExtraUboHandle); - - float* Data = stackalloc float[ExtraDataSize]; - Data[0] = FlipX; - Data[1] = FlipY; - Data[2] = BitConverter.Int32BitsToSingle(Instance); - - //Invalidate buffer - GL.BufferData(BufferTarget.UniformBuffer, ExtraDataSize * sizeof(float), IntPtr.Zero, BufferUsageHint.StreamDraw); - - GL.BufferSubData(BufferTarget.UniformBuffer, IntPtr.Zero, ExtraDataSize * sizeof(float), (IntPtr)Data); - } - - public void Bind(long Key) - { - if (Stages.TryGetValue(Key, out OGLShaderStage Stage)) - { - Bind(Stage); - } - } - - private void Bind(OGLShaderStage Stage) - { - if (Stage.Type == GalShaderType.Geometry) - { - //Enhanced layouts are required for Geometry shaders - //skip this stage if current driver has no ARB_enhanced_layouts - if (!OGLExtension.EnhancedLayouts) - { - return; - } - } - - switch (Stage.Type) - { - case GalShaderType.Vertex: Current.Vertex = Stage; break; - case GalShaderType.TessControl: Current.TessControl = Stage; break; - case GalShaderType.TessEvaluation: Current.TessEvaluation = Stage; break; - case GalShaderType.Geometry: Current.Geometry = Stage; break; - case GalShaderType.Fragment: Current.Fragment = Stage; break; - } - } - - public void Unbind(GalShaderType Type) - { - switch (Type) - { - case GalShaderType.Vertex: Current.Vertex = null; break; - case GalShaderType.TessControl: Current.TessControl = null; break; - case GalShaderType.TessEvaluation: Current.TessEvaluation = null; break; - case GalShaderType.Geometry: Current.Geometry = null; break; - case GalShaderType.Fragment: Current.Fragment = null; break; - } - } - - public void BindProgram() - { - if (Current.Vertex == null || - Current.Fragment == null) - { - return; - } - - if (!Programs.TryGetValue(Current, out int Handle)) - { - Handle = GL.CreateProgram(); - - AttachIfNotNull(Handle, Current.Vertex); - AttachIfNotNull(Handle, Current.TessControl); - AttachIfNotNull(Handle, Current.TessEvaluation); - AttachIfNotNull(Handle, Current.Geometry); - AttachIfNotNull(Handle, Current.Fragment); - - GL.LinkProgram(Handle); - - CheckProgramLink(Handle); - - BindUniformBlocks(Handle); - BindTextureLocations(Handle); - - Programs.Add(Current, Handle); - } - - GL.UseProgram(Handle); - - CurrentProgramHandle = Handle; - } - - private void EnsureExtraBlock() - { - if (ExtraUboHandle == 0) - { - ExtraUboHandle = GL.GenBuffer(); - - GL.BindBuffer(BufferTarget.UniformBuffer, ExtraUboHandle); - - GL.BufferData(BufferTarget.UniformBuffer, ExtraDataSize * sizeof(float), IntPtr.Zero, BufferUsageHint.StreamDraw); - - GL.BindBufferBase(BufferRangeTarget.UniformBuffer, 0, ExtraUboHandle); - } - } - - private void AttachIfNotNull(int ProgramHandle, OGLShaderStage Stage) - { - if (Stage != null) - { - Stage.Compile(); - - GL.AttachShader(ProgramHandle, Stage.Handle); - } - } - - private void BindUniformBlocks(int ProgramHandle) - { - int ExtraBlockindex = GL.GetUniformBlockIndex(ProgramHandle, GlslDecl.ExtraUniformBlockName); - - GL.UniformBlockBinding(ProgramHandle, ExtraBlockindex, 0); - - int FreeBinding = ReservedCbufCount; - - void BindUniformBlocksIfNotNull(OGLShaderStage Stage) - { - if (Stage != null) - { - foreach (ShaderDeclInfo DeclInfo in Stage.ConstBufferUsage) - { - int BlockIndex = GL.GetUniformBlockIndex(ProgramHandle, DeclInfo.Name); - - if (BlockIndex < 0) - { - //It is expected that its found, if it's not then driver might be in a malfunction - throw new InvalidOperationException(); - } - - GL.UniformBlockBinding(ProgramHandle, BlockIndex, FreeBinding); - - FreeBinding++; - } - } - } - - BindUniformBlocksIfNotNull(Current.Vertex); - BindUniformBlocksIfNotNull(Current.TessControl); - BindUniformBlocksIfNotNull(Current.TessEvaluation); - BindUniformBlocksIfNotNull(Current.Geometry); - BindUniformBlocksIfNotNull(Current.Fragment); - } - - private void BindTextureLocations(int ProgramHandle) - { - int Index = 0; - - void BindTexturesIfNotNull(OGLShaderStage Stage) - { - if (Stage != null) - { - foreach (ShaderDeclInfo Decl in Stage.TextureUsage) - { - int Location = GL.GetUniformLocation(ProgramHandle, Decl.Name); - - GL.Uniform1(Location, Index); - - Index++; - } - } - } - - GL.UseProgram(ProgramHandle); - - BindTexturesIfNotNull(Current.Vertex); - BindTexturesIfNotNull(Current.TessControl); - BindTexturesIfNotNull(Current.TessEvaluation); - BindTexturesIfNotNull(Current.Geometry); - BindTexturesIfNotNull(Current.Fragment); - } - - private static void CheckProgramLink(int Handle) - { - int Status = 0; - - GL.GetProgram(Handle, GetProgramParameterName.LinkStatus, out Status); - - if (Status == 0) - { - throw new ShaderException(GL.GetProgramInfoLog(Handle)); - } - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLShaderProgram.cs b/Ryujinx.Graphics/Gal/OpenGL/OGLShaderProgram.cs deleted file mode 100644 index c87b0d40..00000000 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLShaderProgram.cs +++ /dev/null @@ -1,86 +0,0 @@ -using OpenTK.Graphics.OpenGL; -using System; -using System.Collections.Generic; - -namespace Ryujinx.Graphics.Gal.OpenGL -{ - struct OGLShaderProgram - { - public OGLShaderStage Vertex; - public OGLShaderStage TessControl; - public OGLShaderStage TessEvaluation; - public OGLShaderStage Geometry; - public OGLShaderStage Fragment; - } - - class OGLShaderStage : IDisposable - { - public int Handle { get; private set; } - - public bool IsCompiled { get; private set; } - - public GalShaderType Type { get; private set; } - - public string Code { get; private set; } - - public IEnumerable<ShaderDeclInfo> ConstBufferUsage { get; private set; } - public IEnumerable<ShaderDeclInfo> TextureUsage { get; private set; } - - public OGLShaderStage( - GalShaderType Type, - string Code, - IEnumerable<ShaderDeclInfo> ConstBufferUsage, - IEnumerable<ShaderDeclInfo> TextureUsage) - { - this.Type = Type; - this.Code = Code; - this.ConstBufferUsage = ConstBufferUsage; - this.TextureUsage = TextureUsage; - } - - public void Compile() - { - if (Handle == 0) - { - Handle = GL.CreateShader(OGLEnumConverter.GetShaderType(Type)); - - CompileAndCheck(Handle, Code); - } - } - - public void Dispose() - { - Dispose(true); - } - - protected virtual void Dispose(bool Disposing) - { - if (Disposing && Handle != 0) - { - GL.DeleteShader(Handle); - - Handle = 0; - } - } - - public static void CompileAndCheck(int Handle, string Code) - { - GL.ShaderSource(Handle, Code); - GL.CompileShader(Handle); - - CheckCompilation(Handle); - } - - private static void CheckCompilation(int Handle) - { - int Status = 0; - - GL.GetShader(Handle, ShaderParameter.CompileStatus, out Status); - - if (Status == 0) - { - throw new ShaderException(GL.GetShaderInfoLog(Handle)); - } - } - } -}
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs b/Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs deleted file mode 100644 index 4fef11d2..00000000 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs +++ /dev/null @@ -1,381 +0,0 @@ -using OpenTK.Graphics.OpenGL; -using Ryujinx.Graphics.Texture; -using System; - -namespace Ryujinx.Graphics.Gal.OpenGL -{ - class OGLTexture : IGalTexture - { - private const long MaxTextureCacheSize = 768 * 1024 * 1024; - - private OGLCachedResource<ImageHandler> TextureCache; - - public EventHandler<int> TextureDeleted { get; set; } - - public OGLTexture() - { - TextureCache = new OGLCachedResource<ImageHandler>(DeleteTexture, MaxTextureCacheSize); - } - - public void LockCache() - { - TextureCache.Lock(); - } - - public void UnlockCache() - { - TextureCache.Unlock(); - } - - private void DeleteTexture(ImageHandler CachedImage) - { - TextureDeleted?.Invoke(this, CachedImage.Handle); - - GL.DeleteTexture(CachedImage.Handle); - } - - public void Create(long Key, int Size, GalImage Image) - { - int Handle = GL.GenTexture(); - - TextureTarget Target = ImageUtils.GetTextureTarget(Image.TextureTarget); - - GL.BindTexture(Target, Handle); - - const int Level = 0; //TODO: Support mipmap textures. - const int Border = 0; - - TextureCache.AddOrUpdate(Key, new ImageHandler(Handle, Image), (uint)Size); - - if (ImageUtils.IsCompressed(Image.Format)) - { - throw new InvalidOperationException("Surfaces with compressed formats are not supported!"); - } - - (PixelInternalFormat InternalFmt, - PixelFormat Format, - PixelType Type) = OGLEnumConverter.GetImageFormat(Image.Format); - - switch (Target) - { - case TextureTarget.Texture1D: - GL.TexImage1D( - Target, - Level, - InternalFmt, - Image.Width, - Border, - Format, - Type, - IntPtr.Zero); - break; - - case TextureTarget.Texture2D: - GL.TexImage2D( - Target, - Level, - InternalFmt, - Image.Width, - Image.Height, - Border, - Format, - Type, - IntPtr.Zero); - break; - case TextureTarget.Texture3D: - GL.TexImage3D( - Target, - Level, - InternalFmt, - Image.Width, - Image.Height, - Image.Depth, - Border, - Format, - Type, - IntPtr.Zero); - break; - case TextureTarget.Texture2DArray: - GL.TexImage3D( - Target, - Level, - InternalFmt, - Image.Width, - Image.Height, - Image.LayerCount, - Border, - Format, - Type, - IntPtr.Zero); - break; - default: - throw new NotImplementedException($"Unsupported texture target type: {Target}"); - } - } - - public void Create(long Key, byte[] Data, GalImage Image) - { - int Handle = GL.GenTexture(); - - TextureTarget Target = ImageUtils.GetTextureTarget(Image.TextureTarget); - - GL.BindTexture(Target, Handle); - - const int Level = 0; //TODO: Support mipmap textures. - const int Border = 0; - - TextureCache.AddOrUpdate(Key, new ImageHandler(Handle, Image), (uint)Data.Length); - - if (ImageUtils.IsCompressed(Image.Format) && !IsAstc(Image.Format)) - { - InternalFormat InternalFmt = OGLEnumConverter.GetCompressedImageFormat(Image.Format); - - switch (Target) - { - case TextureTarget.Texture1D: - GL.CompressedTexImage1D( - Target, - Level, - InternalFmt, - Image.Width, - Border, - Data.Length, - Data); - break; - case TextureTarget.Texture2D: - GL.CompressedTexImage2D( - Target, - Level, - InternalFmt, - Image.Width, - Image.Height, - Border, - Data.Length, - Data); - break; - case TextureTarget.Texture3D: - GL.CompressedTexImage3D( - Target, - Level, - InternalFmt, - Image.Width, - Image.Height, - Image.Depth, - Border, - Data.Length, - Data); - break; - case TextureTarget.Texture2DArray: - GL.CompressedTexImage3D( - Target, - Level, - InternalFmt, - Image.Width, - Image.Height, - Image.LayerCount, - Border, - Data.Length, - Data); - break; - default: - throw new NotImplementedException($"Unsupported texture target type: {Target}"); - } - } - else - { - //TODO: Use KHR_texture_compression_astc_hdr when available - if (IsAstc(Image.Format)) - { - int TextureBlockWidth = ImageUtils.GetBlockWidth(Image.Format); - int TextureBlockHeight = ImageUtils.GetBlockHeight(Image.Format); - int TextureBlockDepth = ImageUtils.GetBlockDepth(Image.Format); - - Data = ASTCDecoder.DecodeToRGBA8888( - Data, - TextureBlockWidth, - TextureBlockHeight, - TextureBlockDepth, - Image.Width, - Image.Height, - Image.Depth); - - Image.Format = GalImageFormat.RGBA8 | (Image.Format & GalImageFormat.TypeMask); - } - - (PixelInternalFormat InternalFmt, - PixelFormat Format, - PixelType Type) = OGLEnumConverter.GetImageFormat(Image.Format); - - - switch (Target) - { - case TextureTarget.Texture1D: - GL.TexImage1D( - Target, - Level, - InternalFmt, - Image.Width, - Border, - Format, - Type, - Data); - break; - case TextureTarget.Texture2D: - GL.TexImage2D( - Target, - Level, - InternalFmt, - Image.Width, - Image.Height, - Border, - Format, - Type, - Data); - break; - case TextureTarget.Texture3D: - GL.TexImage3D( - Target, - Level, - InternalFmt, - Image.Width, - Image.Height, - Image.Depth, - Border, - Format, - Type, - Data); - break; - case TextureTarget.Texture2DArray: - GL.TexImage3D( - Target, - Level, - InternalFmt, - Image.Width, - Image.Height, - Image.LayerCount, - Border, - Format, - Type, - Data); - break; - case TextureTarget.TextureCubeMap: - Span<byte> Array = new Span<byte>(Data); - - int FaceSize = ImageUtils.GetSize(Image) / 6; - - for (int Face = 0; Face < 6; Face++) - { - GL.TexImage2D( - TextureTarget.TextureCubeMapPositiveX + Face, - Level, - InternalFmt, - Image.Width, - Image.Height, - Border, - Format, - Type, - Array.Slice(Face * FaceSize, FaceSize).ToArray()); - } - break; - default: - throw new NotImplementedException($"Unsupported texture target type: {Target}"); - } - } - } - - private static bool IsAstc(GalImageFormat Format) - { - Format &= GalImageFormat.FormatMask; - - return Format > GalImageFormat.Astc2DStart && Format < GalImageFormat.Astc2DEnd; - } - - public bool TryGetImage(long Key, out GalImage Image) - { - if (TextureCache.TryGetValue(Key, out ImageHandler CachedImage)) - { - Image = CachedImage.Image; - - return true; - } - - Image = default(GalImage); - - return false; - } - - public bool TryGetImageHandler(long Key, out ImageHandler CachedImage) - { - if (TextureCache.TryGetValue(Key, out CachedImage)) - { - return true; - } - - CachedImage = null; - - return false; - } - - public void Bind(long Key, int Index, GalImage Image) - { - if (TextureCache.TryGetValue(Key, out ImageHandler CachedImage)) - { - GL.ActiveTexture(TextureUnit.Texture0 + Index); - - TextureTarget Target = ImageUtils.GetTextureTarget(Image.TextureTarget); - - GL.BindTexture(Target, CachedImage.Handle); - - int[] SwizzleRgba = new int[] - { - (int)OGLEnumConverter.GetTextureSwizzle(Image.XSource), - (int)OGLEnumConverter.GetTextureSwizzle(Image.YSource), - (int)OGLEnumConverter.GetTextureSwizzle(Image.ZSource), - (int)OGLEnumConverter.GetTextureSwizzle(Image.WSource) - }; - - GL.TexParameter(Target, TextureParameterName.TextureSwizzleRgba, SwizzleRgba); - } - } - - public void SetSampler(GalImage Image, GalTextureSampler Sampler) - { - int WrapS = (int)OGLEnumConverter.GetTextureWrapMode(Sampler.AddressU); - int WrapT = (int)OGLEnumConverter.GetTextureWrapMode(Sampler.AddressV); - int WrapR = (int)OGLEnumConverter.GetTextureWrapMode(Sampler.AddressP); - - int MinFilter = (int)OGLEnumConverter.GetTextureMinFilter(Sampler.MinFilter, Sampler.MipFilter); - int MagFilter = (int)OGLEnumConverter.GetTextureMagFilter(Sampler.MagFilter); - - TextureTarget Target = ImageUtils.GetTextureTarget(Image.TextureTarget); - - GL.TexParameter(Target, TextureParameterName.TextureWrapS, WrapS); - GL.TexParameter(Target, TextureParameterName.TextureWrapT, WrapT); - GL.TexParameter(Target, TextureParameterName.TextureWrapR, WrapR); - - GL.TexParameter(Target, TextureParameterName.TextureMinFilter, MinFilter); - GL.TexParameter(Target, TextureParameterName.TextureMagFilter, MagFilter); - - float[] Color = new float[] - { - Sampler.BorderColor.Red, - Sampler.BorderColor.Green, - Sampler.BorderColor.Blue, - Sampler.BorderColor.Alpha - }; - - GL.TexParameter(Target, TextureParameterName.TextureBorderColor, Color); - - if (Sampler.DepthCompare) - { - GL.TexParameter(Target, TextureParameterName.TextureCompareMode, (int)All.CompareRToTexture); - GL.TexParameter(Target, TextureParameterName.TextureCompareFunc, (int)OGLEnumConverter.GetDepthCompareFunc(Sampler.DepthCompareFunc)); - } - else - { - GL.TexParameter(Target, TextureParameterName.TextureCompareMode, (int)All.None); - GL.TexParameter(Target, TextureParameterName.TextureCompareFunc, (int)All.Never); - } - } - } -} diff --git a/Ryujinx.Graphics/Gal/OpenGL/OglCachedResource.cs b/Ryujinx.Graphics/Gal/OpenGL/OglCachedResource.cs new file mode 100644 index 00000000..91f0a7e1 --- /dev/null +++ b/Ryujinx.Graphics/Gal/OpenGL/OglCachedResource.cs @@ -0,0 +1,191 @@ +using Ryujinx.Common; +using System; +using System.Collections.Generic; + +namespace Ryujinx.Graphics.Gal.OpenGL +{ + class OglCachedResource<T> + { + public delegate void DeleteValue(T value); + + private const int MinTimeDelta = 5 * 60000; + private const int MaxRemovalsPerRun = 10; + + private struct CacheBucket + { + public T Value { get; private set; } + + public LinkedListNode<long> Node { get; private set; } + + public long DataSize { get; private set; } + + public long Timestamp { get; private set; } + + public CacheBucket(T value, long dataSize, LinkedListNode<long> node) + { + Value = value; + DataSize = dataSize; + Node = node; + + Timestamp = PerformanceCounter.ElapsedMilliseconds; + } + } + + private Dictionary<long, CacheBucket> _cache; + + private LinkedList<long> _sortedCache; + + private DeleteValue _deleteValueCallback; + + private Queue<T> _deletePending; + + private bool _locked; + + private long _maxSize; + private long _totalSize; + + public OglCachedResource(DeleteValue deleteValueCallback, long maxSize) + { + _maxSize = maxSize; + + if (deleteValueCallback == null) + { + throw new ArgumentNullException(nameof(deleteValueCallback)); + } + + _deleteValueCallback = deleteValueCallback; + + _cache = new Dictionary<long, CacheBucket>(); + + _sortedCache = new LinkedList<long>(); + + _deletePending = new Queue<T>(); + } + + public void Lock() + { + _locked = true; + } + + public void Unlock() + { + _locked = false; + + while (_deletePending.TryDequeue(out T value)) + { + _deleteValueCallback(value); + } + + ClearCacheIfNeeded(); + } + + public void AddOrUpdate(long key, T value, long size) + { + if (!_locked) + { + ClearCacheIfNeeded(); + } + + LinkedListNode<long> node = _sortedCache.AddLast(key); + + CacheBucket newBucket = new CacheBucket(value, size, node); + + if (_cache.TryGetValue(key, out CacheBucket bucket)) + { + if (_locked) + { + _deletePending.Enqueue(bucket.Value); + } + else + { + _deleteValueCallback(bucket.Value); + } + + _sortedCache.Remove(bucket.Node); + + _totalSize -= bucket.DataSize; + + _cache[key] = newBucket; + } + else + { + _cache.Add(key, newBucket); + } + + _totalSize += size; + } + + public bool TryGetValue(long key, out T value) + { + if (_cache.TryGetValue(key, out CacheBucket bucket)) + { + value = bucket.Value; + + _sortedCache.Remove(bucket.Node); + + LinkedListNode<long> node = _sortedCache.AddLast(key); + + _cache[key] = new CacheBucket(value, bucket.DataSize, node); + + return true; + } + + value = default(T); + + return false; + } + + public bool TryGetSize(long key, out long size) + { + if (_cache.TryGetValue(key, out CacheBucket bucket)) + { + size = bucket.DataSize; + + return true; + } + + size = 0; + + return false; + } + + private void ClearCacheIfNeeded() + { + long timestamp = PerformanceCounter.ElapsedMilliseconds; + + int count = 0; + + while (count++ < MaxRemovalsPerRun) + { + LinkedListNode<long> node = _sortedCache.First; + + if (node == null) + { + break; + } + + CacheBucket bucket = _cache[node.Value]; + + long timeDelta = timestamp - bucket.Timestamp; + + if (timeDelta <= MinTimeDelta && !UnderMemoryPressure()) + { + break; + } + + _sortedCache.Remove(node); + + _cache.Remove(node.Value); + + _deleteValueCallback(bucket.Value); + + _totalSize -= bucket.DataSize; + } + } + + private bool UnderMemoryPressure() + { + return _totalSize >= _maxSize; + } + } +}
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/OpenGL/OglConstBuffer.cs b/Ryujinx.Graphics/Gal/OpenGL/OglConstBuffer.cs new file mode 100644 index 00000000..e076be33 --- /dev/null +++ b/Ryujinx.Graphics/Gal/OpenGL/OglConstBuffer.cs @@ -0,0 +1,74 @@ +using OpenTK.Graphics.OpenGL; +using System; + +namespace Ryujinx.Graphics.Gal.OpenGL +{ + class OglConstBuffer : IGalConstBuffer + { + private const long MaxConstBufferCacheSize = 64 * 1024 * 1024; + + private OglCachedResource<OglStreamBuffer> _cache; + + public OglConstBuffer() + { + _cache = new OglCachedResource<OglStreamBuffer>(DeleteBuffer, MaxConstBufferCacheSize); + } + + public void LockCache() + { + _cache.Lock(); + } + + public void UnlockCache() + { + _cache.Unlock(); + } + + public void Create(long key, long size) + { + OglStreamBuffer buffer = new OglStreamBuffer(BufferTarget.UniformBuffer, size); + + _cache.AddOrUpdate(key, buffer, size); + } + + public bool IsCached(long key, long size) + { + return _cache.TryGetSize(key, out long cachedSize) && cachedSize == size; + } + + public void SetData(long key, long size, IntPtr hostAddress) + { + if (_cache.TryGetValue(key, out OglStreamBuffer buffer)) + { + buffer.SetData(size, hostAddress); + } + } + + public void SetData(long key, byte[] data) + { + if (_cache.TryGetValue(key, out OglStreamBuffer buffer)) + { + buffer.SetData(data); + } + } + + public bool TryGetUbo(long key, out int uboHandle) + { + if (_cache.TryGetValue(key, out OglStreamBuffer buffer)) + { + uboHandle = buffer.Handle; + + return true; + } + + uboHandle = 0; + + return false; + } + + private static void DeleteBuffer(OglStreamBuffer buffer) + { + buffer.Dispose(); + } + } +}
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs b/Ryujinx.Graphics/Gal/OpenGL/OglEnumConverter.cs index 3a25fff7..a3f9957f 100644 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs +++ b/Ryujinx.Graphics/Gal/OpenGL/OglEnumConverter.cs @@ -3,34 +3,34 @@ using System; namespace Ryujinx.Graphics.Gal.OpenGL { - static class OGLEnumConverter + static class OglEnumConverter { - public static FrontFaceDirection GetFrontFace(GalFrontFace FrontFace) + public static FrontFaceDirection GetFrontFace(GalFrontFace frontFace) { - switch (FrontFace) + switch (frontFace) { - case GalFrontFace.CW: return FrontFaceDirection.Cw; - case GalFrontFace.CCW: return FrontFaceDirection.Ccw; + case GalFrontFace.Cw: return FrontFaceDirection.Cw; + case GalFrontFace.Ccw: return FrontFaceDirection.Ccw; } - throw new ArgumentException(nameof(FrontFace) + " \"" + FrontFace + "\" is not valid!"); + throw new ArgumentException(nameof(frontFace) + " \"" + frontFace + "\" is not valid!"); } - public static CullFaceMode GetCullFace(GalCullFace CullFace) + public static CullFaceMode GetCullFace(GalCullFace cullFace) { - switch (CullFace) + switch (cullFace) { case GalCullFace.Front: return CullFaceMode.Front; case GalCullFace.Back: return CullFaceMode.Back; case GalCullFace.FrontAndBack: return CullFaceMode.FrontAndBack; } - throw new ArgumentException(nameof(CullFace) + " \"" + CullFace + "\" is not valid!"); + throw new ArgumentException(nameof(cullFace) + " \"" + cullFace + "\" is not valid!"); } - public static StencilOp GetStencilOp(GalStencilOp Op) + public static StencilOp GetStencilOp(GalStencilOp op) { - switch (Op) + switch (op) { case GalStencilOp.Keep: return StencilOp.Keep; case GalStencilOp.Zero: return StencilOp.Zero; @@ -42,28 +42,28 @@ namespace Ryujinx.Graphics.Gal.OpenGL case GalStencilOp.DecrWrap: return StencilOp.DecrWrap; } - throw new ArgumentException(nameof(Op) + " \"" + Op + "\" is not valid!"); + throw new ArgumentException(nameof(op) + " \"" + op + "\" is not valid!"); } - public static DepthFunction GetDepthFunc(GalComparisonOp Func) + public static DepthFunction GetDepthFunc(GalComparisonOp func) { - return (DepthFunction)GetFunc(Func); + return (DepthFunction)GetFunc(func); } - public static StencilFunction GetStencilFunc(GalComparisonOp Func) + public static StencilFunction GetStencilFunc(GalComparisonOp func) { - return (StencilFunction)GetFunc(Func); + return (StencilFunction)GetFunc(func); } - private static All GetFunc(GalComparisonOp Func) + private static All GetFunc(GalComparisonOp func) { - if ((int)Func >= (int)All.Never && - (int)Func <= (int)All.Always) + if ((int)func >= (int)All.Never && + (int)func <= (int)All.Always) { - return (All)Func; + return (All)func; } - switch (Func) + switch (func) { case GalComparisonOp.Never: return All.Never; case GalComparisonOp.Less: return All.Less; @@ -75,24 +75,24 @@ namespace Ryujinx.Graphics.Gal.OpenGL case GalComparisonOp.Always: return All.Always; } - throw new ArgumentException(nameof(Func) + " \"" + Func + "\" is not valid!"); + throw new ArgumentException(nameof(func) + " \"" + func + "\" is not valid!"); } - public static DrawElementsType GetDrawElementsType(GalIndexFormat Format) + public static DrawElementsType GetDrawElementsType(GalIndexFormat format) { - switch (Format) + switch (format) { case GalIndexFormat.Byte: return DrawElementsType.UnsignedByte; case GalIndexFormat.Int16: return DrawElementsType.UnsignedShort; case GalIndexFormat.Int32: return DrawElementsType.UnsignedInt; } - throw new ArgumentException(nameof(Format) + " \"" + Format + "\" is not valid!"); + throw new ArgumentException(nameof(format) + " \"" + format + "\" is not valid!"); } - public static PrimitiveType GetPrimitiveType(GalPrimitiveType Type) + public static PrimitiveType GetPrimitiveType(GalPrimitiveType type) { - switch (Type) + switch (type) { case GalPrimitiveType.Points: return PrimitiveType.Points; case GalPrimitiveType.Lines: return PrimitiveType.Lines; @@ -109,12 +109,12 @@ namespace Ryujinx.Graphics.Gal.OpenGL case GalPrimitiveType.Patches: return PrimitiveType.Patches; } - throw new ArgumentException(nameof(Type) + " \"" + Type + "\" is not valid!"); + throw new ArgumentException(nameof(type) + " \"" + type + "\" is not valid!"); } - public static ShaderType GetShaderType(GalShaderType Type) + public static ShaderType GetShaderType(GalShaderType type) { - switch (Type) + switch (type) { case GalShaderType.Vertex: return ShaderType.VertexShader; case GalShaderType.TessControl: return ShaderType.TessControlShader; @@ -123,50 +123,50 @@ namespace Ryujinx.Graphics.Gal.OpenGL case GalShaderType.Fragment: return ShaderType.FragmentShader; } - throw new ArgumentException(nameof(Type) + " \"" + Type + "\" is not valid!"); + throw new ArgumentException(nameof(type) + " \"" + type + "\" is not valid!"); } - public static (PixelInternalFormat, PixelFormat, PixelType) GetImageFormat(GalImageFormat Format) + public static (PixelInternalFormat, PixelFormat, PixelType) GetImageFormat(GalImageFormat format) { - switch (Format) + switch (format) { - case GalImageFormat.RGBA32 | GalImageFormat.Float: return (PixelInternalFormat.Rgba32f, PixelFormat.Rgba, PixelType.Float); - case GalImageFormat.RGBA32 | GalImageFormat.Sint: return (PixelInternalFormat.Rgba32i, PixelFormat.RgbaInteger, PixelType.Int); - case GalImageFormat.RGBA32 | GalImageFormat.Uint: return (PixelInternalFormat.Rgba32ui, PixelFormat.RgbaInteger, PixelType.UnsignedInt); - case GalImageFormat.RGBA16 | GalImageFormat.Float: return (PixelInternalFormat.Rgba16f, PixelFormat.Rgba, PixelType.HalfFloat); - case GalImageFormat.RGBA16 | GalImageFormat.Sint: return (PixelInternalFormat.Rgba16i, PixelFormat.RgbaInteger, PixelType.Short); - case GalImageFormat.RGBA16 | GalImageFormat.Uint: return (PixelInternalFormat.Rgba16ui, PixelFormat.RgbaInteger, PixelType.UnsignedShort); - case GalImageFormat.RGBA16 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba16, PixelFormat.Rgba, PixelType.UnsignedShort); - case GalImageFormat.RG32 | GalImageFormat.Float: return (PixelInternalFormat.Rg32f, PixelFormat.Rg, PixelType.Float); - case GalImageFormat.RG32 | GalImageFormat.Sint: return (PixelInternalFormat.Rg32i, PixelFormat.RgInteger, PixelType.Int); - case GalImageFormat.RG32 | GalImageFormat.Uint: return (PixelInternalFormat.Rg32ui, PixelFormat.RgInteger, PixelType.UnsignedInt); - case GalImageFormat.RGBX8 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgb8, PixelFormat.Rgba, PixelType.UnsignedByte); - case GalImageFormat.RGBA8 | GalImageFormat.Snorm: return (PixelInternalFormat.Rgba8Snorm, PixelFormat.Rgba, PixelType.Byte); - case GalImageFormat.RGBA8 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba8, PixelFormat.Rgba, PixelType.UnsignedByte); - case GalImageFormat.RGBA8 | GalImageFormat.Sint: return (PixelInternalFormat.Rgba8i, PixelFormat.RgbaInteger, PixelType.Byte); - case GalImageFormat.RGBA8 | GalImageFormat.Uint: return (PixelInternalFormat.Rgba8ui, PixelFormat.RgbaInteger, PixelType.UnsignedByte); - case GalImageFormat.RGBA8 | GalImageFormat.Srgb: return (PixelInternalFormat.Srgb8Alpha8, PixelFormat.Rgba, PixelType.UnsignedByte); - case GalImageFormat.BGRA8 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba8, PixelFormat.Bgra, PixelType.UnsignedByte); - case GalImageFormat.BGRA8 | GalImageFormat.Srgb: return (PixelInternalFormat.Srgb8Alpha8, PixelFormat.Bgra, PixelType.UnsignedByte); - case GalImageFormat.RGBA4 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba4, PixelFormat.Rgba, PixelType.UnsignedShort4444Reversed); - case GalImageFormat.RGB10A2 | GalImageFormat.Uint: return (PixelInternalFormat.Rgb10A2ui, PixelFormat.RgbaInteger, PixelType.UnsignedInt2101010Reversed); - case GalImageFormat.RGB10A2 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgb10A2, PixelFormat.Rgba, PixelType.UnsignedInt2101010Reversed); + case GalImageFormat.Rgba32 | GalImageFormat.Float: return (PixelInternalFormat.Rgba32f, PixelFormat.Rgba, PixelType.Float); + case GalImageFormat.Rgba32 | GalImageFormat.Sint: return (PixelInternalFormat.Rgba32i, PixelFormat.RgbaInteger, PixelType.Int); + case GalImageFormat.Rgba32 | GalImageFormat.Uint: return (PixelInternalFormat.Rgba32ui, PixelFormat.RgbaInteger, PixelType.UnsignedInt); + case GalImageFormat.Rgba16 | GalImageFormat.Float: return (PixelInternalFormat.Rgba16f, PixelFormat.Rgba, PixelType.HalfFloat); + case GalImageFormat.Rgba16 | GalImageFormat.Sint: return (PixelInternalFormat.Rgba16i, PixelFormat.RgbaInteger, PixelType.Short); + case GalImageFormat.Rgba16 | GalImageFormat.Uint: return (PixelInternalFormat.Rgba16ui, PixelFormat.RgbaInteger, PixelType.UnsignedShort); + case GalImageFormat.Rgba16 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba16, PixelFormat.Rgba, PixelType.UnsignedShort); + case GalImageFormat.Rg32 | GalImageFormat.Float: return (PixelInternalFormat.Rg32f, PixelFormat.Rg, PixelType.Float); + case GalImageFormat.Rg32 | GalImageFormat.Sint: return (PixelInternalFormat.Rg32i, PixelFormat.RgInteger, PixelType.Int); + case GalImageFormat.Rg32 | GalImageFormat.Uint: return (PixelInternalFormat.Rg32ui, PixelFormat.RgInteger, PixelType.UnsignedInt); + case GalImageFormat.Rgbx8 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgb8, PixelFormat.Rgba, PixelType.UnsignedByte); + case GalImageFormat.Rgba8 | GalImageFormat.Snorm: return (PixelInternalFormat.Rgba8Snorm, PixelFormat.Rgba, PixelType.Byte); + case GalImageFormat.Rgba8 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba8, PixelFormat.Rgba, PixelType.UnsignedByte); + case GalImageFormat.Rgba8 | GalImageFormat.Sint: return (PixelInternalFormat.Rgba8i, PixelFormat.RgbaInteger, PixelType.Byte); + case GalImageFormat.Rgba8 | GalImageFormat.Uint: return (PixelInternalFormat.Rgba8ui, PixelFormat.RgbaInteger, PixelType.UnsignedByte); + case GalImageFormat.Rgba8 | GalImageFormat.Srgb: return (PixelInternalFormat.Srgb8Alpha8, PixelFormat.Rgba, PixelType.UnsignedByte); + case GalImageFormat.Bgra8 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba8, PixelFormat.Bgra, PixelType.UnsignedByte); + case GalImageFormat.Bgra8 | GalImageFormat.Srgb: return (PixelInternalFormat.Srgb8Alpha8, PixelFormat.Bgra, PixelType.UnsignedByte); + case GalImageFormat.Rgba4 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba4, PixelFormat.Rgba, PixelType.UnsignedShort4444Reversed); + case GalImageFormat.Rgb10A2 | GalImageFormat.Uint: return (PixelInternalFormat.Rgb10A2ui, PixelFormat.RgbaInteger, PixelType.UnsignedInt2101010Reversed); + case GalImageFormat.Rgb10A2 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgb10A2, PixelFormat.Rgba, PixelType.UnsignedInt2101010Reversed); case GalImageFormat.R32 | GalImageFormat.Float: return (PixelInternalFormat.R32f, PixelFormat.Red, PixelType.Float); case GalImageFormat.R32 | GalImageFormat.Sint: return (PixelInternalFormat.R32i, PixelFormat.Red, PixelType.Int); case GalImageFormat.R32 | GalImageFormat.Uint: return (PixelInternalFormat.R32ui, PixelFormat.Red, PixelType.UnsignedInt); - case GalImageFormat.BGR5A1 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgb5A1, PixelFormat.Rgba, PixelType.UnsignedShort5551); - case GalImageFormat.RGB5A1 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgb5A1, PixelFormat.Rgba, PixelType.UnsignedShort1555Reversed); - case GalImageFormat.RGB565 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba, PixelFormat.Rgb, PixelType.UnsignedShort565Reversed); - case GalImageFormat.BGR565 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba, PixelFormat.Rgb, PixelType.UnsignedShort565); - case GalImageFormat.RG16 | GalImageFormat.Float: return (PixelInternalFormat.Rg16f, PixelFormat.Rg, PixelType.HalfFloat); - case GalImageFormat.RG16 | GalImageFormat.Sint: return (PixelInternalFormat.Rg16i, PixelFormat.RgInteger, PixelType.Short); - case GalImageFormat.RG16 | GalImageFormat.Snorm: return (PixelInternalFormat.Rg16Snorm, PixelFormat.Rg, PixelType.Short); - case GalImageFormat.RG16 | GalImageFormat.Uint: return (PixelInternalFormat.Rg16ui, PixelFormat.RgInteger, PixelType.UnsignedShort); - case GalImageFormat.RG16 | GalImageFormat.Unorm: return (PixelInternalFormat.Rg16, PixelFormat.Rg, PixelType.UnsignedShort); - case GalImageFormat.RG8 | GalImageFormat.Sint: return (PixelInternalFormat.Rg8i, PixelFormat.RgInteger, PixelType.Byte); - case GalImageFormat.RG8 | GalImageFormat.Snorm: return (PixelInternalFormat.Rg8Snorm, PixelFormat.Rg, PixelType.Byte); - case GalImageFormat.RG8 | GalImageFormat.Uint: return (PixelInternalFormat.Rg8ui, PixelFormat.RgInteger, PixelType.UnsignedByte); - case GalImageFormat.RG8 | GalImageFormat.Unorm: return (PixelInternalFormat.Rg8, PixelFormat.Rg, PixelType.UnsignedByte); + case GalImageFormat.Bgr5A1 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgb5A1, PixelFormat.Rgba, PixelType.UnsignedShort5551); + case GalImageFormat.Rgb5A1 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgb5A1, PixelFormat.Rgba, PixelType.UnsignedShort1555Reversed); + case GalImageFormat.Rgb565 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba, PixelFormat.Rgb, PixelType.UnsignedShort565Reversed); + case GalImageFormat.Bgr565 | GalImageFormat.Unorm: return (PixelInternalFormat.Rgba, PixelFormat.Rgb, PixelType.UnsignedShort565); + case GalImageFormat.Rg16 | GalImageFormat.Float: return (PixelInternalFormat.Rg16f, PixelFormat.Rg, PixelType.HalfFloat); + case GalImageFormat.Rg16 | GalImageFormat.Sint: return (PixelInternalFormat.Rg16i, PixelFormat.RgInteger, PixelType.Short); + case GalImageFormat.Rg16 | GalImageFormat.Snorm: return (PixelInternalFormat.Rg16Snorm, PixelFormat.Rg, PixelType.Short); + case GalImageFormat.Rg16 | GalImageFormat.Uint: return (PixelInternalFormat.Rg16ui, PixelFormat.RgInteger, PixelType.UnsignedShort); + case GalImageFormat.Rg16 | GalImageFormat.Unorm: return (PixelInternalFormat.Rg16, PixelFormat.Rg, PixelType.UnsignedShort); + case GalImageFormat.Rg8 | GalImageFormat.Sint: return (PixelInternalFormat.Rg8i, PixelFormat.RgInteger, PixelType.Byte); + case GalImageFormat.Rg8 | GalImageFormat.Snorm: return (PixelInternalFormat.Rg8Snorm, PixelFormat.Rg, PixelType.Byte); + case GalImageFormat.Rg8 | GalImageFormat.Uint: return (PixelInternalFormat.Rg8ui, PixelFormat.RgInteger, PixelType.UnsignedByte); + case GalImageFormat.Rg8 | GalImageFormat.Unorm: return (PixelInternalFormat.Rg8, PixelFormat.Rg, PixelType.UnsignedByte); case GalImageFormat.R16 | GalImageFormat.Float: return (PixelInternalFormat.R16f, PixelFormat.Red, PixelType.HalfFloat); case GalImageFormat.R16 | GalImageFormat.Sint: return (PixelInternalFormat.R16i, PixelFormat.RedInteger, PixelType.Short); case GalImageFormat.R16 | GalImageFormat.Snorm: return (PixelInternalFormat.R16Snorm, PixelFormat.Red, PixelType.Short); @@ -186,12 +186,12 @@ namespace Ryujinx.Graphics.Gal.OpenGL case GalImageFormat.D32S8 | GalImageFormat.Float: return (PixelInternalFormat.Depth32fStencil8, PixelFormat.DepthStencil, PixelType.Float32UnsignedInt248Rev); } - throw new NotImplementedException($"{Format & GalImageFormat.FormatMask} {Format & GalImageFormat.TypeMask}"); + throw new NotImplementedException($"{format & GalImageFormat.FormatMask} {format & GalImageFormat.TypeMask}"); } - public static All GetDepthCompareFunc(DepthCompareFunc DepthCompareFunc) + public static All GetDepthCompareFunc(DepthCompareFunc depthCompareFunc) { - switch (DepthCompareFunc) + switch (depthCompareFunc) { case DepthCompareFunc.LEqual: return All.Lequal; @@ -210,13 +210,13 @@ namespace Ryujinx.Graphics.Gal.OpenGL case DepthCompareFunc.Never: return All.Never; default: - throw new ArgumentException(nameof(DepthCompareFunc) + " \"" + DepthCompareFunc + "\" is not valid!"); + throw new ArgumentException(nameof(depthCompareFunc) + " \"" + depthCompareFunc + "\" is not valid!"); } } - public static InternalFormat GetCompressedImageFormat(GalImageFormat Format) + public static InternalFormat GetCompressedImageFormat(GalImageFormat format) { - switch (Format) + switch (format) { case GalImageFormat.BptcSfloat | GalImageFormat.Float: return InternalFormat.CompressedRgbBptcSignedFloat; case GalImageFormat.BptcUfloat | GalImageFormat.Float: return InternalFormat.CompressedRgbBptcUnsignedFloat; @@ -234,12 +234,12 @@ namespace Ryujinx.Graphics.Gal.OpenGL case GalImageFormat.BC5 | GalImageFormat.Unorm: return InternalFormat.CompressedRgRgtc2; } - throw new NotImplementedException($"{Format & GalImageFormat.FormatMask} {Format & GalImageFormat.TypeMask}"); + throw new NotImplementedException($"{format & GalImageFormat.FormatMask} {format & GalImageFormat.TypeMask}"); } - public static All GetTextureSwizzle(GalTextureSource Source) + public static All GetTextureSwizzle(GalTextureSource source) { - switch (Source) + switch (source) { case GalTextureSource.Zero: return All.Zero; case GalTextureSource.Red: return All.Red; @@ -250,12 +250,12 @@ namespace Ryujinx.Graphics.Gal.OpenGL case GalTextureSource.OneFloat: return All.One; } - throw new ArgumentException(nameof(Source) + " \"" + Source + "\" is not valid!"); + throw new ArgumentException(nameof(source) + " \"" + source + "\" is not valid!"); } - public static TextureWrapMode GetTextureWrapMode(GalTextureWrap Wrap) + public static TextureWrapMode GetTextureWrapMode(GalTextureWrap wrap) { - switch (Wrap) + switch (wrap) { case GalTextureWrap.Repeat: return TextureWrapMode.Repeat; case GalTextureWrap.MirroredRepeat: return TextureWrapMode.MirroredRepeat; @@ -264,9 +264,9 @@ namespace Ryujinx.Graphics.Gal.OpenGL case GalTextureWrap.Clamp: return TextureWrapMode.Clamp; } - if (OGLExtension.TextureMirrorClamp) + if (OglExtension.TextureMirrorClamp) { - switch (Wrap) + switch (wrap) { case GalTextureWrap.MirrorClampToEdge: return (TextureWrapMode)ExtTextureMirrorClamp.MirrorClampToEdgeExt; case GalTextureWrap.MirrorClampToBorder: return (TextureWrapMode)ExtTextureMirrorClamp.MirrorClampToBorderExt; @@ -276,7 +276,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL else { //Fallback to non-mirrored clamps - switch (Wrap) + switch (wrap) { case GalTextureWrap.MirrorClampToEdge: return TextureWrapMode.ClampToEdge; case GalTextureWrap.MirrorClampToBorder: return TextureWrapMode.ClampToBorder; @@ -284,37 +284,37 @@ namespace Ryujinx.Graphics.Gal.OpenGL } } - throw new ArgumentException(nameof(Wrap) + " \"" + Wrap + "\" is not valid!"); + throw new ArgumentException(nameof(wrap) + " \"" + wrap + "\" is not valid!"); } public static TextureMinFilter GetTextureMinFilter( - GalTextureFilter MinFilter, - GalTextureMipFilter MipFilter) + GalTextureFilter minFilter, + GalTextureMipFilter mipFilter) { //TODO: Mip (needs mipmap support first). - switch (MinFilter) + switch (minFilter) { case GalTextureFilter.Nearest: return TextureMinFilter.Nearest; case GalTextureFilter.Linear: return TextureMinFilter.Linear; } - throw new ArgumentException(nameof(MinFilter) + " \"" + MinFilter + "\" is not valid!"); + throw new ArgumentException(nameof(minFilter) + " \"" + minFilter + "\" is not valid!"); } - public static TextureMagFilter GetTextureMagFilter(GalTextureFilter Filter) + public static TextureMagFilter GetTextureMagFilter(GalTextureFilter filter) { - switch (Filter) + switch (filter) { case GalTextureFilter.Nearest: return TextureMagFilter.Nearest; case GalTextureFilter.Linear: return TextureMagFilter.Linear; } - throw new ArgumentException(nameof(Filter) + " \"" + Filter + "\" is not valid!"); + throw new ArgumentException(nameof(filter) + " \"" + filter + "\" is not valid!"); } - public static BlendEquationMode GetBlendEquation(GalBlendEquation BlendEquation) + public static BlendEquationMode GetBlendEquation(GalBlendEquation blendEquation) { - switch (BlendEquation) + switch (blendEquation) { case GalBlendEquation.FuncAdd: case GalBlendEquation.FuncAddGl: @@ -337,12 +337,12 @@ namespace Ryujinx.Graphics.Gal.OpenGL return BlendEquationMode.Max; } - throw new ArgumentException(nameof(BlendEquation) + " \"" + BlendEquation + "\" is not valid!"); + throw new ArgumentException(nameof(blendEquation) + " \"" + blendEquation + "\" is not valid!"); } - public static BlendingFactor GetBlendFactor(GalBlendFactor BlendFactor) + public static BlendingFactor GetBlendFactor(GalBlendFactor blendFactor) { - switch (BlendFactor) + switch (blendFactor) { case GalBlendFactor.Zero: case GalBlendFactor.ZeroGl: @@ -421,7 +421,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL return BlendingFactor.ConstantColor; } - throw new ArgumentException(nameof(BlendFactor) + " \"" + BlendFactor + "\" is not valid!"); + throw new ArgumentException(nameof(blendFactor) + " \"" + blendFactor + "\" is not valid!"); } } } diff --git a/Ryujinx.Graphics/Gal/OpenGL/OglExtension.cs b/Ryujinx.Graphics/Gal/OpenGL/OglExtension.cs new file mode 100644 index 00000000..8a1a0510 --- /dev/null +++ b/Ryujinx.Graphics/Gal/OpenGL/OglExtension.cs @@ -0,0 +1,70 @@ +using OpenTK.Graphics.OpenGL; +using Ryujinx.Common.Logging; +using System; + +namespace Ryujinx.Graphics.Gal.OpenGL +{ + static class OglExtension + { + // Private lazy backing variables + private static Lazy<bool> _enhancedLayouts = new Lazy<bool>(() => HasExtension("GL_ARB_enhanced_layouts")); + private static Lazy<bool> _textureMirrorClamp = new Lazy<bool>(() => HasExtension("GL_EXT_texture_mirror_clamp")); + private static Lazy<bool> _viewportArray = new Lazy<bool>(() => HasExtension("GL_ARB_viewport_array")); + + private static Lazy<bool> _nvidiaDriver = new Lazy<bool>(() => IsNvidiaDriver()); + + // Public accessors + public static bool EnhancedLayouts => _enhancedLayouts.Value; + public static bool TextureMirrorClamp => _textureMirrorClamp.Value; + public static bool ViewportArray => _viewportArray.Value; + + public static bool NvidiaDriver => _nvidiaDriver.Value; + + private static bool HasExtension(string name) + { + int numExtensions = GL.GetInteger(GetPName.NumExtensions); + + for (int extension = 0; extension < numExtensions; extension++) + { + if (GL.GetString(StringNameIndexed.Extensions, extension) == name) + { + return true; + } + } + + Logger.PrintInfo(LogClass.Gpu, $"OpenGL extension {name} unavailable. You may experience some performance degradation"); + + return false; + } + + private static bool IsNvidiaDriver() + { + return GL.GetString(StringName.Vendor).Equals("NVIDIA Corporation"); + } + + public static class Required + { + // Public accessors + public static bool EnhancedLayouts => _enhancedLayoutsRequired.Value; + public static bool TextureMirrorClamp => _textureMirrorClampRequired.Value; + public static bool ViewportArray => _viewportArrayRequired.Value; + + // Private lazy backing variables + private static Lazy<bool> _enhancedLayoutsRequired = new Lazy<bool>(() => HasExtensionRequired(OglExtension.EnhancedLayouts, "GL_ARB_enhanced_layouts")); + private static Lazy<bool> _textureMirrorClampRequired = new Lazy<bool>(() => HasExtensionRequired(OglExtension.TextureMirrorClamp, "GL_EXT_texture_mirror_clamp")); + private static Lazy<bool> _viewportArrayRequired = new Lazy<bool>(() => HasExtensionRequired(OglExtension.ViewportArray, "GL_ARB_viewport_array")); + + private static bool HasExtensionRequired(bool value, string name) + { + if (value) + { + return true; + } + + Logger.PrintWarning(LogClass.Gpu, $"Required OpenGL extension {name} unavailable. You may experience some rendering issues"); + + return false; + } + } + } +} diff --git a/Ryujinx.Graphics/Gal/OpenGL/OglLimit.cs b/Ryujinx.Graphics/Gal/OpenGL/OglLimit.cs new file mode 100644 index 00000000..2a227a37 --- /dev/null +++ b/Ryujinx.Graphics/Gal/OpenGL/OglLimit.cs @@ -0,0 +1,12 @@ +using OpenTK.Graphics.OpenGL; +using System; + +namespace Ryujinx.Graphics.Gal.OpenGL +{ + static class OglLimit + { + private static Lazy<int> _sMaxUboSize = new Lazy<int>(() => GL.GetInteger(GetPName.MaxUniformBlockSize)); + + public static int MaxUboSize => _sMaxUboSize.Value; + } +}
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLPipeline.cs b/Ryujinx.Graphics/Gal/OpenGL/OglPipeline.cs index 96d42e02..3c8ada3e 100644 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLPipeline.cs +++ b/Ryujinx.Graphics/Gal/OpenGL/OglPipeline.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; namespace Ryujinx.Graphics.Gal.OpenGL { - class OGLPipeline : IGalPipeline + class OglPipeline : IGalPipeline { - private static Dictionary<GalVertexAttribSize, int> AttribElements = + private static Dictionary<GalVertexAttribSize, int> _attribElements = new Dictionary<GalVertexAttribSize, int>() { { GalVertexAttribSize._32_32_32_32, 4 }, @@ -25,7 +25,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL { GalVertexAttribSize._11_11_10, 3 } }; - private static Dictionary<GalVertexAttribSize, VertexAttribPointerType> FloatAttribTypes = + private static Dictionary<GalVertexAttribSize, VertexAttribPointerType> _floatAttribTypes = new Dictionary<GalVertexAttribSize, VertexAttribPointerType>() { { GalVertexAttribSize._32_32_32_32, VertexAttribPointerType.Float }, @@ -38,7 +38,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL { GalVertexAttribSize._16, VertexAttribPointerType.HalfFloat } }; - private static Dictionary<GalVertexAttribSize, VertexAttribPointerType> SignedAttribTypes = + private static Dictionary<GalVertexAttribSize, VertexAttribPointerType> _signedAttribTypes = new Dictionary<GalVertexAttribSize, VertexAttribPointerType>() { { GalVertexAttribSize._32_32_32_32, VertexAttribPointerType.Int }, @@ -56,7 +56,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL { GalVertexAttribSize._10_10_10_2, VertexAttribPointerType.Int2101010Rev } }; - private static Dictionary<GalVertexAttribSize, VertexAttribPointerType> UnsignedAttribTypes = + private static Dictionary<GalVertexAttribSize, VertexAttribPointerType> _unsignedAttribTypes = new Dictionary<GalVertexAttribSize, VertexAttribPointerType>() { { GalVertexAttribSize._32_32_32_32, VertexAttribPointerType.UnsignedInt }, @@ -75,30 +75,30 @@ namespace Ryujinx.Graphics.Gal.OpenGL { GalVertexAttribSize._11_11_10, VertexAttribPointerType.UnsignedInt10F11F11FRev } }; - private GalPipelineState Old; + private GalPipelineState _old; - private OGLConstBuffer Buffer; - private OGLRenderTarget RenderTarget; - private OGLRasterizer Rasterizer; - private OGLShader Shader; + private OglConstBuffer _buffer; + private OglRenderTarget _renderTarget; + private OglRasterizer _rasterizer; + private OglShader _shader; - private int VaoHandle; + private int _vaoHandle; - public OGLPipeline( - OGLConstBuffer Buffer, - OGLRenderTarget RenderTarget, - OGLRasterizer Rasterizer, - OGLShader Shader) + public OglPipeline( + OglConstBuffer buffer, + OglRenderTarget renderTarget, + OglRasterizer rasterizer, + OglShader shader) { - this.Buffer = Buffer; - this.RenderTarget = RenderTarget; - this.Rasterizer = Rasterizer; - this.Shader = Shader; + _buffer = buffer; + _renderTarget = renderTarget; + _rasterizer = rasterizer; + _shader = shader; //These values match OpenGL's defaults - Old = new GalPipelineState + _old = new GalPipelineState { - FrontFace = GalFrontFace.CCW, + FrontFace = GalFrontFace.Ccw, CullFaceEnabled = false, CullFace = GalCullFace.Back, @@ -133,11 +133,11 @@ namespace Ryujinx.Graphics.Gal.OpenGL PrimitiveRestartIndex = 0 }; - for (int Index = 0; Index < GalPipelineState.RenderTargetsCount; Index++) + for (int index = 0; index < GalPipelineState.RenderTargetsCount; index++) { - Old.Blends[Index] = BlendState.Default; + _old.Blends[index] = BlendState.Default; - Old.ColorMasks[Index] = ColorMaskState.Default; + _old.ColorMasks[index] = ColorMaskState.Default; } } @@ -147,122 +147,122 @@ namespace Ryujinx.Graphics.Gal.OpenGL BindVertexLayout(New); - if (New.FramebufferSrgb != Old.FramebufferSrgb) + if (New.FramebufferSrgb != _old.FramebufferSrgb) { Enable(EnableCap.FramebufferSrgb, New.FramebufferSrgb); - RenderTarget.FramebufferSrgb = New.FramebufferSrgb; + _renderTarget.FramebufferSrgb = New.FramebufferSrgb; } - if (New.FlipX != Old.FlipX || New.FlipY != Old.FlipY || New.Instance != Old.Instance) + if (New.FlipX != _old.FlipX || New.FlipY != _old.FlipY || New.Instance != _old.Instance) { - Shader.SetExtraData(New.FlipX, New.FlipY, New.Instance); + _shader.SetExtraData(New.FlipX, New.FlipY, New.Instance); } - if (New.FrontFace != Old.FrontFace) + if (New.FrontFace != _old.FrontFace) { - GL.FrontFace(OGLEnumConverter.GetFrontFace(New.FrontFace)); + GL.FrontFace(OglEnumConverter.GetFrontFace(New.FrontFace)); } - if (New.CullFaceEnabled != Old.CullFaceEnabled) + if (New.CullFaceEnabled != _old.CullFaceEnabled) { Enable(EnableCap.CullFace, New.CullFaceEnabled); } if (New.CullFaceEnabled) { - if (New.CullFace != Old.CullFace) + if (New.CullFace != _old.CullFace) { - GL.CullFace(OGLEnumConverter.GetCullFace(New.CullFace)); + GL.CullFace(OglEnumConverter.GetCullFace(New.CullFace)); } } - if (New.DepthTestEnabled != Old.DepthTestEnabled) + if (New.DepthTestEnabled != _old.DepthTestEnabled) { Enable(EnableCap.DepthTest, New.DepthTestEnabled); } - if (New.DepthWriteEnabled != Old.DepthWriteEnabled) + if (New.DepthWriteEnabled != _old.DepthWriteEnabled) { GL.DepthMask(New.DepthWriteEnabled); } if (New.DepthTestEnabled) { - if (New.DepthFunc != Old.DepthFunc) + if (New.DepthFunc != _old.DepthFunc) { - GL.DepthFunc(OGLEnumConverter.GetDepthFunc(New.DepthFunc)); + GL.DepthFunc(OglEnumConverter.GetDepthFunc(New.DepthFunc)); } } - if (New.DepthRangeNear != Old.DepthRangeNear || - New.DepthRangeFar != Old.DepthRangeFar) + if (New.DepthRangeNear != _old.DepthRangeNear || + New.DepthRangeFar != _old.DepthRangeFar) { GL.DepthRange(New.DepthRangeNear, New.DepthRangeFar); } - if (New.StencilTestEnabled != Old.StencilTestEnabled) + if (New.StencilTestEnabled != _old.StencilTestEnabled) { Enable(EnableCap.StencilTest, New.StencilTestEnabled); } - if (New.StencilTwoSideEnabled != Old.StencilTwoSideEnabled) + if (New.StencilTwoSideEnabled != _old.StencilTwoSideEnabled) { Enable((EnableCap)All.StencilTestTwoSideExt, New.StencilTwoSideEnabled); } if (New.StencilTestEnabled) { - if (New.StencilBackFuncFunc != Old.StencilBackFuncFunc || - New.StencilBackFuncRef != Old.StencilBackFuncRef || - New.StencilBackFuncMask != Old.StencilBackFuncMask) + if (New.StencilBackFuncFunc != _old.StencilBackFuncFunc || + New.StencilBackFuncRef != _old.StencilBackFuncRef || + New.StencilBackFuncMask != _old.StencilBackFuncMask) { GL.StencilFuncSeparate( StencilFace.Back, - OGLEnumConverter.GetStencilFunc(New.StencilBackFuncFunc), + OglEnumConverter.GetStencilFunc(New.StencilBackFuncFunc), New.StencilBackFuncRef, New.StencilBackFuncMask); } - if (New.StencilBackOpFail != Old.StencilBackOpFail || - New.StencilBackOpZFail != Old.StencilBackOpZFail || - New.StencilBackOpZPass != Old.StencilBackOpZPass) + if (New.StencilBackOpFail != _old.StencilBackOpFail || + New.StencilBackOpZFail != _old.StencilBackOpZFail || + New.StencilBackOpZPass != _old.StencilBackOpZPass) { GL.StencilOpSeparate( StencilFace.Back, - OGLEnumConverter.GetStencilOp(New.StencilBackOpFail), - OGLEnumConverter.GetStencilOp(New.StencilBackOpZFail), - OGLEnumConverter.GetStencilOp(New.StencilBackOpZPass)); + OglEnumConverter.GetStencilOp(New.StencilBackOpFail), + OglEnumConverter.GetStencilOp(New.StencilBackOpZFail), + OglEnumConverter.GetStencilOp(New.StencilBackOpZPass)); } - if (New.StencilBackMask != Old.StencilBackMask) + if (New.StencilBackMask != _old.StencilBackMask) { GL.StencilMaskSeparate(StencilFace.Back, New.StencilBackMask); } - if (New.StencilFrontFuncFunc != Old.StencilFrontFuncFunc || - New.StencilFrontFuncRef != Old.StencilFrontFuncRef || - New.StencilFrontFuncMask != Old.StencilFrontFuncMask) + if (New.StencilFrontFuncFunc != _old.StencilFrontFuncFunc || + New.StencilFrontFuncRef != _old.StencilFrontFuncRef || + New.StencilFrontFuncMask != _old.StencilFrontFuncMask) { GL.StencilFuncSeparate( StencilFace.Front, - OGLEnumConverter.GetStencilFunc(New.StencilFrontFuncFunc), + OglEnumConverter.GetStencilFunc(New.StencilFrontFuncFunc), New.StencilFrontFuncRef, New.StencilFrontFuncMask); } - if (New.StencilFrontOpFail != Old.StencilFrontOpFail || - New.StencilFrontOpZFail != Old.StencilFrontOpZFail || - New.StencilFrontOpZPass != Old.StencilFrontOpZPass) + if (New.StencilFrontOpFail != _old.StencilFrontOpFail || + New.StencilFrontOpZFail != _old.StencilFrontOpZFail || + New.StencilFrontOpZPass != _old.StencilFrontOpZPass) { GL.StencilOpSeparate( StencilFace.Front, - OGLEnumConverter.GetStencilOp(New.StencilFrontOpFail), - OGLEnumConverter.GetStencilOp(New.StencilFrontOpZFail), - OGLEnumConverter.GetStencilOp(New.StencilFrontOpZPass)); + OglEnumConverter.GetStencilOp(New.StencilFrontOpFail), + OglEnumConverter.GetStencilOp(New.StencilFrontOpZFail), + OglEnumConverter.GetStencilOp(New.StencilFrontOpZPass)); } - if (New.StencilFrontMask != Old.StencilFrontMask) + if (New.StencilFrontMask != _old.StencilFrontMask) { GL.StencilMaskSeparate(StencilFace.Front, New.StencilFrontMask); } @@ -277,42 +277,42 @@ namespace Ryujinx.Graphics.Gal.OpenGL int scissorsApplied = 0; bool applyToAll = false; - for (int Index = 0; Index < GalPipelineState.RenderTargetsCount; Index++) + for (int index = 0; index < GalPipelineState.RenderTargetsCount; index++) { - if (New.ScissorTestEnabled[Index]) + if (New.ScissorTestEnabled[index]) { // If viewport arrays are unavailable apply first scissor test to all or // there is only 1 scissor test and it's the first, the scissor test applies to all viewports - if (!OGLExtension.Required.ViewportArray || (Index == 0 && New.ScissorTestCount == 1)) + if (!OglExtension.Required.ViewportArray || (index == 0 && New.ScissorTestCount == 1)) { GL.Enable(EnableCap.ScissorTest); applyToAll = true; } else { - GL.Enable(IndexedEnableCap.ScissorTest, Index); + GL.Enable(IndexedEnableCap.ScissorTest, index); } - if (New.ScissorTestEnabled[Index] != Old.ScissorTestEnabled[Index] || - New.ScissorTestX[Index] != Old.ScissorTestX[Index] || - New.ScissorTestY[Index] != Old.ScissorTestY[Index] || - New.ScissorTestWidth[Index] != Old.ScissorTestWidth[Index] || - New.ScissorTestHeight[Index] != Old.ScissorTestHeight[Index]) + if (New.ScissorTestEnabled[index] != _old.ScissorTestEnabled[index] || + New.ScissorTestX[index] != _old.ScissorTestX[index] || + New.ScissorTestY[index] != _old.ScissorTestY[index] || + New.ScissorTestWidth[index] != _old.ScissorTestWidth[index] || + New.ScissorTestHeight[index] != _old.ScissorTestHeight[index]) { if (applyToAll) { - GL.Scissor(New.ScissorTestX[Index], New.ScissorTestY[Index], - New.ScissorTestWidth[Index], New.ScissorTestHeight[Index]); + GL.Scissor(New.ScissorTestX[index], New.ScissorTestY[index], + New.ScissorTestWidth[index], New.ScissorTestHeight[index]); } else { - GL.ScissorIndexed(Index, New.ScissorTestX[Index], New.ScissorTestY[Index], - New.ScissorTestWidth[Index], New.ScissorTestHeight[Index]); + GL.ScissorIndexed(index, New.ScissorTestX[index], New.ScissorTestY[index], + New.ScissorTestWidth[index], New.ScissorTestHeight[index]); } } - // If all scissor tests have been applied, or viewport arrays are unavailable we can skip remaining itterations - if (!OGLExtension.Required.ViewportArray || ++scissorsApplied == New.ScissorTestCount) + // If all scissor tests have been applied, or viewport arrays are unavailable we can skip remaining iterations + if (!OglExtension.Required.ViewportArray || ++scissorsApplied == New.ScissorTestCount) { break; } @@ -323,26 +323,26 @@ namespace Ryujinx.Graphics.Gal.OpenGL if (New.BlendIndependent) { - for (int Index = 0; Index < GalPipelineState.RenderTargetsCount; Index++) + for (int index = 0; index < GalPipelineState.RenderTargetsCount; index++) { - SetBlendState(Index, New.Blends[Index], Old.Blends[Index]); + SetBlendState(index, New.Blends[index], _old.Blends[index]); } } else { - if (New.BlendIndependent != Old.BlendIndependent) + if (New.BlendIndependent != _old.BlendIndependent) { SetAllBlendState(New.Blends[0]); } else { - SetBlendState(New.Blends[0], Old.Blends[0]); + SetBlendState(New.Blends[0], _old.Blends[0]); } } if (New.ColorMaskCommon) { - if (New.ColorMaskCommon != Old.ColorMaskCommon || !New.ColorMasks[0].Equals(Old.ColorMasks[0])) + if (New.ColorMaskCommon != _old.ColorMaskCommon || !New.ColorMasks[0].Equals(_old.ColorMasks[0])) { GL.ColorMask( New.ColorMasks[0].Red, @@ -353,39 +353,39 @@ namespace Ryujinx.Graphics.Gal.OpenGL } else { - for (int Index = 0; Index < GalPipelineState.RenderTargetsCount; Index++) + for (int index = 0; index < GalPipelineState.RenderTargetsCount; index++) { - if (!New.ColorMasks[Index].Equals(Old.ColorMasks[Index])) + if (!New.ColorMasks[index].Equals(_old.ColorMasks[index])) { GL.ColorMask( - Index, - New.ColorMasks[Index].Red, - New.ColorMasks[Index].Green, - New.ColorMasks[Index].Blue, - New.ColorMasks[Index].Alpha); + index, + New.ColorMasks[index].Red, + New.ColorMasks[index].Green, + New.ColorMasks[index].Blue, + New.ColorMasks[index].Alpha); } } } - if (New.PrimitiveRestartEnabled != Old.PrimitiveRestartEnabled) + if (New.PrimitiveRestartEnabled != _old.PrimitiveRestartEnabled) { Enable(EnableCap.PrimitiveRestart, New.PrimitiveRestartEnabled); } if (New.PrimitiveRestartEnabled) { - if (New.PrimitiveRestartIndex != Old.PrimitiveRestartIndex) + if (New.PrimitiveRestartIndex != _old.PrimitiveRestartIndex) { GL.PrimitiveRestartIndex(New.PrimitiveRestartIndex); } } - Old = New; + _old = New; } - public void Unbind(GalPipelineState State) + public void Unbind(GalPipelineState state) { - if (State.ScissorTestCount > 0) + if (state.ScissorTestCount > 0) { GL.Disable(EnableCap.ScissorTest); } @@ -400,29 +400,29 @@ namespace Ryujinx.Graphics.Gal.OpenGL if (New.SeparateAlpha) { GL.BlendEquationSeparate( - OGLEnumConverter.GetBlendEquation(New.EquationRgb), - OGLEnumConverter.GetBlendEquation(New.EquationAlpha)); + OglEnumConverter.GetBlendEquation(New.EquationRgb), + OglEnumConverter.GetBlendEquation(New.EquationAlpha)); GL.BlendFuncSeparate( - (BlendingFactorSrc) OGLEnumConverter.GetBlendFactor(New.FuncSrcRgb), - (BlendingFactorDest)OGLEnumConverter.GetBlendFactor(New.FuncDstRgb), - (BlendingFactorSrc) OGLEnumConverter.GetBlendFactor(New.FuncSrcAlpha), - (BlendingFactorDest)OGLEnumConverter.GetBlendFactor(New.FuncDstAlpha)); + (BlendingFactorSrc) OglEnumConverter.GetBlendFactor(New.FuncSrcRgb), + (BlendingFactorDest)OglEnumConverter.GetBlendFactor(New.FuncDstRgb), + (BlendingFactorSrc) OglEnumConverter.GetBlendFactor(New.FuncSrcAlpha), + (BlendingFactorDest)OglEnumConverter.GetBlendFactor(New.FuncDstAlpha)); } else { - GL.BlendEquation(OGLEnumConverter.GetBlendEquation(New.EquationRgb)); + GL.BlendEquation(OglEnumConverter.GetBlendEquation(New.EquationRgb)); GL.BlendFunc( - OGLEnumConverter.GetBlendFactor(New.FuncSrcRgb), - OGLEnumConverter.GetBlendFactor(New.FuncDstRgb)); + OglEnumConverter.GetBlendFactor(New.FuncSrcRgb), + OglEnumConverter.GetBlendFactor(New.FuncDstRgb)); } } } - private void SetBlendState(BlendState New, BlendState Old) + private void SetBlendState(BlendState New, BlendState old) { - if (New.Enabled != Old.Enabled) + if (New.Enabled != old.Enabled) { Enable(EnableCap.Blend, New.Enabled); } @@ -431,91 +431,91 @@ namespace Ryujinx.Graphics.Gal.OpenGL { if (New.SeparateAlpha) { - if (New.EquationRgb != Old.EquationRgb || - New.EquationAlpha != Old.EquationAlpha) + if (New.EquationRgb != old.EquationRgb || + New.EquationAlpha != old.EquationAlpha) { GL.BlendEquationSeparate( - OGLEnumConverter.GetBlendEquation(New.EquationRgb), - OGLEnumConverter.GetBlendEquation(New.EquationAlpha)); + OglEnumConverter.GetBlendEquation(New.EquationRgb), + OglEnumConverter.GetBlendEquation(New.EquationAlpha)); } - if (New.FuncSrcRgb != Old.FuncSrcRgb || - New.FuncDstRgb != Old.FuncDstRgb || - New.FuncSrcAlpha != Old.FuncSrcAlpha || - New.FuncDstAlpha != Old.FuncDstAlpha) + if (New.FuncSrcRgb != old.FuncSrcRgb || + New.FuncDstRgb != old.FuncDstRgb || + New.FuncSrcAlpha != old.FuncSrcAlpha || + New.FuncDstAlpha != old.FuncDstAlpha) { GL.BlendFuncSeparate( - (BlendingFactorSrc) OGLEnumConverter.GetBlendFactor(New.FuncSrcRgb), - (BlendingFactorDest)OGLEnumConverter.GetBlendFactor(New.FuncDstRgb), - (BlendingFactorSrc) OGLEnumConverter.GetBlendFactor(New.FuncSrcAlpha), - (BlendingFactorDest)OGLEnumConverter.GetBlendFactor(New.FuncDstAlpha)); + (BlendingFactorSrc) OglEnumConverter.GetBlendFactor(New.FuncSrcRgb), + (BlendingFactorDest)OglEnumConverter.GetBlendFactor(New.FuncDstRgb), + (BlendingFactorSrc) OglEnumConverter.GetBlendFactor(New.FuncSrcAlpha), + (BlendingFactorDest)OglEnumConverter.GetBlendFactor(New.FuncDstAlpha)); } } else { - if (New.EquationRgb != Old.EquationRgb) + if (New.EquationRgb != old.EquationRgb) { - GL.BlendEquation(OGLEnumConverter.GetBlendEquation(New.EquationRgb)); + GL.BlendEquation(OglEnumConverter.GetBlendEquation(New.EquationRgb)); } - if (New.FuncSrcRgb != Old.FuncSrcRgb || - New.FuncDstRgb != Old.FuncDstRgb) + if (New.FuncSrcRgb != old.FuncSrcRgb || + New.FuncDstRgb != old.FuncDstRgb) { GL.BlendFunc( - OGLEnumConverter.GetBlendFactor(New.FuncSrcRgb), - OGLEnumConverter.GetBlendFactor(New.FuncDstRgb)); + OglEnumConverter.GetBlendFactor(New.FuncSrcRgb), + OglEnumConverter.GetBlendFactor(New.FuncDstRgb)); } } } } - private void SetBlendState(int Index, BlendState New, BlendState Old) + private void SetBlendState(int index, BlendState New, BlendState old) { - if (New.Enabled != Old.Enabled) + if (New.Enabled != old.Enabled) { - Enable(IndexedEnableCap.Blend, Index, New.Enabled); + Enable(IndexedEnableCap.Blend, index, New.Enabled); } if (New.Enabled) { if (New.SeparateAlpha) { - if (New.EquationRgb != Old.EquationRgb || - New.EquationAlpha != Old.EquationAlpha) + if (New.EquationRgb != old.EquationRgb || + New.EquationAlpha != old.EquationAlpha) { GL.BlendEquationSeparate( - Index, - OGLEnumConverter.GetBlendEquation(New.EquationRgb), - OGLEnumConverter.GetBlendEquation(New.EquationAlpha)); + index, + OglEnumConverter.GetBlendEquation(New.EquationRgb), + OglEnumConverter.GetBlendEquation(New.EquationAlpha)); } - if (New.FuncSrcRgb != Old.FuncSrcRgb || - New.FuncDstRgb != Old.FuncDstRgb || - New.FuncSrcAlpha != Old.FuncSrcAlpha || - New.FuncDstAlpha != Old.FuncDstAlpha) + if (New.FuncSrcRgb != old.FuncSrcRgb || + New.FuncDstRgb != old.FuncDstRgb || + New.FuncSrcAlpha != old.FuncSrcAlpha || + New.FuncDstAlpha != old.FuncDstAlpha) { GL.BlendFuncSeparate( - Index, - (BlendingFactorSrc) OGLEnumConverter.GetBlendFactor(New.FuncSrcRgb), - (BlendingFactorDest)OGLEnumConverter.GetBlendFactor(New.FuncDstRgb), - (BlendingFactorSrc) OGLEnumConverter.GetBlendFactor(New.FuncSrcAlpha), - (BlendingFactorDest)OGLEnumConverter.GetBlendFactor(New.FuncDstAlpha)); + index, + (BlendingFactorSrc) OglEnumConverter.GetBlendFactor(New.FuncSrcRgb), + (BlendingFactorDest)OglEnumConverter.GetBlendFactor(New.FuncDstRgb), + (BlendingFactorSrc) OglEnumConverter.GetBlendFactor(New.FuncSrcAlpha), + (BlendingFactorDest)OglEnumConverter.GetBlendFactor(New.FuncDstAlpha)); } } else { - if (New.EquationRgb != Old.EquationRgb) + if (New.EquationRgb != old.EquationRgb) { - GL.BlendEquation(Index, OGLEnumConverter.GetBlendEquation(New.EquationRgb)); + GL.BlendEquation(index, OglEnumConverter.GetBlendEquation(New.EquationRgb)); } - if (New.FuncSrcRgb != Old.FuncSrcRgb || - New.FuncDstRgb != Old.FuncDstRgb) + if (New.FuncSrcRgb != old.FuncSrcRgb || + New.FuncDstRgb != old.FuncDstRgb) { GL.BlendFunc( - Index, - (BlendingFactorSrc) OGLEnumConverter.GetBlendFactor(New.FuncSrcRgb), - (BlendingFactorDest)OGLEnumConverter.GetBlendFactor(New.FuncDstRgb)); + index, + (BlendingFactorSrc) OglEnumConverter.GetBlendFactor(New.FuncSrcRgb), + (BlendingFactorDest)OglEnumConverter.GetBlendFactor(New.FuncDstRgb)); } } } @@ -523,310 +523,310 @@ namespace Ryujinx.Graphics.Gal.OpenGL private void BindConstBuffers(GalPipelineState New) { - int FreeBinding = OGLShader.ReservedCbufCount; + int freeBinding = OglShader.ReservedCbufCount; - void BindIfNotNull(OGLShaderStage Stage) + void BindIfNotNull(OglShaderStage stage) { - if (Stage != null) + if (stage != null) { - foreach (ShaderDeclInfo DeclInfo in Stage.ConstBufferUsage) + foreach (ShaderDeclInfo declInfo in stage.ConstBufferUsage) { - long Key = New.ConstBufferKeys[(int)Stage.Type][DeclInfo.Cbuf]; + long key = New.ConstBufferKeys[(int)stage.Type][declInfo.Cbuf]; - if (Key != 0 && Buffer.TryGetUbo(Key, out int UboHandle)) + if (key != 0 && _buffer.TryGetUbo(key, out int uboHandle)) { - GL.BindBufferBase(BufferRangeTarget.UniformBuffer, FreeBinding, UboHandle); + GL.BindBufferBase(BufferRangeTarget.UniformBuffer, freeBinding, uboHandle); } - FreeBinding++; + freeBinding++; } } } - BindIfNotNull(Shader.Current.Vertex); - BindIfNotNull(Shader.Current.TessControl); - BindIfNotNull(Shader.Current.TessEvaluation); - BindIfNotNull(Shader.Current.Geometry); - BindIfNotNull(Shader.Current.Fragment); + BindIfNotNull(_shader.Current.Vertex); + BindIfNotNull(_shader.Current.TessControl); + BindIfNotNull(_shader.Current.TessEvaluation); + BindIfNotNull(_shader.Current.Geometry); + BindIfNotNull(_shader.Current.Fragment); } private void BindVertexLayout(GalPipelineState New) { - foreach (GalVertexBinding Binding in New.VertexBindings) + foreach (GalVertexBinding binding in New.VertexBindings) { - if (!Binding.Enabled || !Rasterizer.TryGetVbo(Binding.VboKey, out int VboHandle)) + if (!binding.Enabled || !_rasterizer.TryGetVbo(binding.VboKey, out int vboHandle)) { continue; } - if (VaoHandle == 0) + if (_vaoHandle == 0) { - VaoHandle = GL.GenVertexArray(); + _vaoHandle = GL.GenVertexArray(); //Vertex arrays shouldn't be used anywhere else in OpenGL's backend //if you want to use it, move this line out of the if - GL.BindVertexArray(VaoHandle); + GL.BindVertexArray(_vaoHandle); } - foreach (GalVertexAttrib Attrib in Binding.Attribs) + foreach (GalVertexAttrib attrib in binding.Attribs) { //Skip uninitialized attributes. - if (Attrib.Size == 0) + if (attrib.Size == 0) { continue; } - GL.BindBuffer(BufferTarget.ArrayBuffer, VboHandle); + GL.BindBuffer(BufferTarget.ArrayBuffer, vboHandle); - bool Unsigned = - Attrib.Type == GalVertexAttribType.Unorm || - Attrib.Type == GalVertexAttribType.Uint || - Attrib.Type == GalVertexAttribType.Uscaled; + bool unsigned = + attrib.Type == GalVertexAttribType.Unorm || + attrib.Type == GalVertexAttribType.Uint || + attrib.Type == GalVertexAttribType.Uscaled; - bool Normalize = - Attrib.Type == GalVertexAttribType.Snorm || - Attrib.Type == GalVertexAttribType.Unorm; + bool normalize = + attrib.Type == GalVertexAttribType.Snorm || + attrib.Type == GalVertexAttribType.Unorm; - VertexAttribPointerType Type = 0; + VertexAttribPointerType type = 0; - if (Attrib.Type == GalVertexAttribType.Float) + if (attrib.Type == GalVertexAttribType.Float) { - Type = GetType(FloatAttribTypes, Attrib); + type = GetType(_floatAttribTypes, attrib); } else { - if (Unsigned) + if (unsigned) { - Type = GetType(UnsignedAttribTypes, Attrib); + type = GetType(_unsignedAttribTypes, attrib); } else { - Type = GetType(SignedAttribTypes, Attrib); + type = GetType(_signedAttribTypes, attrib); } } - if (!AttribElements.TryGetValue(Attrib.Size, out int Size)) + if (!_attribElements.TryGetValue(attrib.Size, out int size)) { - throw new InvalidOperationException("Invalid attribute size \"" + Attrib.Size + "\"!"); + throw new InvalidOperationException("Invalid attribute size \"" + attrib.Size + "\"!"); } - int Offset = Attrib.Offset; + int offset = attrib.Offset; - if (Binding.Stride != 0) + if (binding.Stride != 0) { - GL.EnableVertexAttribArray(Attrib.Index); + GL.EnableVertexAttribArray(attrib.Index); - if (Attrib.Type == GalVertexAttribType.Sint || - Attrib.Type == GalVertexAttribType.Uint) + if (attrib.Type == GalVertexAttribType.Sint || + attrib.Type == GalVertexAttribType.Uint) { - IntPtr Pointer = new IntPtr(Offset); + IntPtr pointer = new IntPtr(offset); - VertexAttribIntegerType IType = (VertexAttribIntegerType)Type; + VertexAttribIntegerType iType = (VertexAttribIntegerType)type; - GL.VertexAttribIPointer(Attrib.Index, Size, IType, Binding.Stride, Pointer); + GL.VertexAttribIPointer(attrib.Index, size, iType, binding.Stride, pointer); } else { - GL.VertexAttribPointer(Attrib.Index, Size, Type, Normalize, Binding.Stride, Offset); + GL.VertexAttribPointer(attrib.Index, size, type, normalize, binding.Stride, offset); } } else { - GL.DisableVertexAttribArray(Attrib.Index); + GL.DisableVertexAttribArray(attrib.Index); - SetConstAttrib(Attrib); + SetConstAttrib(attrib); } - if (Binding.Instanced && Binding.Divisor != 0) + if (binding.Instanced && binding.Divisor != 0) { - GL.VertexAttribDivisor(Attrib.Index, 1); + GL.VertexAttribDivisor(attrib.Index, 1); } else { - GL.VertexAttribDivisor(Attrib.Index, 0); + GL.VertexAttribDivisor(attrib.Index, 0); } } } } - private static VertexAttribPointerType GetType(Dictionary<GalVertexAttribSize, VertexAttribPointerType> Dict, GalVertexAttrib Attrib) + private static VertexAttribPointerType GetType(Dictionary<GalVertexAttribSize, VertexAttribPointerType> dict, GalVertexAttrib attrib) { - if (!Dict.TryGetValue(Attrib.Size, out VertexAttribPointerType Type)) + if (!dict.TryGetValue(attrib.Size, out VertexAttribPointerType type)) { - ThrowUnsupportedAttrib(Attrib); + ThrowUnsupportedAttrib(attrib); } - return Type; + return type; } - private unsafe static void SetConstAttrib(GalVertexAttrib Attrib) + private static unsafe void SetConstAttrib(GalVertexAttrib attrib) { - if (Attrib.Size == GalVertexAttribSize._10_10_10_2 || - Attrib.Size == GalVertexAttribSize._11_11_10) + if (attrib.Size == GalVertexAttribSize._10_10_10_2 || + attrib.Size == GalVertexAttribSize._11_11_10) { - ThrowUnsupportedAttrib(Attrib); + ThrowUnsupportedAttrib(attrib); } - fixed (byte* Ptr = Attrib.Data) + fixed (byte* ptr = attrib.Data) { - if (Attrib.Type == GalVertexAttribType.Unorm) + if (attrib.Type == GalVertexAttribType.Unorm) { - switch (Attrib.Size) + switch (attrib.Size) { case GalVertexAttribSize._8: case GalVertexAttribSize._8_8: case GalVertexAttribSize._8_8_8: case GalVertexAttribSize._8_8_8_8: - GL.VertexAttrib4N((uint)Attrib.Index, Ptr); + GL.VertexAttrib4N((uint)attrib.Index, ptr); break; case GalVertexAttribSize._16: case GalVertexAttribSize._16_16: case GalVertexAttribSize._16_16_16: case GalVertexAttribSize._16_16_16_16: - GL.VertexAttrib4N((uint)Attrib.Index, (ushort*)Ptr); + GL.VertexAttrib4N((uint)attrib.Index, (ushort*)ptr); break; case GalVertexAttribSize._32: case GalVertexAttribSize._32_32: case GalVertexAttribSize._32_32_32: case GalVertexAttribSize._32_32_32_32: - GL.VertexAttrib4N((uint)Attrib.Index, (uint*)Ptr); + GL.VertexAttrib4N((uint)attrib.Index, (uint*)ptr); break; } } - else if (Attrib.Type == GalVertexAttribType.Snorm) + else if (attrib.Type == GalVertexAttribType.Snorm) { - switch (Attrib.Size) + switch (attrib.Size) { case GalVertexAttribSize._8: case GalVertexAttribSize._8_8: case GalVertexAttribSize._8_8_8: case GalVertexAttribSize._8_8_8_8: - GL.VertexAttrib4N((uint)Attrib.Index, (sbyte*)Ptr); + GL.VertexAttrib4N((uint)attrib.Index, (sbyte*)ptr); break; case GalVertexAttribSize._16: case GalVertexAttribSize._16_16: case GalVertexAttribSize._16_16_16: case GalVertexAttribSize._16_16_16_16: - GL.VertexAttrib4N((uint)Attrib.Index, (short*)Ptr); + GL.VertexAttrib4N((uint)attrib.Index, (short*)ptr); break; case GalVertexAttribSize._32: case GalVertexAttribSize._32_32: case GalVertexAttribSize._32_32_32: case GalVertexAttribSize._32_32_32_32: - GL.VertexAttrib4N((uint)Attrib.Index, (int*)Ptr); + GL.VertexAttrib4N((uint)attrib.Index, (int*)ptr); break; } } - else if (Attrib.Type == GalVertexAttribType.Uint) + else if (attrib.Type == GalVertexAttribType.Uint) { - switch (Attrib.Size) + switch (attrib.Size) { case GalVertexAttribSize._8: case GalVertexAttribSize._8_8: case GalVertexAttribSize._8_8_8: case GalVertexAttribSize._8_8_8_8: - GL.VertexAttribI4((uint)Attrib.Index, Ptr); + GL.VertexAttribI4((uint)attrib.Index, ptr); break; case GalVertexAttribSize._16: case GalVertexAttribSize._16_16: case GalVertexAttribSize._16_16_16: case GalVertexAttribSize._16_16_16_16: - GL.VertexAttribI4((uint)Attrib.Index, (ushort*)Ptr); + GL.VertexAttribI4((uint)attrib.Index, (ushort*)ptr); break; case GalVertexAttribSize._32: case GalVertexAttribSize._32_32: case GalVertexAttribSize._32_32_32: case GalVertexAttribSize._32_32_32_32: - GL.VertexAttribI4((uint)Attrib.Index, (uint*)Ptr); + GL.VertexAttribI4((uint)attrib.Index, (uint*)ptr); break; } } - else if (Attrib.Type == GalVertexAttribType.Sint) + else if (attrib.Type == GalVertexAttribType.Sint) { - switch (Attrib.Size) + switch (attrib.Size) { case GalVertexAttribSize._8: case GalVertexAttribSize._8_8: case GalVertexAttribSize._8_8_8: case GalVertexAttribSize._8_8_8_8: - GL.VertexAttribI4((uint)Attrib.Index, (sbyte*)Ptr); + GL.VertexAttribI4((uint)attrib.Index, (sbyte*)ptr); break; case GalVertexAttribSize._16: case GalVertexAttribSize._16_16: case GalVertexAttribSize._16_16_16: case GalVertexAttribSize._16_16_16_16: - GL.VertexAttribI4((uint)Attrib.Index, (short*)Ptr); + GL.VertexAttribI4((uint)attrib.Index, (short*)ptr); break; case GalVertexAttribSize._32: case GalVertexAttribSize._32_32: case GalVertexAttribSize._32_32_32: case GalVertexAttribSize._32_32_32_32: - GL.VertexAttribI4((uint)Attrib.Index, (int*)Ptr); + GL.VertexAttribI4((uint)attrib.Index, (int*)ptr); break; } } - else if (Attrib.Type == GalVertexAttribType.Float) + else if (attrib.Type == GalVertexAttribType.Float) { - switch (Attrib.Size) + switch (attrib.Size) { case GalVertexAttribSize._32: case GalVertexAttribSize._32_32: case GalVertexAttribSize._32_32_32: case GalVertexAttribSize._32_32_32_32: - GL.VertexAttrib4(Attrib.Index, (float*)Ptr); + GL.VertexAttrib4(attrib.Index, (float*)ptr); break; - default: ThrowUnsupportedAttrib(Attrib); break; + default: ThrowUnsupportedAttrib(attrib); break; } } } } - private static void ThrowUnsupportedAttrib(GalVertexAttrib Attrib) + private static void ThrowUnsupportedAttrib(GalVertexAttrib attrib) { - throw new NotImplementedException("Unsupported size \"" + Attrib.Size + "\" on type \"" + Attrib.Type + "\"!"); + throw new NotImplementedException("Unsupported size \"" + attrib.Size + "\" on type \"" + attrib.Type + "\"!"); } - private void Enable(EnableCap Cap, bool Enabled) + private void Enable(EnableCap cap, bool enabled) { - if (Enabled) + if (enabled) { - GL.Enable(Cap); + GL.Enable(cap); } else { - GL.Disable(Cap); + GL.Disable(cap); } } - private void Enable(IndexedEnableCap Cap, int Index, bool Enabled) + private void Enable(IndexedEnableCap cap, int index, bool enabled) { - if (Enabled) + if (enabled) { - GL.Enable(Cap, Index); + GL.Enable(cap, index); } else { - GL.Disable(Cap, Index); + GL.Disable(cap, index); } } public void ResetDepthMask() { - Old.DepthWriteEnabled = true; + _old.DepthWriteEnabled = true; } - public void ResetColorMask(int Index) + public void ResetColorMask(int index) { - Old.ColorMasks[Index] = ColorMaskState.Default; + _old.ColorMasks[index] = ColorMaskState.Default; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/OpenGL/OglRasterizer.cs b/Ryujinx.Graphics/Gal/OpenGL/OglRasterizer.cs new file mode 100644 index 00000000..c19911c5 --- /dev/null +++ b/Ryujinx.Graphics/Gal/OpenGL/OglRasterizer.cs @@ -0,0 +1,207 @@ +using OpenTK.Graphics.OpenGL; +using System; + +namespace Ryujinx.Graphics.Gal.OpenGL +{ + class OglRasterizer : IGalRasterizer + { + private const long MaxVertexBufferCacheSize = 128 * 1024 * 1024; + private const long MaxIndexBufferCacheSize = 64 * 1024 * 1024; + + private int[] _vertexBuffers; + + private OglCachedResource<int> _vboCache; + private OglCachedResource<int> _iboCache; + + private struct IbInfo + { + public int Count; + public int ElemSizeLog2; + + public DrawElementsType Type; + } + + private IbInfo _indexBuffer; + + public OglRasterizer() + { + _vertexBuffers = new int[32]; + + _vboCache = new OglCachedResource<int>(GL.DeleteBuffer, MaxVertexBufferCacheSize); + _iboCache = new OglCachedResource<int>(GL.DeleteBuffer, MaxIndexBufferCacheSize); + + _indexBuffer = new IbInfo(); + } + + public void LockCaches() + { + _vboCache.Lock(); + _iboCache.Lock(); + } + + public void UnlockCaches() + { + _vboCache.Unlock(); + _iboCache.Unlock(); + } + + public void ClearBuffers( + GalClearBufferFlags flags, + int attachment, + float red, + float green, + float blue, + float alpha, + float depth, + int stencil) + { + GL.ColorMask( + attachment, + flags.HasFlag(GalClearBufferFlags.ColorRed), + flags.HasFlag(GalClearBufferFlags.ColorGreen), + flags.HasFlag(GalClearBufferFlags.ColorBlue), + flags.HasFlag(GalClearBufferFlags.ColorAlpha)); + + GL.ClearBuffer(ClearBuffer.Color, attachment, new float[] { red, green, blue, alpha }); + + GL.ColorMask(attachment, true, true, true, true); + GL.DepthMask(true); + + if (flags.HasFlag(GalClearBufferFlags.Depth)) + { + GL.ClearBuffer(ClearBuffer.Depth, 0, ref depth); + } + + if (flags.HasFlag(GalClearBufferFlags.Stencil)) + { + GL.ClearBuffer(ClearBuffer.Stencil, 0, ref stencil); + } + } + + public bool IsVboCached(long key, long dataSize) + { + return _vboCache.TryGetSize(key, out long size) && size == dataSize; + } + + public bool IsIboCached(long key, long dataSize) + { + return _iboCache.TryGetSize(key, out long size) && size == dataSize; + } + + public void CreateVbo(long key, int dataSize, IntPtr hostAddress) + { + int handle = GL.GenBuffer(); + + _vboCache.AddOrUpdate(key, handle, dataSize); + + IntPtr length = new IntPtr(dataSize); + + GL.BindBuffer(BufferTarget.ArrayBuffer, handle); + GL.BufferData(BufferTarget.ArrayBuffer, length, hostAddress, BufferUsageHint.StreamDraw); + } + + public void CreateVbo(long key, byte[] data) + { + int handle = GL.GenBuffer(); + + _vboCache.AddOrUpdate(key, handle, data.Length); + + IntPtr length = new IntPtr(data.Length); + + GL.BindBuffer(BufferTarget.ArrayBuffer, handle); + GL.BufferData(BufferTarget.ArrayBuffer, length, data, BufferUsageHint.StreamDraw); + } + + public void CreateIbo(long key, int dataSize, IntPtr hostAddress) + { + int handle = GL.GenBuffer(); + + _iboCache.AddOrUpdate(key, handle, (uint)dataSize); + + IntPtr length = new IntPtr(dataSize); + + GL.BindBuffer(BufferTarget.ElementArrayBuffer, handle); + GL.BufferData(BufferTarget.ElementArrayBuffer, length, hostAddress, BufferUsageHint.StreamDraw); + } + + public void CreateIbo(long key, int dataSize, byte[] buffer) + { + int handle = GL.GenBuffer(); + + _iboCache.AddOrUpdate(key, handle, dataSize); + + IntPtr length = new IntPtr(buffer.Length); + + GL.BindBuffer(BufferTarget.ElementArrayBuffer, handle); + GL.BufferData(BufferTarget.ElementArrayBuffer, length, buffer, BufferUsageHint.StreamDraw); + } + + public void SetIndexArray(int size, GalIndexFormat format) + { + _indexBuffer.Type = OglEnumConverter.GetDrawElementsType(format); + + _indexBuffer.Count = size >> (int)format; + + _indexBuffer.ElemSizeLog2 = (int)format; + } + + public void DrawArrays(int first, int count, GalPrimitiveType primType) + { + if (count == 0) + { + return; + } + + if (primType == GalPrimitiveType.Quads) + { + for (int offset = 0; offset < count; offset += 4) + { + GL.DrawArrays(PrimitiveType.TriangleFan, first + offset, 4); + } + } + else if (primType == GalPrimitiveType.QuadStrip) + { + GL.DrawArrays(PrimitiveType.TriangleFan, first, 4); + + for (int offset = 2; offset < count; offset += 2) + { + GL.DrawArrays(PrimitiveType.TriangleFan, first + offset, 4); + } + } + else + { + GL.DrawArrays(OglEnumConverter.GetPrimitiveType(primType), first, count); + } + } + + public void DrawElements(long iboKey, int first, int vertexBase, GalPrimitiveType primType) + { + if (!_iboCache.TryGetValue(iboKey, out int iboHandle)) + { + return; + } + + PrimitiveType mode = OglEnumConverter.GetPrimitiveType(primType); + + GL.BindBuffer(BufferTarget.ElementArrayBuffer, iboHandle); + + first <<= _indexBuffer.ElemSizeLog2; + + if (vertexBase != 0) + { + IntPtr indices = new IntPtr(first); + + GL.DrawElementsBaseVertex(mode, _indexBuffer.Count, _indexBuffer.Type, indices, vertexBase); + } + else + { + GL.DrawElements(mode, _indexBuffer.Count, _indexBuffer.Type, first); + } + } + + public bool TryGetVbo(long vboKey, out int vboHandle) + { + return _vboCache.TryGetValue(vboKey, out vboHandle); + } + } +}
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/OpenGL/OglRenderTarget.cs b/Ryujinx.Graphics/Gal/OpenGL/OglRenderTarget.cs new file mode 100644 index 00000000..d36bac1b --- /dev/null +++ b/Ryujinx.Graphics/Gal/OpenGL/OglRenderTarget.cs @@ -0,0 +1,549 @@ +using OpenTK.Graphics.OpenGL; +using Ryujinx.Graphics.Texture; +using System; + +namespace Ryujinx.Graphics.Gal.OpenGL +{ + class OglRenderTarget : IGalRenderTarget + { + private const int NativeWidth = 1280; + private const int NativeHeight = 720; + + private const int RenderTargetsCount = GalPipelineState.RenderTargetsCount; + + private struct Rect + { + public int X { get; private set; } + public int Y { get; private set; } + public int Width { get; private set; } + public int Height { get; private set; } + + public Rect(int x, int y, int width, int height) + { + X = x; + Y = y; + Width = width; + Height = height; + } + } + + private class FrameBufferAttachments + { + public int MapCount { get; set; } + + public DrawBuffersEnum[] Map { get; private set; } + + public long[] Colors { get; private set; } + + public long Zeta { get; set; } + + public FrameBufferAttachments() + { + Colors = new long[RenderTargetsCount]; + + Map = new DrawBuffersEnum[RenderTargetsCount]; + } + + public void Update(FrameBufferAttachments source) + { + for (int index = 0; index < RenderTargetsCount; index++) + { + Map[index] = source.Map[index]; + + Colors[index] = source.Colors[index]; + } + + MapCount = source.MapCount; + Zeta = source.Zeta; + } + } + + private int[] _colorHandles; + private int _zetaHandle; + + private OglTexture _texture; + + private ImageHandler _readTex; + + private Rect _window; + + private float[] _viewports; + + private bool _flipX; + private bool _flipY; + + private int _cropTop; + private int _cropLeft; + private int _cropRight; + private int _cropBottom; + + //This framebuffer is used to attach guest rendertargets, + //think of it as a dummy OpenGL VAO + private int _dummyFrameBuffer; + + //These framebuffers are used to blit images + private int _srcFb; + private int _dstFb; + + private FrameBufferAttachments _attachments; + private FrameBufferAttachments _oldAttachments; + + private int _copyPbo; + + public bool FramebufferSrgb { get; set; } + + public OglRenderTarget(OglTexture texture) + { + _attachments = new FrameBufferAttachments(); + + _oldAttachments = new FrameBufferAttachments(); + + _colorHandles = new int[RenderTargetsCount]; + + _viewports = new float[RenderTargetsCount * 4]; + + _texture = texture; + + texture.TextureDeleted += TextureDeletionHandler; + } + + private void TextureDeletionHandler(object sender, int handle) + { + //Texture was deleted, the handle is no longer valid, so + //reset all uses of this handle on a render target. + for (int attachment = 0; attachment < RenderTargetsCount; attachment++) + { + if (_colorHandles[attachment] == handle) + { + _colorHandles[attachment] = 0; + } + } + + if (_zetaHandle == handle) + { + _zetaHandle = 0; + } + } + + public void Bind() + { + if (_dummyFrameBuffer == 0) + { + _dummyFrameBuffer = GL.GenFramebuffer(); + } + + GL.BindFramebuffer(FramebufferTarget.DrawFramebuffer, _dummyFrameBuffer); + + ImageHandler cachedImage; + + for (int attachment = 0; attachment < RenderTargetsCount; attachment++) + { + long key = _attachments.Colors[attachment]; + + int handle = 0; + + if (key != 0 && _texture.TryGetImageHandler(key, out cachedImage)) + { + handle = cachedImage.Handle; + } + + if (handle == _colorHandles[attachment]) + { + continue; + } + + GL.FramebufferTexture( + FramebufferTarget.DrawFramebuffer, + FramebufferAttachment.ColorAttachment0 + attachment, + handle, + 0); + + _colorHandles[attachment] = handle; + } + + if (_attachments.Zeta != 0 && _texture.TryGetImageHandler(_attachments.Zeta, out cachedImage)) + { + if (cachedImage.Handle != _zetaHandle) + { + if (cachedImage.HasDepth && cachedImage.HasStencil) + { + GL.FramebufferTexture( + FramebufferTarget.DrawFramebuffer, + FramebufferAttachment.DepthStencilAttachment, + cachedImage.Handle, + 0); + } + else if (cachedImage.HasDepth) + { + GL.FramebufferTexture( + FramebufferTarget.DrawFramebuffer, + FramebufferAttachment.DepthAttachment, + cachedImage.Handle, + 0); + + GL.FramebufferTexture( + FramebufferTarget.DrawFramebuffer, + FramebufferAttachment.StencilAttachment, + 0, + 0); + } + else + { + throw new InvalidOperationException("Invalid image format \"" + cachedImage.Format + "\" used as Zeta!"); + } + + _zetaHandle = cachedImage.Handle; + } + } + else if (_zetaHandle != 0) + { + GL.FramebufferTexture( + FramebufferTarget.DrawFramebuffer, + FramebufferAttachment.DepthStencilAttachment, + 0, + 0); + + _zetaHandle = 0; + } + + if (OglExtension.ViewportArray) + { + GL.ViewportArray(0, RenderTargetsCount, _viewports); + } + else + { + GL.Viewport( + (int)_viewports[0], + (int)_viewports[1], + (int)_viewports[2], + (int)_viewports[3]); + } + + if (_attachments.MapCount > 1) + { + GL.DrawBuffers(_attachments.MapCount, _attachments.Map); + } + else if (_attachments.MapCount == 1) + { + GL.DrawBuffer((DrawBufferMode)_attachments.Map[0]); + } + else + { + GL.DrawBuffer(DrawBufferMode.None); + } + + _oldAttachments.Update(_attachments); + } + + public void BindColor(long key, int attachment) + { + _attachments.Colors[attachment] = key; + } + + public void UnbindColor(int attachment) + { + _attachments.Colors[attachment] = 0; + } + + public void BindZeta(long key) + { + _attachments.Zeta = key; + } + + public void UnbindZeta() + { + _attachments.Zeta = 0; + } + + public void Present(long key) + { + _texture.TryGetImageHandler(key, out _readTex); + } + + public void SetMap(int[] map) + { + if (map != null) + { + _attachments.MapCount = map.Length; + + for (int attachment = 0; attachment < _attachments.MapCount; attachment++) + { + _attachments.Map[attachment] = DrawBuffersEnum.ColorAttachment0 + map[attachment]; + } + } + else + { + _attachments.MapCount = 0; + } + } + + public void SetTransform(bool flipX, bool flipY, int top, int left, int right, int bottom) + { + _flipX = flipX; + _flipY = flipY; + + _cropTop = top; + _cropLeft = left; + _cropRight = right; + _cropBottom = bottom; + } + + public void SetWindowSize(int width, int height) + { + _window = new Rect(0, 0, width, height); + } + + public void SetViewport(int attachment, int x, int y, int width, int height) + { + int offset = attachment * 4; + + _viewports[offset + 0] = x; + _viewports[offset + 1] = y; + _viewports[offset + 2] = width; + _viewports[offset + 3] = height; + } + + public void Render() + { + if (_readTex == null) + { + return; + } + + int srcX0, srcX1, srcY0, srcY1; + + if (_cropLeft == 0 && _cropRight == 0) + { + srcX0 = 0; + srcX1 = _readTex.Width; + } + else + { + srcX0 = _cropLeft; + srcX1 = _cropRight; + } + + if (_cropTop == 0 && _cropBottom == 0) + { + srcY0 = 0; + srcY1 = _readTex.Height; + } + else + { + srcY0 = _cropTop; + srcY1 = _cropBottom; + } + + float ratioX = MathF.Min(1f, (_window.Height * (float)NativeWidth) / ((float)NativeHeight * _window.Width)); + float ratioY = MathF.Min(1f, (_window.Width * (float)NativeHeight) / ((float)NativeWidth * _window.Height)); + + int dstWidth = (int)(_window.Width * ratioX); + int dstHeight = (int)(_window.Height * ratioY); + + int dstPaddingX = (_window.Width - dstWidth) / 2; + int dstPaddingY = (_window.Height - dstHeight) / 2; + + int dstX0 = _flipX ? _window.Width - dstPaddingX : dstPaddingX; + int dstX1 = _flipX ? dstPaddingX : _window.Width - dstPaddingX; + + int dstY0 = _flipY ? dstPaddingY : _window.Height - dstPaddingY; + int dstY1 = _flipY ? _window.Height - dstPaddingY : dstPaddingY; + + GL.Viewport(0, 0, _window.Width, _window.Height); + + if (_srcFb == 0) + { + _srcFb = GL.GenFramebuffer(); + } + + GL.BindFramebuffer(FramebufferTarget.ReadFramebuffer, _srcFb); + GL.BindFramebuffer(FramebufferTarget.DrawFramebuffer, 0); + + GL.FramebufferTexture(FramebufferTarget.ReadFramebuffer, FramebufferAttachment.ColorAttachment0, _readTex.Handle, 0); + + GL.ReadBuffer(ReadBufferMode.ColorAttachment0); + + GL.Clear(ClearBufferMask.ColorBufferBit); + + GL.Disable(EnableCap.FramebufferSrgb); + + GL.BlitFramebuffer( + srcX0, + srcY0, + srcX1, + srcY1, + dstX0, + dstY0, + dstX1, + dstY1, + ClearBufferMask.ColorBufferBit, + BlitFramebufferFilter.Linear); + + if (FramebufferSrgb) + { + GL.Enable(EnableCap.FramebufferSrgb); + } + } + + public void Copy( + GalImage srcImage, + GalImage dstImage, + long srcKey, + long dstKey, + int srcLayer, + int dstLayer, + int srcX0, + int srcY0, + int srcX1, + int srcY1, + int dstX0, + int dstY0, + int dstX1, + int dstY1) + { + if (_texture.TryGetImageHandler(srcKey, out ImageHandler srcTex) && + _texture.TryGetImageHandler(dstKey, out ImageHandler dstTex)) + { + if (srcTex.HasColor != dstTex.HasColor || + srcTex.HasDepth != dstTex.HasDepth || + srcTex.HasStencil != dstTex.HasStencil) + { + throw new NotImplementedException(); + } + + if (_srcFb == 0) + { + _srcFb = GL.GenFramebuffer(); + } + + if (_dstFb == 0) + { + _dstFb = GL.GenFramebuffer(); + } + + GL.BindFramebuffer(FramebufferTarget.ReadFramebuffer, _srcFb); + GL.BindFramebuffer(FramebufferTarget.DrawFramebuffer, _dstFb); + + FramebufferAttachment attachment = GetAttachment(srcTex); + + if (ImageUtils.IsArray(srcImage.TextureTarget) && srcLayer > 0) + { + GL.FramebufferTextureLayer(FramebufferTarget.ReadFramebuffer, attachment, srcTex.Handle, 0, srcLayer); + } + else + { + GL.FramebufferTexture(FramebufferTarget.ReadFramebuffer, attachment, srcTex.Handle, 0); + } + + if (ImageUtils.IsArray(dstImage.TextureTarget) && dstLayer > 0) + { + GL.FramebufferTextureLayer(FramebufferTarget.DrawFramebuffer, attachment, dstTex.Handle, 0, dstLayer); + } + else + { + GL.FramebufferTexture(FramebufferTarget.DrawFramebuffer, attachment, dstTex.Handle, 0); + } + + + BlitFramebufferFilter filter = BlitFramebufferFilter.Nearest; + + if (srcTex.HasColor) + { + GL.DrawBuffer(DrawBufferMode.ColorAttachment0); + + filter = BlitFramebufferFilter.Linear; + } + + ClearBufferMask mask = GetClearMask(srcTex); + + GL.BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); + } + } + + public void Reinterpret(long key, GalImage newImage) + { + if (!_texture.TryGetImage(key, out GalImage oldImage)) + { + return; + } + + if (newImage.Format == oldImage.Format && + newImage.Width == oldImage.Width && + newImage.Height == oldImage.Height && + newImage.Depth == oldImage.Depth && + newImage.LayerCount == oldImage.LayerCount && + newImage.TextureTarget == oldImage.TextureTarget) + { + return; + } + + if (_copyPbo == 0) + { + _copyPbo = GL.GenBuffer(); + } + + GL.BindBuffer(BufferTarget.PixelPackBuffer, _copyPbo); + + //The buffer should be large enough to hold the largest texture. + int bufferSize = Math.Max(ImageUtils.GetSize(oldImage), + ImageUtils.GetSize(newImage)); + + GL.BufferData(BufferTarget.PixelPackBuffer, bufferSize, IntPtr.Zero, BufferUsageHint.StreamCopy); + + if (!_texture.TryGetImageHandler(key, out ImageHandler cachedImage)) + { + throw new InvalidOperationException(); + } + + (_, PixelFormat format, PixelType type) = OglEnumConverter.GetImageFormat(cachedImage.Format); + + TextureTarget target = ImageUtils.GetTextureTarget(newImage.TextureTarget); + + GL.BindTexture(target, cachedImage.Handle); + + GL.GetTexImage(target, 0, format, type, IntPtr.Zero); + + GL.BindBuffer(BufferTarget.PixelPackBuffer, 0); + GL.BindBuffer(BufferTarget.PixelUnpackBuffer, _copyPbo); + + GL.PixelStore(PixelStoreParameter.UnpackRowLength, oldImage.Width); + + _texture.Create(key, ImageUtils.GetSize(newImage), newImage); + + GL.PixelStore(PixelStoreParameter.UnpackRowLength, 0); + + GL.BindBuffer(BufferTarget.PixelUnpackBuffer, 0); + } + + private static FramebufferAttachment GetAttachment(ImageHandler cachedImage) + { + if (cachedImage.HasColor) + { + return FramebufferAttachment.ColorAttachment0; + } + else if (cachedImage.HasDepth && cachedImage.HasStencil) + { + return FramebufferAttachment.DepthStencilAttachment; + } + else if (cachedImage.HasDepth) + { + return FramebufferAttachment.DepthAttachment; + } + else if (cachedImage.HasStencil) + { + return FramebufferAttachment.StencilAttachment; + } + else + { + throw new InvalidOperationException(); + } + } + + private static ClearBufferMask GetClearMask(ImageHandler cachedImage) + { + return (cachedImage.HasColor ? ClearBufferMask.ColorBufferBit : 0) | + (cachedImage.HasDepth ? ClearBufferMask.DepthBufferBit : 0) | + (cachedImage.HasStencil ? ClearBufferMask.StencilBufferBit : 0); + } + } +}
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/OpenGL/OglRenderer.cs b/Ryujinx.Graphics/Gal/OpenGL/OglRenderer.cs new file mode 100644 index 00000000..1ff8c7ad --- /dev/null +++ b/Ryujinx.Graphics/Gal/OpenGL/OglRenderer.cs @@ -0,0 +1,58 @@ +using System; +using System.Collections.Concurrent; + +namespace Ryujinx.Graphics.Gal.OpenGL +{ + public class OglRenderer : IGalRenderer + { + public IGalConstBuffer Buffer { get; private set; } + + public IGalRenderTarget RenderTarget { get; private set; } + + public IGalRasterizer Rasterizer { get; private set; } + + public IGalShader Shader { get; private set; } + + public IGalPipeline Pipeline { get; private set; } + + public IGalTexture Texture { get; private set; } + + private ConcurrentQueue<Action> _actionsQueue; + + public OglRenderer() + { + Buffer = new OglConstBuffer(); + + Texture = new OglTexture(); + + RenderTarget = new OglRenderTarget(Texture as OglTexture); + + Rasterizer = new OglRasterizer(); + + Shader = new OglShader(Buffer as OglConstBuffer); + + Pipeline = new OglPipeline( + Buffer as OglConstBuffer, + RenderTarget as OglRenderTarget, + Rasterizer as OglRasterizer, + Shader as OglShader); + + _actionsQueue = new ConcurrentQueue<Action>(); + } + + public void QueueAction(Action actionMthd) + { + _actionsQueue.Enqueue(actionMthd); + } + + public void RunActions() + { + int count = _actionsQueue.Count; + + while (count-- > 0 && _actionsQueue.TryDequeue(out Action renderAction)) + { + renderAction(); + } + } + } +}
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/OpenGL/OglShader.cs b/Ryujinx.Graphics/Gal/OpenGL/OglShader.cs new file mode 100644 index 00000000..8faa9053 --- /dev/null +++ b/Ryujinx.Graphics/Gal/OpenGL/OglShader.cs @@ -0,0 +1,298 @@ +using OpenTK.Graphics.OpenGL; +using Ryujinx.Graphics.Gal.Shader; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Linq; + +namespace Ryujinx.Graphics.Gal.OpenGL +{ + class OglShader : IGalShader + { + public const int ReservedCbufCount = 1; + + private const int ExtraDataSize = 4; + + public OglShaderProgram Current; + + private ConcurrentDictionary<long, OglShaderStage> _stages; + + private Dictionary<OglShaderProgram, int> _programs; + + public int CurrentProgramHandle { get; private set; } + + private OglConstBuffer _buffer; + + private int _extraUboHandle; + + public OglShader(OglConstBuffer buffer) + { + _buffer = buffer; + + _stages = new ConcurrentDictionary<long, OglShaderStage>(); + + _programs = new Dictionary<OglShaderProgram, int>(); + } + + public void Create(IGalMemory memory, long key, GalShaderType type) + { + _stages.GetOrAdd(key, (stage) => ShaderStageFactory(memory, key, 0, false, type)); + } + + public void Create(IGalMemory memory, long vpAPos, long key, GalShaderType type) + { + _stages.GetOrAdd(key, (stage) => ShaderStageFactory(memory, vpAPos, key, true, type)); + } + + private OglShaderStage ShaderStageFactory( + IGalMemory memory, + long position, + long positionB, + bool isDualVp, + GalShaderType type) + { + GlslProgram program; + + GlslDecompiler decompiler = new GlslDecompiler(OglLimit.MaxUboSize, OglExtension.NvidiaDriver); + + int shaderDumpIndex = ShaderDumper.DumpIndex; + + if (isDualVp) + { + ShaderDumper.Dump(memory, position, type, "a"); + ShaderDumper.Dump(memory, positionB, type, "b"); + + program = decompiler.Decompile(memory, position, positionB, type); + } + else + { + ShaderDumper.Dump(memory, position, type); + + program = decompiler.Decompile(memory, position, type); + } + + string code = program.Code; + + if (ShaderDumper.IsDumpEnabled()) + { + code = "//Shader " + shaderDumpIndex + Environment.NewLine + code; + } + + return new OglShaderStage(type, code, program.Uniforms, program.Textures); + } + + public IEnumerable<ShaderDeclInfo> GetConstBufferUsage(long key) + { + if (_stages.TryGetValue(key, out OglShaderStage stage)) + { + return stage.ConstBufferUsage; + } + + return Enumerable.Empty<ShaderDeclInfo>(); + } + + public IEnumerable<ShaderDeclInfo> GetTextureUsage(long key) + { + if (_stages.TryGetValue(key, out OglShaderStage stage)) + { + return stage.TextureUsage; + } + + return Enumerable.Empty<ShaderDeclInfo>(); + } + + public unsafe void SetExtraData(float flipX, float flipY, int instance) + { + BindProgram(); + + EnsureExtraBlock(); + + GL.BindBuffer(BufferTarget.UniformBuffer, _extraUboHandle); + + float* data = stackalloc float[ExtraDataSize]; + data[0] = flipX; + data[1] = flipY; + data[2] = BitConverter.Int32BitsToSingle(instance); + + //Invalidate buffer + GL.BufferData(BufferTarget.UniformBuffer, ExtraDataSize * sizeof(float), IntPtr.Zero, BufferUsageHint.StreamDraw); + + GL.BufferSubData(BufferTarget.UniformBuffer, IntPtr.Zero, ExtraDataSize * sizeof(float), (IntPtr)data); + } + + public void Bind(long key) + { + if (_stages.TryGetValue(key, out OglShaderStage stage)) + { + Bind(stage); + } + } + + private void Bind(OglShaderStage stage) + { + if (stage.Type == GalShaderType.Geometry) + { + //Enhanced layouts are required for Geometry shaders + //skip this stage if current driver has no ARB_enhanced_layouts + if (!OglExtension.EnhancedLayouts) + { + return; + } + } + + switch (stage.Type) + { + case GalShaderType.Vertex: Current.Vertex = stage; break; + case GalShaderType.TessControl: Current.TessControl = stage; break; + case GalShaderType.TessEvaluation: Current.TessEvaluation = stage; break; + case GalShaderType.Geometry: Current.Geometry = stage; break; + case GalShaderType.Fragment: Current.Fragment = stage; break; + } + } + + public void Unbind(GalShaderType type) + { + switch (type) + { + case GalShaderType.Vertex: Current.Vertex = null; break; + case GalShaderType.TessControl: Current.TessControl = null; break; + case GalShaderType.TessEvaluation: Current.TessEvaluation = null; break; + case GalShaderType.Geometry: Current.Geometry = null; break; + case GalShaderType.Fragment: Current.Fragment = null; break; + } + } + + public void BindProgram() + { + if (Current.Vertex == null || + Current.Fragment == null) + { + return; + } + + if (!_programs.TryGetValue(Current, out int handle)) + { + handle = GL.CreateProgram(); + + AttachIfNotNull(handle, Current.Vertex); + AttachIfNotNull(handle, Current.TessControl); + AttachIfNotNull(handle, Current.TessEvaluation); + AttachIfNotNull(handle, Current.Geometry); + AttachIfNotNull(handle, Current.Fragment); + + GL.LinkProgram(handle); + + CheckProgramLink(handle); + + BindUniformBlocks(handle); + BindTextureLocations(handle); + + _programs.Add(Current, handle); + } + + GL.UseProgram(handle); + + CurrentProgramHandle = handle; + } + + private void EnsureExtraBlock() + { + if (_extraUboHandle == 0) + { + _extraUboHandle = GL.GenBuffer(); + + GL.BindBuffer(BufferTarget.UniformBuffer, _extraUboHandle); + + GL.BufferData(BufferTarget.UniformBuffer, ExtraDataSize * sizeof(float), IntPtr.Zero, BufferUsageHint.StreamDraw); + + GL.BindBufferBase(BufferRangeTarget.UniformBuffer, 0, _extraUboHandle); + } + } + + private void AttachIfNotNull(int programHandle, OglShaderStage stage) + { + if (stage != null) + { + stage.Compile(); + + GL.AttachShader(programHandle, stage.Handle); + } + } + + private void BindUniformBlocks(int programHandle) + { + int extraBlockindex = GL.GetUniformBlockIndex(programHandle, GlslDecl.ExtraUniformBlockName); + + GL.UniformBlockBinding(programHandle, extraBlockindex, 0); + + int freeBinding = ReservedCbufCount; + + void BindUniformBlocksIfNotNull(OglShaderStage stage) + { + if (stage != null) + { + foreach (ShaderDeclInfo declInfo in stage.ConstBufferUsage) + { + int blockIndex = GL.GetUniformBlockIndex(programHandle, declInfo.Name); + + if (blockIndex < 0) + { + //It is expected that its found, if it's not then driver might be in a malfunction + throw new InvalidOperationException(); + } + + GL.UniformBlockBinding(programHandle, blockIndex, freeBinding); + + freeBinding++; + } + } + } + + BindUniformBlocksIfNotNull(Current.Vertex); + BindUniformBlocksIfNotNull(Current.TessControl); + BindUniformBlocksIfNotNull(Current.TessEvaluation); + BindUniformBlocksIfNotNull(Current.Geometry); + BindUniformBlocksIfNotNull(Current.Fragment); + } + + private void BindTextureLocations(int programHandle) + { + int index = 0; + + void BindTexturesIfNotNull(OglShaderStage stage) + { + if (stage != null) + { + foreach (ShaderDeclInfo decl in stage.TextureUsage) + { + int location = GL.GetUniformLocation(programHandle, decl.Name); + + GL.Uniform1(location, index); + + index++; + } + } + } + + GL.UseProgram(programHandle); + + BindTexturesIfNotNull(Current.Vertex); + BindTexturesIfNotNull(Current.TessControl); + BindTexturesIfNotNull(Current.TessEvaluation); + BindTexturesIfNotNull(Current.Geometry); + BindTexturesIfNotNull(Current.Fragment); + } + + private static void CheckProgramLink(int handle) + { + int status = 0; + + GL.GetProgram(handle, GetProgramParameterName.LinkStatus, out status); + + if (status == 0) + { + throw new ShaderException(GL.GetProgramInfoLog(handle)); + } + } + } +}
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/OpenGL/OglShaderProgram.cs b/Ryujinx.Graphics/Gal/OpenGL/OglShaderProgram.cs new file mode 100644 index 00000000..9e68a8e6 --- /dev/null +++ b/Ryujinx.Graphics/Gal/OpenGL/OglShaderProgram.cs @@ -0,0 +1,86 @@ +using OpenTK.Graphics.OpenGL; +using System; +using System.Collections.Generic; + +namespace Ryujinx.Graphics.Gal.OpenGL +{ + struct OglShaderProgram + { + public OglShaderStage Vertex; + public OglShaderStage TessControl; + public OglShaderStage TessEvaluation; + public OglShaderStage Geometry; + public OglShaderStage Fragment; + } + + class OglShaderStage : IDisposable + { + public int Handle { get; private set; } + + public bool IsCompiled { get; private set; } + + public GalShaderType Type { get; private set; } + + public string Code { get; private set; } + + public IEnumerable<ShaderDeclInfo> ConstBufferUsage { get; private set; } + public IEnumerable<ShaderDeclInfo> TextureUsage { get; private set; } + + public OglShaderStage( + GalShaderType type, + string code, + IEnumerable<ShaderDeclInfo> constBufferUsage, + IEnumerable<ShaderDeclInfo> textureUsage) + { + Type = type; + Code = code; + ConstBufferUsage = constBufferUsage; + TextureUsage = textureUsage; + } + + public void Compile() + { + if (Handle == 0) + { + Handle = GL.CreateShader(OglEnumConverter.GetShaderType(Type)); + + CompileAndCheck(Handle, Code); + } + } + + public void Dispose() + { + Dispose(true); + } + + protected virtual void Dispose(bool disposing) + { + if (disposing && Handle != 0) + { + GL.DeleteShader(Handle); + + Handle = 0; + } + } + + public static void CompileAndCheck(int handle, string code) + { + GL.ShaderSource(handle, code); + GL.CompileShader(handle); + + CheckCompilation(handle); + } + + private static void CheckCompilation(int handle) + { + int status = 0; + + GL.GetShader(handle, ShaderParameter.CompileStatus, out status); + + if (status == 0) + { + throw new ShaderException(GL.GetShaderInfoLog(handle)); + } + } + } +}
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLStreamBuffer.cs b/Ryujinx.Graphics/Gal/OpenGL/OglStreamBuffer.cs index 411d33aa..58b3ace5 100644 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLStreamBuffer.cs +++ b/Ryujinx.Graphics/Gal/OpenGL/OglStreamBuffer.cs @@ -3,7 +3,7 @@ using System; namespace Ryujinx.Graphics.Gal.OpenGL { - class OGLStreamBuffer : IDisposable + class OglStreamBuffer : IDisposable { public int Handle { get; protected set; } @@ -11,30 +11,30 @@ namespace Ryujinx.Graphics.Gal.OpenGL protected BufferTarget Target { get; private set; } - public OGLStreamBuffer(BufferTarget Target, long Size) + public OglStreamBuffer(BufferTarget target, long size) { - this.Target = Target; - this.Size = Size; + Target = target; + Size = size; Handle = GL.GenBuffer(); - GL.BindBuffer(Target, Handle); + GL.BindBuffer(target, Handle); - GL.BufferData(Target, (IntPtr)Size, IntPtr.Zero, BufferUsageHint.StreamDraw); + GL.BufferData(target, (IntPtr)size, IntPtr.Zero, BufferUsageHint.StreamDraw); } - public void SetData(long Size, IntPtr HostAddress) + public void SetData(long size, IntPtr hostAddress) { GL.BindBuffer(Target, Handle); - GL.BufferSubData(Target, IntPtr.Zero, (IntPtr)Size, HostAddress); + GL.BufferSubData(Target, IntPtr.Zero, (IntPtr)size, hostAddress); } - public void SetData(byte[] Data) + public void SetData(byte[] data) { GL.BindBuffer(Target, Handle); - GL.BufferSubData(Target, IntPtr.Zero, (IntPtr)Data.Length, Data); + GL.BufferSubData(Target, IntPtr.Zero, (IntPtr)data.Length, data); } public void Dispose() @@ -42,9 +42,9 @@ namespace Ryujinx.Graphics.Gal.OpenGL Dispose(true); } - protected virtual void Dispose(bool Disposing) + protected virtual void Dispose(bool disposing) { - if (Disposing && Handle != 0) + if (disposing && Handle != 0) { GL.DeleteBuffer(Handle); diff --git a/Ryujinx.Graphics/Gal/OpenGL/OglTexture.cs b/Ryujinx.Graphics/Gal/OpenGL/OglTexture.cs new file mode 100644 index 00000000..f836702f --- /dev/null +++ b/Ryujinx.Graphics/Gal/OpenGL/OglTexture.cs @@ -0,0 +1,381 @@ +using OpenTK.Graphics.OpenGL; +using Ryujinx.Graphics.Texture; +using System; + +namespace Ryujinx.Graphics.Gal.OpenGL +{ + class OglTexture : IGalTexture + { + private const long MaxTextureCacheSize = 768 * 1024 * 1024; + + private OglCachedResource<ImageHandler> _textureCache; + + public EventHandler<int> TextureDeleted { get; set; } + + public OglTexture() + { + _textureCache = new OglCachedResource<ImageHandler>(DeleteTexture, MaxTextureCacheSize); + } + + public void LockCache() + { + _textureCache.Lock(); + } + + public void UnlockCache() + { + _textureCache.Unlock(); + } + + private void DeleteTexture(ImageHandler cachedImage) + { + TextureDeleted?.Invoke(this, cachedImage.Handle); + + GL.DeleteTexture(cachedImage.Handle); + } + + public void Create(long key, int size, GalImage image) + { + int handle = GL.GenTexture(); + + TextureTarget target = ImageUtils.GetTextureTarget(image.TextureTarget); + + GL.BindTexture(target, handle); + + const int level = 0; //TODO: Support mipmap textures. + const int border = 0; + + _textureCache.AddOrUpdate(key, new ImageHandler(handle, image), (uint)size); + + if (ImageUtils.IsCompressed(image.Format)) + { + throw new InvalidOperationException("Surfaces with compressed formats are not supported!"); + } + + (PixelInternalFormat internalFmt, + PixelFormat format, + PixelType type) = OglEnumConverter.GetImageFormat(image.Format); + + switch (target) + { + case TextureTarget.Texture1D: + GL.TexImage1D( + target, + level, + internalFmt, + image.Width, + border, + format, + type, + IntPtr.Zero); + break; + + case TextureTarget.Texture2D: + GL.TexImage2D( + target, + level, + internalFmt, + image.Width, + image.Height, + border, + format, + type, + IntPtr.Zero); + break; + case TextureTarget.Texture3D: + GL.TexImage3D( + target, + level, + internalFmt, + image.Width, + image.Height, + image.Depth, + border, + format, + type, + IntPtr.Zero); + break; + case TextureTarget.Texture2DArray: + GL.TexImage3D( + target, + level, + internalFmt, + image.Width, + image.Height, + image.LayerCount, + border, + format, + type, + IntPtr.Zero); + break; + default: + throw new NotImplementedException($"Unsupported texture target type: {target}"); + } + } + + public void Create(long key, byte[] data, GalImage image) + { + int handle = GL.GenTexture(); + + TextureTarget target = ImageUtils.GetTextureTarget(image.TextureTarget); + + GL.BindTexture(target, handle); + + const int level = 0; //TODO: Support mipmap textures. + const int border = 0; + + _textureCache.AddOrUpdate(key, new ImageHandler(handle, image), (uint)data.Length); + + if (ImageUtils.IsCompressed(image.Format) && !IsAstc(image.Format)) + { + InternalFormat internalFmt = OglEnumConverter.GetCompressedImageFormat(image.Format); + + switch (target) + { + case TextureTarget.Texture1D: + GL.CompressedTexImage1D( + target, + level, + internalFmt, + image.Width, + border, + data.Length, + data); + break; + case TextureTarget.Texture2D: + GL.CompressedTexImage2D( + target, + level, + internalFmt, + image.Width, + image.Height, + border, + data.Length, + data); + break; + case TextureTarget.Texture3D: + GL.CompressedTexImage3D( + target, + level, + internalFmt, + image.Width, + image.Height, + image.Depth, + border, + data.Length, + data); + break; + case TextureTarget.Texture2DArray: + GL.CompressedTexImage3D( + target, + level, + internalFmt, + image.Width, + image.Height, + image.LayerCount, + border, + data.Length, + data); + break; + default: + throw new NotImplementedException($"Unsupported texture target type: {target}"); + } + } + else + { + //TODO: Use KHR_texture_compression_astc_hdr when available + if (IsAstc(image.Format)) + { + int textureBlockWidth = ImageUtils.GetBlockWidth(image.Format); + int textureBlockHeight = ImageUtils.GetBlockHeight(image.Format); + int textureBlockDepth = ImageUtils.GetBlockDepth(image.Format); + + data = AstcDecoder.DecodeToRgba8888( + data, + textureBlockWidth, + textureBlockHeight, + textureBlockDepth, + image.Width, + image.Height, + image.Depth); + + image.Format = GalImageFormat.Rgba8 | (image.Format & GalImageFormat.TypeMask); + } + + (PixelInternalFormat internalFmt, + PixelFormat format, + PixelType type) = OglEnumConverter.GetImageFormat(image.Format); + + + switch (target) + { + case TextureTarget.Texture1D: + GL.TexImage1D( + target, + level, + internalFmt, + image.Width, + border, + format, + type, + data); + break; + case TextureTarget.Texture2D: + GL.TexImage2D( + target, + level, + internalFmt, + image.Width, + image.Height, + border, + format, + type, + data); + break; + case TextureTarget.Texture3D: + GL.TexImage3D( + target, + level, + internalFmt, + image.Width, + image.Height, + image.Depth, + border, + format, + type, + data); + break; + case TextureTarget.Texture2DArray: + GL.TexImage3D( + target, + level, + internalFmt, + image.Width, + image.Height, + image.LayerCount, + border, + format, + type, + data); + break; + case TextureTarget.TextureCubeMap: + Span<byte> array = new Span<byte>(data); + + int faceSize = ImageUtils.GetSize(image) / 6; + + for (int face = 0; face < 6; face++) + { + GL.TexImage2D( + TextureTarget.TextureCubeMapPositiveX + face, + level, + internalFmt, + image.Width, + image.Height, + border, + format, + type, + array.Slice(face * faceSize, faceSize).ToArray()); + } + break; + default: + throw new NotImplementedException($"Unsupported texture target type: {target}"); + } + } + } + + private static bool IsAstc(GalImageFormat format) + { + format &= GalImageFormat.FormatMask; + + return format > GalImageFormat.Astc2DStart && format < GalImageFormat.Astc2DEnd; + } + + public bool TryGetImage(long key, out GalImage image) + { + if (_textureCache.TryGetValue(key, out ImageHandler cachedImage)) + { + image = cachedImage.Image; + + return true; + } + + image = default(GalImage); + + return false; + } + + public bool TryGetImageHandler(long key, out ImageHandler cachedImage) + { + if (_textureCache.TryGetValue(key, out cachedImage)) + { + return true; + } + + cachedImage = null; + + return false; + } + + public void Bind(long key, int index, GalImage image) + { + if (_textureCache.TryGetValue(key, out ImageHandler cachedImage)) + { + GL.ActiveTexture(TextureUnit.Texture0 + index); + + TextureTarget target = ImageUtils.GetTextureTarget(image.TextureTarget); + + GL.BindTexture(target, cachedImage.Handle); + + int[] swizzleRgba = new int[] + { + (int)OglEnumConverter.GetTextureSwizzle(image.XSource), + (int)OglEnumConverter.GetTextureSwizzle(image.YSource), + (int)OglEnumConverter.GetTextureSwizzle(image.ZSource), + (int)OglEnumConverter.GetTextureSwizzle(image.WSource) + }; + + GL.TexParameter(target, TextureParameterName.TextureSwizzleRgba, swizzleRgba); + } + } + + public void SetSampler(GalImage image, GalTextureSampler sampler) + { + int wrapS = (int)OglEnumConverter.GetTextureWrapMode(sampler.AddressU); + int wrapT = (int)OglEnumConverter.GetTextureWrapMode(sampler.AddressV); + int wrapR = (int)OglEnumConverter.GetTextureWrapMode(sampler.AddressP); + + int minFilter = (int)OglEnumConverter.GetTextureMinFilter(sampler.MinFilter, sampler.MipFilter); + int magFilter = (int)OglEnumConverter.GetTextureMagFilter(sampler.MagFilter); + + TextureTarget target = ImageUtils.GetTextureTarget(image.TextureTarget); + + GL.TexParameter(target, TextureParameterName.TextureWrapS, wrapS); + GL.TexParameter(target, TextureParameterName.TextureWrapT, wrapT); + GL.TexParameter(target, TextureParameterName.TextureWrapR, wrapR); + + GL.TexParameter(target, TextureParameterName.TextureMinFilter, minFilter); + GL.TexParameter(target, TextureParameterName.TextureMagFilter, magFilter); + + float[] color = new float[] + { + sampler.BorderColor.Red, + sampler.BorderColor.Green, + sampler.BorderColor.Blue, + sampler.BorderColor.Alpha + }; + + GL.TexParameter(target, TextureParameterName.TextureBorderColor, color); + + if (sampler.DepthCompare) + { + GL.TexParameter(target, TextureParameterName.TextureCompareMode, (int)All.CompareRToTexture); + GL.TexParameter(target, TextureParameterName.TextureCompareFunc, (int)OglEnumConverter.GetDepthCompareFunc(sampler.DepthCompareFunc)); + } + else + { + GL.TexParameter(target, TextureParameterName.TextureCompareMode, (int)All.None); + GL.TexParameter(target, TextureParameterName.TextureCompareFunc, (int)All.Never); + } + } + } +} diff --git a/Ryujinx.Graphics/Gal/Shader/GlslDecl.cs b/Ryujinx.Graphics/Gal/Shader/GlslDecl.cs index f7ae34fa..73426762 100644 --- a/Ryujinx.Graphics/Gal/Shader/GlslDecl.cs +++ b/Ryujinx.Graphics/Gal/Shader/GlslDecl.cs @@ -1,4 +1,3 @@ -using Ryujinx.Graphics.Gal.OpenGL; using Ryujinx.Graphics.Texture; using System; using System.Collections.Generic; @@ -51,9 +50,9 @@ namespace Ryujinx.Graphics.Gal.Shader public const string SsyStackName = "ssy_stack"; public const string SsyCursorName = "ssy_cursor"; - private string[] StagePrefixes = new string[] { "vp", "tcp", "tep", "gp", "fp" }; + private string[] _stagePrefixes = new string[] { "vp", "tcp", "tep", "gp", "fp" }; - private string StagePrefix; + private string _stagePrefix; private Dictionary<ShaderIrOp, ShaderDeclInfo> m_CbTextures; @@ -83,9 +82,9 @@ namespace Ryujinx.Graphics.Gal.Shader public GalShaderType ShaderType { get; private set; } - private GlslDecl(GalShaderType ShaderType) + private GlslDecl(GalShaderType shaderType) { - this.ShaderType = ShaderType; + ShaderType = shaderType; m_CbTextures = new Dictionary<ShaderIrOp, ShaderDeclInfo>(); @@ -101,187 +100,187 @@ namespace Ryujinx.Graphics.Gal.Shader m_Preds = new Dictionary<int, ShaderDeclInfo>(); } - public GlslDecl(ShaderIrBlock[] Blocks, GalShaderType ShaderType, ShaderHeader Header) : this(ShaderType) + public GlslDecl(ShaderIrBlock[] blocks, GalShaderType shaderType, ShaderHeader header) : this(shaderType) { - StagePrefix = StagePrefixes[(int)ShaderType] + "_"; + _stagePrefix = _stagePrefixes[(int)shaderType] + "_"; - if (ShaderType == GalShaderType.Fragment) + if (shaderType == GalShaderType.Fragment) { - int Index = 0; + int index = 0; - for (int Attachment = 0; Attachment < 8; Attachment++) + for (int attachment = 0; attachment < 8; attachment++) { - for (int Component = 0; Component < 4; Component++) + for (int component = 0; component < 4; component++) { - if (Header.OmapTargets[Attachment].ComponentEnabled(Component)) + if (header.OmapTargets[attachment].ComponentEnabled(component)) { - m_Gprs.TryAdd(Index, new ShaderDeclInfo(GetGprName(Index), Index)); + m_Gprs.TryAdd(index, new ShaderDeclInfo(GetGprName(index), index)); - Index++; + index++; } } } - if (Header.OmapDepth) + if (header.OmapDepth) { - Index = Header.DepthRegister; + index = header.DepthRegister; - m_Gprs.TryAdd(Index, new ShaderDeclInfo(GetGprName(Index), Index)); + m_Gprs.TryAdd(index, new ShaderDeclInfo(GetGprName(index), index)); } } - foreach (ShaderIrBlock Block in Blocks) + foreach (ShaderIrBlock block in blocks) { - ShaderIrNode[] Nodes = Block.GetNodes(); + ShaderIrNode[] nodes = block.GetNodes(); - foreach (ShaderIrNode Node in Nodes) + foreach (ShaderIrNode node in nodes) { - Traverse(Nodes, null, Node); + Traverse(nodes, null, node); } } } - public static GlslDecl Merge(GlslDecl VpA, GlslDecl VpB) + public static GlslDecl Merge(GlslDecl vpA, GlslDecl vpB) { - GlslDecl Combined = new GlslDecl(GalShaderType.Vertex); + GlslDecl combined = new GlslDecl(GalShaderType.Vertex); - Merge(Combined.m_Textures, VpA.m_Textures, VpB.m_Textures); - Merge(Combined.m_Uniforms, VpA.m_Uniforms, VpB.m_Uniforms); + Merge(combined.m_Textures, vpA.m_Textures, vpB.m_Textures); + Merge(combined.m_Uniforms, vpA.m_Uniforms, vpB.m_Uniforms); - Merge(Combined.m_Attributes, VpA.m_Attributes, VpB.m_Attributes); - Merge(Combined.m_OutAttributes, VpA.m_OutAttributes, VpB.m_OutAttributes); + Merge(combined.m_Attributes, vpA.m_Attributes, vpB.m_Attributes); + Merge(combined.m_OutAttributes, vpA.m_OutAttributes, vpB.m_OutAttributes); - Merge(Combined.m_Gprs, VpA.m_Gprs, VpB.m_Gprs); - Merge(Combined.m_GprsHalf, VpA.m_GprsHalf, VpB.m_GprsHalf); - Merge(Combined.m_Preds, VpA.m_Preds, VpB.m_Preds); + Merge(combined.m_Gprs, vpA.m_Gprs, vpB.m_Gprs); + Merge(combined.m_GprsHalf, vpA.m_GprsHalf, vpB.m_GprsHalf); + Merge(combined.m_Preds, vpA.m_Preds, vpB.m_Preds); //Merge input attributes. - foreach (KeyValuePair<int, ShaderDeclInfo> KV in VpA.m_InAttributes) + foreach (KeyValuePair<int, ShaderDeclInfo> kv in vpA.m_InAttributes) { - Combined.m_InAttributes.TryAdd(KV.Key, KV.Value); + combined.m_InAttributes.TryAdd(kv.Key, kv.Value); } - foreach (KeyValuePair<int, ShaderDeclInfo> KV in VpB.m_InAttributes) + foreach (KeyValuePair<int, ShaderDeclInfo> kv in vpB.m_InAttributes) { //If Vertex Program A already writes to this attribute, //then we don't need to add it as an input attribute since //Vertex Program A will already have written to it anyway, //and there's no guarantee that there is an input attribute //for this slot. - if (!VpA.m_OutAttributes.ContainsKey(KV.Key)) + if (!vpA.m_OutAttributes.ContainsKey(kv.Key)) { - Combined.m_InAttributes.TryAdd(KV.Key, KV.Value); + combined.m_InAttributes.TryAdd(kv.Key, kv.Value); } } - return Combined; + return combined; } - public static string GetGprName(int Index) + public static string GetGprName(int index) { - return GprName + Index; + return GprName + index; } private static void Merge( - Dictionary<int, ShaderDeclInfo> C, - Dictionary<int, ShaderDeclInfo> A, - Dictionary<int, ShaderDeclInfo> B) + Dictionary<int, ShaderDeclInfo> c, + Dictionary<int, ShaderDeclInfo> a, + Dictionary<int, ShaderDeclInfo> b) { - foreach (KeyValuePair<int, ShaderDeclInfo> KV in A) + foreach (KeyValuePair<int, ShaderDeclInfo> kv in a) { - C.TryAdd(KV.Key, KV.Value); + c.TryAdd(kv.Key, kv.Value); } - foreach (KeyValuePair<int, ShaderDeclInfo> KV in B) + foreach (KeyValuePair<int, ShaderDeclInfo> kv in b) { - C.TryAdd(KV.Key, KV.Value); + c.TryAdd(kv.Key, kv.Value); } } - private void Traverse(ShaderIrNode[] Nodes, ShaderIrNode Parent, ShaderIrNode Node) + private void Traverse(ShaderIrNode[] nodes, ShaderIrNode parent, ShaderIrNode node) { - switch (Node) + switch (node) { - case ShaderIrAsg Asg: + case ShaderIrAsg asg: { - Traverse(Nodes, Asg, Asg.Dst); - Traverse(Nodes, Asg, Asg.Src); + Traverse(nodes, asg, asg.Dst); + Traverse(nodes, asg, asg.Src); break; } - case ShaderIrCond Cond: + case ShaderIrCond cond: { - Traverse(Nodes, Cond, Cond.Pred); - Traverse(Nodes, Cond, Cond.Child); + Traverse(nodes, cond, cond.Pred); + Traverse(nodes, cond, cond.Child); break; } - case ShaderIrOp Op: + case ShaderIrOp op: { - Traverse(Nodes, Op, Op.OperandA); - Traverse(Nodes, Op, Op.OperandB); - Traverse(Nodes, Op, Op.OperandC); - - if (Op.Inst == ShaderIrInst.Texq || - Op.Inst == ShaderIrInst.Texs || - Op.Inst == ShaderIrInst.Tld4 || - Op.Inst == ShaderIrInst.Txlf) + Traverse(nodes, op, op.OperandA); + Traverse(nodes, op, op.OperandB); + Traverse(nodes, op, op.OperandC); + + if (op.Inst == ShaderIrInst.Texq || + op.Inst == ShaderIrInst.Texs || + op.Inst == ShaderIrInst.Tld4 || + op.Inst == ShaderIrInst.Txlf) { - int Handle = ((ShaderIrOperImm)Op.OperandC).Value; + int handle = ((ShaderIrOperImm)op.OperandC).Value; - int Index = Handle - TexStartIndex; + int index = handle - TexStartIndex; - string Name = StagePrefix + TextureName + Index; + string name = _stagePrefix + TextureName + index; - GalTextureTarget TextureTarget; + GalTextureTarget textureTarget; - TextureInstructionSuffix TextureInstructionSuffix; + TextureInstructionSuffix textureInstructionSuffix; // TODO: Non 2D texture type for TEXQ? - if (Op.Inst == ShaderIrInst.Texq) + if (op.Inst == ShaderIrInst.Texq) { - TextureTarget = GalTextureTarget.TwoD; - TextureInstructionSuffix = TextureInstructionSuffix.None; + textureTarget = GalTextureTarget.TwoD; + textureInstructionSuffix = TextureInstructionSuffix.None; } else { - ShaderIrMetaTex Meta = ((ShaderIrMetaTex)Op.MetaData); + ShaderIrMetaTex meta = ((ShaderIrMetaTex)op.MetaData); - TextureTarget = Meta.TextureTarget; - TextureInstructionSuffix = Meta.TextureInstructionSuffix; + textureTarget = meta.TextureTarget; + textureInstructionSuffix = meta.TextureInstructionSuffix; } - m_Textures.TryAdd(Handle, new ShaderDeclInfo(Name, Handle, false, 0, 1, TextureTarget, TextureInstructionSuffix)); + m_Textures.TryAdd(handle, new ShaderDeclInfo(name, handle, false, 0, 1, textureTarget, textureInstructionSuffix)); } - else if (Op.Inst == ShaderIrInst.Texb) + else if (op.Inst == ShaderIrInst.Texb) { - ShaderIrNode HandleSrc = null; + ShaderIrNode handleSrc = null; - int Index = Array.IndexOf(Nodes, Parent) - 1; + int index = Array.IndexOf(nodes, parent) - 1; - for (; Index >= 0; Index--) + for (; index >= 0; index--) { - ShaderIrNode Curr = Nodes[Index]; + ShaderIrNode curr = nodes[index]; - if (Curr is ShaderIrAsg Asg && Asg.Dst is ShaderIrOperGpr Gpr) + if (curr is ShaderIrAsg asg && asg.Dst is ShaderIrOperGpr gpr) { - if (Gpr.Index == ((ShaderIrOperGpr)Op.OperandC).Index) + if (gpr.Index == ((ShaderIrOperGpr)op.OperandC).Index) { - HandleSrc = Asg.Src; + handleSrc = asg.Src; break; } } } - if (HandleSrc != null && HandleSrc is ShaderIrOperCbuf Cbuf) + if (handleSrc != null && handleSrc is ShaderIrOperCbuf cbuf) { - ShaderIrMetaTex Meta = ((ShaderIrMetaTex)Op.MetaData); - string Name = StagePrefix + TextureName + "_cb" + Cbuf.Index + "_" + Cbuf.Pos; + ShaderIrMetaTex meta = ((ShaderIrMetaTex)op.MetaData); + string name = _stagePrefix + TextureName + "_cb" + cbuf.Index + "_" + cbuf.Pos; - m_CbTextures.Add(Op, new ShaderDeclInfo(Name, Cbuf.Pos, true, Cbuf.Index, 1, Meta.TextureTarget, Meta.TextureInstructionSuffix)); + m_CbTextures.Add(op, new ShaderDeclInfo(name, cbuf.Pos, true, cbuf.Index, 1, meta.TextureTarget, meta.TextureInstructionSuffix)); } else { @@ -291,93 +290,93 @@ namespace Ryujinx.Graphics.Gal.Shader break; } - case ShaderIrOperCbuf Cbuf: + case ShaderIrOperCbuf cbuf: { - if (!m_Uniforms.ContainsKey(Cbuf.Index)) + if (!m_Uniforms.ContainsKey(cbuf.Index)) { - string Name = StagePrefix + UniformName + Cbuf.Index; + string name = _stagePrefix + UniformName + cbuf.Index; - ShaderDeclInfo DeclInfo = new ShaderDeclInfo(Name, Cbuf.Pos, true, Cbuf.Index); + ShaderDeclInfo declInfo = new ShaderDeclInfo(name, cbuf.Pos, true, cbuf.Index); - m_Uniforms.Add(Cbuf.Index, DeclInfo); + m_Uniforms.Add(cbuf.Index, declInfo); } break; } - case ShaderIrOperAbuf Abuf: + case ShaderIrOperAbuf abuf: { //This is a built-in variable. - if (Abuf.Offs == LayerAttr || - Abuf.Offs == PointSizeAttr || - Abuf.Offs == PointCoordAttrX || - Abuf.Offs == PointCoordAttrY || - Abuf.Offs == VertexIdAttr || - Abuf.Offs == InstanceIdAttr || - Abuf.Offs == FaceAttr) + if (abuf.Offs == LayerAttr || + abuf.Offs == PointSizeAttr || + abuf.Offs == PointCoordAttrX || + abuf.Offs == PointCoordAttrY || + abuf.Offs == VertexIdAttr || + abuf.Offs == InstanceIdAttr || + abuf.Offs == FaceAttr) { break; } - int Index = Abuf.Offs >> 4; - int Elem = (Abuf.Offs >> 2) & 3; + int index = abuf.Offs >> 4; + int elem = (abuf.Offs >> 2) & 3; - int GlslIndex = Index - AttrStartIndex; + int glslIndex = index - AttrStartIndex; - if (GlslIndex < 0) + if (glslIndex < 0) { return; } - ShaderDeclInfo DeclInfo; + ShaderDeclInfo declInfo; - if (Parent is ShaderIrAsg Asg && Asg.Dst == Node) + if (parent is ShaderIrAsg asg && asg.Dst == node) { - if (!m_OutAttributes.TryGetValue(Index, out DeclInfo)) + if (!m_OutAttributes.TryGetValue(index, out declInfo)) { - DeclInfo = new ShaderDeclInfo(OutAttrName + GlslIndex, GlslIndex); + declInfo = new ShaderDeclInfo(OutAttrName + glslIndex, glslIndex); - m_OutAttributes.Add(Index, DeclInfo); + m_OutAttributes.Add(index, declInfo); } } else { - if (!m_InAttributes.TryGetValue(Index, out DeclInfo)) + if (!m_InAttributes.TryGetValue(index, out declInfo)) { - DeclInfo = new ShaderDeclInfo(InAttrName + GlslIndex, GlslIndex); + declInfo = new ShaderDeclInfo(InAttrName + glslIndex, glslIndex); - m_InAttributes.Add(Index, DeclInfo); + m_InAttributes.Add(index, declInfo); } } - DeclInfo.Enlarge(Elem + 1); + declInfo.Enlarge(elem + 1); - if (!m_Attributes.ContainsKey(Index)) + if (!m_Attributes.ContainsKey(index)) { - DeclInfo = new ShaderDeclInfo(AttrName + GlslIndex, GlslIndex, false, 0, 4); + declInfo = new ShaderDeclInfo(AttrName + glslIndex, glslIndex, false, 0, 4); - m_Attributes.Add(Index, DeclInfo); + m_Attributes.Add(index, declInfo); } - Traverse(Nodes, Abuf, Abuf.Vertex); + Traverse(nodes, abuf, abuf.Vertex); break; } - case ShaderIrOperGpr Gpr: + case ShaderIrOperGpr gpr: { - if (!Gpr.IsConst) + if (!gpr.IsConst) { - string Name = GetGprName(Gpr.Index); + string name = GetGprName(gpr.Index); - if (Gpr.RegisterSize == ShaderRegisterSize.Single) + if (gpr.RegisterSize == ShaderRegisterSize.Single) { - m_Gprs.TryAdd(Gpr.Index, new ShaderDeclInfo(Name, Gpr.Index)); + m_Gprs.TryAdd(gpr.Index, new ShaderDeclInfo(name, gpr.Index)); } - else if (Gpr.RegisterSize == ShaderRegisterSize.Half) + else if (gpr.RegisterSize == ShaderRegisterSize.Half) { - Name += "_h" + Gpr.HalfPart; + name += "_h" + gpr.HalfPart; - m_GprsHalf.TryAdd((Gpr.Index << 1) | Gpr.HalfPart, new ShaderDeclInfo(Name, Gpr.Index)); + m_GprsHalf.TryAdd((gpr.Index << 1) | gpr.HalfPart, new ShaderDeclInfo(name, gpr.Index)); } else /* if (Gpr.RegisterSize == ShaderRegisterSize.Double) */ { @@ -387,35 +386,35 @@ namespace Ryujinx.Graphics.Gal.Shader break; } - case ShaderIrOperPred Pred: + case ShaderIrOperPred pred: { - if (!Pred.IsConst && !HasName(m_Preds, Pred.Index)) + if (!pred.IsConst && !HasName(m_Preds, pred.Index)) { - string Name = PredName + Pred.Index; + string name = PredName + pred.Index; - m_Preds.TryAdd(Pred.Index, new ShaderDeclInfo(Name, Pred.Index)); + m_Preds.TryAdd(pred.Index, new ShaderDeclInfo(name, pred.Index)); } break; } } } - private bool HasName(Dictionary<int, ShaderDeclInfo> Decls, int Index) + private bool HasName(Dictionary<int, ShaderDeclInfo> decls, int index) { //This is used to check if the dictionary already contains //a entry for a vector at a given index position. //Used to enable turning gprs into vectors. - int VecIndex = Index & ~3; + int vecIndex = index & ~3; - if (Decls.TryGetValue(VecIndex, out ShaderDeclInfo DeclInfo)) + if (decls.TryGetValue(vecIndex, out ShaderDeclInfo declInfo)) { - if (DeclInfo.Size > 1 && Index < VecIndex + DeclInfo.Size) + if (declInfo.Size > 1 && index < vecIndex + declInfo.Size) { return true; } } - return Decls.ContainsKey(Index); + return decls.ContainsKey(index); } } } diff --git a/Ryujinx.Graphics/Gal/Shader/GlslDecompiler.cs b/Ryujinx.Graphics/Gal/Shader/GlslDecompiler.cs index 5f809525..228a9018 100644 --- a/Ryujinx.Graphics/Gal/Shader/GlslDecompiler.cs +++ b/Ryujinx.Graphics/Gal/Shader/GlslDecompiler.cs @@ -10,9 +10,9 @@ namespace Ryujinx.Graphics.Gal.Shader { public class GlslDecompiler { - private delegate string GetInstExpr(ShaderIrOp Op); + private delegate string GetInstExpr(ShaderIrOp op); - private Dictionary<ShaderIrInst, GetInstExpr> InstsExpr; + private Dictionary<ShaderIrInst, GetInstExpr> _instsExpr; private enum OperType { @@ -25,21 +25,21 @@ namespace Ryujinx.Graphics.Gal.Shader private const int MaxVertexInput = 3; - private GlslDecl Decl; + private GlslDecl _decl; - private ShaderHeader Header, HeaderB; + private ShaderHeader _header, _headerB; - private ShaderIrBlock[] Blocks, BlocksB; + private ShaderIrBlock[] _blocks, _blocksB; - private StringBuilder SB; + private StringBuilder _sb; public int MaxUboSize { get; } - private bool IsNvidiaDriver; + private bool _isNvidiaDriver; - public GlslDecompiler(int MaxUboSize, bool IsNvidiaDriver) + public GlslDecompiler(int maxUboSize, bool isNvidiaDriver) { - InstsExpr = new Dictionary<ShaderIrInst, GetInstExpr>() + _instsExpr = new Dictionary<ShaderIrInst, GetInstExpr>() { { ShaderIrInst.Abs, GetAbsExpr }, { ShaderIrInst.Add, GetAddExpr }, @@ -114,48 +114,48 @@ namespace Ryujinx.Graphics.Gal.Shader { ShaderIrInst.Xor, GetXorExpr } }; - this.MaxUboSize = MaxUboSize / 16; - this.IsNvidiaDriver = IsNvidiaDriver; + MaxUboSize = maxUboSize / 16; + _isNvidiaDriver = isNvidiaDriver; } public GlslProgram Decompile( - IGalMemory Memory, - long VpAPosition, - long VpBPosition, - GalShaderType ShaderType) + IGalMemory memory, + long vpAPosition, + long vpBPosition, + GalShaderType shaderType) { - Header = new ShaderHeader(Memory, VpAPosition); - HeaderB = new ShaderHeader(Memory, VpBPosition); + _header = new ShaderHeader(memory, vpAPosition); + _headerB = new ShaderHeader(memory, vpBPosition); - Blocks = ShaderDecoder.Decode(Memory, VpAPosition); - BlocksB = ShaderDecoder.Decode(Memory, VpBPosition); + _blocks = ShaderDecoder.Decode(memory, vpAPosition); + _blocksB = ShaderDecoder.Decode(memory, vpBPosition); - GlslDecl DeclVpA = new GlslDecl(Blocks, ShaderType, Header); - GlslDecl DeclVpB = new GlslDecl(BlocksB, ShaderType, HeaderB); + GlslDecl declVpA = new GlslDecl(_blocks, shaderType, _header); + GlslDecl declVpB = new GlslDecl(_blocksB, shaderType, _headerB); - Decl = GlslDecl.Merge(DeclVpA, DeclVpB); + _decl = GlslDecl.Merge(declVpA, declVpB); return Decompile(); } - public GlslProgram Decompile(IGalMemory Memory, long Position, GalShaderType ShaderType) + public GlslProgram Decompile(IGalMemory memory, long position, GalShaderType shaderType) { - Header = new ShaderHeader(Memory, Position); - HeaderB = null; + _header = new ShaderHeader(memory, position); + _headerB = null; - Blocks = ShaderDecoder.Decode(Memory, Position); - BlocksB = null; + _blocks = ShaderDecoder.Decode(memory, position); + _blocksB = null; - Decl = new GlslDecl(Blocks, ShaderType, Header); + _decl = new GlslDecl(_blocks, shaderType, _header); return Decompile(); } private GlslProgram Decompile() { - SB = new StringBuilder(); + _sb = new StringBuilder(); - SB.AppendLine("#version 410 core"); + _sb.AppendLine("#version 410 core"); PrintDeclHeader(); PrintDeclTextures(); @@ -167,599 +167,599 @@ namespace Ryujinx.Graphics.Gal.Shader PrintDeclPreds(); PrintDeclSsy(); - if (BlocksB != null) + if (_blocksB != null) { - PrintBlockScope(Blocks, GlslDecl.BasicBlockAName); + PrintBlockScope(_blocks, GlslDecl.BasicBlockAName); - SB.AppendLine(); + _sb.AppendLine(); - PrintBlockScope(BlocksB, GlslDecl.BasicBlockBName); + PrintBlockScope(_blocksB, GlslDecl.BasicBlockBName); } else { - PrintBlockScope(Blocks, GlslDecl.BasicBlockName); + PrintBlockScope(_blocks, GlslDecl.BasicBlockName); } - SB.AppendLine(); + _sb.AppendLine(); PrintMain(); - string GlslCode = SB.ToString(); + string glslCode = _sb.ToString(); - List<ShaderDeclInfo> TextureInfo = new List<ShaderDeclInfo>(); + List<ShaderDeclInfo> textureInfo = new List<ShaderDeclInfo>(); - TextureInfo.AddRange(Decl.Textures.Values); - TextureInfo.AddRange(IterateCbTextures()); + textureInfo.AddRange(_decl.Textures.Values); + textureInfo.AddRange(IterateCbTextures()); - return new GlslProgram(GlslCode, TextureInfo, Decl.Uniforms.Values); + return new GlslProgram(glslCode, textureInfo, _decl.Uniforms.Values); } private void PrintDeclHeader() { - if (Decl.ShaderType == GalShaderType.Geometry) + if (_decl.ShaderType == GalShaderType.Geometry) { - int MaxVertices = Header.MaxOutputVertexCount; + int maxVertices = _header.MaxOutputVertexCount; - string OutputTopology; + string outputTopology; - switch (Header.OutputTopology) + switch (_header.OutputTopology) { - case ShaderHeader.PointList: OutputTopology = "points"; break; - case ShaderHeader.LineStrip: OutputTopology = "line_strip"; break; - case ShaderHeader.TriangleStrip: OutputTopology = "triangle_strip"; break; + case ShaderHeader.PointList: outputTopology = "points"; break; + case ShaderHeader.LineStrip: outputTopology = "line_strip"; break; + case ShaderHeader.TriangleStrip: outputTopology = "triangle_strip"; break; default: throw new InvalidOperationException(); } - SB.AppendLine("#extension GL_ARB_enhanced_layouts : require"); + _sb.AppendLine("#extension GL_ARB_enhanced_layouts : require"); - SB.AppendLine(); + _sb.AppendLine(); - SB.AppendLine("// Stubbed. Maxwell geometry shaders don't inform input geometry type"); + _sb.AppendLine("// Stubbed. Maxwell geometry shaders don't inform input geometry type"); - SB.AppendLine("layout(triangles) in;" + Environment.NewLine); + _sb.AppendLine("layout(triangles) in;" + Environment.NewLine); - SB.AppendLine($"layout({OutputTopology}, max_vertices = {MaxVertices}) out;"); + _sb.AppendLine($"layout({outputTopology}, max_vertices = {maxVertices}) out;"); - SB.AppendLine(); + _sb.AppendLine(); } } - private string GetSamplerType(TextureTarget TextureTarget, bool HasShadow) + private string GetSamplerType(TextureTarget textureTarget, bool hasShadow) { - string Result; + string result; - switch (TextureTarget) + switch (textureTarget) { case TextureTarget.Texture1D: - Result = "sampler1D"; + result = "sampler1D"; break; case TextureTarget.Texture2D: - Result = "sampler2D"; + result = "sampler2D"; break; case TextureTarget.Texture3D: - Result = "sampler3D"; + result = "sampler3D"; break; case TextureTarget.TextureCubeMap: - Result = "samplerCube"; + result = "samplerCube"; break; case TextureTarget.TextureRectangle: - Result = "sampler2DRect"; + result = "sampler2DRect"; break; case TextureTarget.Texture1DArray: - Result = "sampler1DArray"; + result = "sampler1DArray"; break; case TextureTarget.Texture2DArray: - Result = "sampler2DArray"; + result = "sampler2DArray"; break; case TextureTarget.TextureCubeMapArray: - Result = "samplerCubeArray"; + result = "samplerCubeArray"; break; case TextureTarget.TextureBuffer: - Result = "samplerBuffer"; + result = "samplerBuffer"; break; case TextureTarget.Texture2DMultisample: - Result = "sampler2DMS"; + result = "sampler2DMS"; break; case TextureTarget.Texture2DMultisampleArray: - Result = "sampler2DMSArray"; + result = "sampler2DMSArray"; break; default: throw new NotSupportedException(); } - if (HasShadow) - Result += "Shadow"; + if (hasShadow) + result += "Shadow"; - return Result; + return result; } private void PrintDeclTextures() { - foreach (ShaderDeclInfo DeclInfo in IterateCbTextures()) + foreach (ShaderDeclInfo declInfo in IterateCbTextures()) { - TextureTarget Target = ImageUtils.GetTextureTarget(DeclInfo.TextureTarget); - SB.AppendLine($"// {DeclInfo.TextureSuffix}"); - SB.AppendLine("uniform " + GetSamplerType(Target, (DeclInfo.TextureSuffix & TextureInstructionSuffix.DC) != 0) + " " + DeclInfo.Name + ";"); + TextureTarget target = ImageUtils.GetTextureTarget(declInfo.TextureTarget); + _sb.AppendLine($"// {declInfo.TextureSuffix}"); + _sb.AppendLine("uniform " + GetSamplerType(target, (declInfo.TextureSuffix & TextureInstructionSuffix.Dc) != 0) + " " + declInfo.Name + ";"); } - foreach (ShaderDeclInfo DeclInfo in Decl.Textures.Values.OrderBy(DeclKeySelector)) + foreach (ShaderDeclInfo declInfo in _decl.Textures.Values.OrderBy(DeclKeySelector)) { - TextureTarget Target = ImageUtils.GetTextureTarget(DeclInfo.TextureTarget); - SB.AppendLine($"// {DeclInfo.TextureSuffix}"); - SB.AppendLine("uniform " + GetSamplerType(Target, (DeclInfo.TextureSuffix & TextureInstructionSuffix.DC) != 0) + " " + DeclInfo.Name + ";"); + TextureTarget target = ImageUtils.GetTextureTarget(declInfo.TextureTarget); + _sb.AppendLine($"// {declInfo.TextureSuffix}"); + _sb.AppendLine("uniform " + GetSamplerType(target, (declInfo.TextureSuffix & TextureInstructionSuffix.Dc) != 0) + " " + declInfo.Name + ";"); } } private IEnumerable<ShaderDeclInfo> IterateCbTextures() { - HashSet<string> Names = new HashSet<string>(); + HashSet<string> names = new HashSet<string>(); - foreach (ShaderDeclInfo DeclInfo in Decl.CbTextures.Values.OrderBy(DeclKeySelector)) + foreach (ShaderDeclInfo declInfo in _decl.CbTextures.Values.OrderBy(DeclKeySelector)) { - if (Names.Add(DeclInfo.Name)) + if (names.Add(declInfo.Name)) { - yield return DeclInfo; + yield return declInfo; } } } private void PrintDeclUniforms() { - if (Decl.ShaderType == GalShaderType.Vertex) + if (_decl.ShaderType == GalShaderType.Vertex) { //Memory layout here is [flip_x, flip_y, instance, unused] //It's using 4 bytes, not 8 - SB.AppendLine("layout (std140) uniform " + GlslDecl.ExtraUniformBlockName + " {"); + _sb.AppendLine("layout (std140) uniform " + GlslDecl.ExtraUniformBlockName + " {"); - SB.AppendLine(IdentationStr + "vec2 " + GlslDecl.FlipUniformName + ";"); + _sb.AppendLine(IdentationStr + "vec2 " + GlslDecl.FlipUniformName + ";"); - SB.AppendLine(IdentationStr + "int " + GlslDecl.InstanceUniformName + ";"); + _sb.AppendLine(IdentationStr + "int " + GlslDecl.InstanceUniformName + ";"); - SB.AppendLine("};"); - SB.AppendLine(); + _sb.AppendLine("};"); + _sb.AppendLine(); } - foreach (ShaderDeclInfo DeclInfo in Decl.Uniforms.Values.OrderBy(DeclKeySelector)) + foreach (ShaderDeclInfo declInfo in _decl.Uniforms.Values.OrderBy(DeclKeySelector)) { - SB.AppendLine($"layout (std140) uniform {DeclInfo.Name} {{"); + _sb.AppendLine($"layout (std140) uniform {declInfo.Name} {{"); - SB.AppendLine($"{IdentationStr}vec4 {DeclInfo.Name}_data[{MaxUboSize}];"); + _sb.AppendLine($"{IdentationStr}vec4 {declInfo.Name}_data[{MaxUboSize}];"); - SB.AppendLine("};"); + _sb.AppendLine("};"); } - if (Decl.Uniforms.Count > 0) + if (_decl.Uniforms.Count > 0) { - SB.AppendLine(); + _sb.AppendLine(); } } private void PrintDeclAttributes() { - string GeometryArray = (Decl.ShaderType == GalShaderType.Geometry) ? "[" + MaxVertexInput + "]" : ""; + string geometryArray = (_decl.ShaderType == GalShaderType.Geometry) ? "[" + MaxVertexInput + "]" : ""; - PrintDecls(Decl.Attributes, Suffix: GeometryArray); + PrintDecls(_decl.Attributes, suffix: geometryArray); } private void PrintDeclInAttributes() { - if (Decl.ShaderType == GalShaderType.Fragment) + if (_decl.ShaderType == GalShaderType.Fragment) { - SB.AppendLine("layout (location = " + GlslDecl.PositionOutAttrLocation + ") in vec4 " + GlslDecl.PositionOutAttrName + ";"); + _sb.AppendLine("layout (location = " + GlslDecl.PositionOutAttrLocation + ") in vec4 " + GlslDecl.PositionOutAttrName + ";"); } - if (Decl.ShaderType == GalShaderType.Geometry) + if (_decl.ShaderType == GalShaderType.Geometry) { - if (Decl.InAttributes.Count > 0) + if (_decl.InAttributes.Count > 0) { - SB.AppendLine("in Vertex {"); + _sb.AppendLine("in Vertex {"); - foreach (ShaderDeclInfo DeclInfo in Decl.InAttributes.Values.OrderBy(DeclKeySelector)) + foreach (ShaderDeclInfo declInfo in _decl.InAttributes.Values.OrderBy(DeclKeySelector)) { - if (DeclInfo.Index >= 0) + if (declInfo.Index >= 0) { - SB.AppendLine(IdentationStr + "layout (location = " + DeclInfo.Index + ") vec4 " + DeclInfo.Name + "; "); + _sb.AppendLine(IdentationStr + "layout (location = " + declInfo.Index + ") vec4 " + declInfo.Name + "; "); } } - SB.AppendLine("} block_in[];" + Environment.NewLine); + _sb.AppendLine("} block_in[];" + Environment.NewLine); } } else { - PrintDeclAttributes(Decl.InAttributes.Values, "in"); + PrintDeclAttributes(_decl.InAttributes.Values, "in"); } } private void PrintDeclOutAttributes() { - if (Decl.ShaderType == GalShaderType.Fragment) + if (_decl.ShaderType == GalShaderType.Fragment) { - int Count = 0; + int count = 0; - for (int Attachment = 0; Attachment < 8; Attachment++) + for (int attachment = 0; attachment < 8; attachment++) { - if (Header.OmapTargets[Attachment].Enabled) + if (_header.OmapTargets[attachment].Enabled) { - SB.AppendLine("layout (location = " + Attachment + ") out vec4 " + GlslDecl.FragmentOutputName + Attachment + ";"); + _sb.AppendLine("layout (location = " + attachment + ") out vec4 " + GlslDecl.FragmentOutputName + attachment + ";"); - Count++; + count++; } } - if (Count > 0) + if (count > 0) { - SB.AppendLine(); + _sb.AppendLine(); } } else { - SB.AppendLine("layout (location = " + GlslDecl.PositionOutAttrLocation + ") out vec4 " + GlslDecl.PositionOutAttrName + ";"); - SB.AppendLine(); + _sb.AppendLine("layout (location = " + GlslDecl.PositionOutAttrLocation + ") out vec4 " + GlslDecl.PositionOutAttrName + ";"); + _sb.AppendLine(); } - PrintDeclAttributes(Decl.OutAttributes.Values, "out"); + PrintDeclAttributes(_decl.OutAttributes.Values, "out"); } - private void PrintDeclAttributes(IEnumerable<ShaderDeclInfo> Decls, string InOut) + private void PrintDeclAttributes(IEnumerable<ShaderDeclInfo> decls, string inOut) { - int Count = 0; + int count = 0; - foreach (ShaderDeclInfo DeclInfo in Decls.OrderBy(DeclKeySelector)) + foreach (ShaderDeclInfo declInfo in decls.OrderBy(DeclKeySelector)) { - if (DeclInfo.Index >= 0) + if (declInfo.Index >= 0) { - SB.AppendLine("layout (location = " + DeclInfo.Index + ") " + InOut + " vec4 " + DeclInfo.Name + ";"); + _sb.AppendLine("layout (location = " + declInfo.Index + ") " + inOut + " vec4 " + declInfo.Name + ";"); - Count++; + count++; } } - if (Count > 0) + if (count > 0) { - SB.AppendLine(); + _sb.AppendLine(); } } private void PrintDeclGprs() { - PrintDecls(Decl.Gprs); - PrintDecls(Decl.GprsHalf); + PrintDecls(_decl.Gprs); + PrintDecls(_decl.GprsHalf); } private void PrintDeclPreds() { - PrintDecls(Decl.Preds, "bool"); + PrintDecls(_decl.Preds, "bool"); } private void PrintDeclSsy() { - SB.AppendLine("uint " + GlslDecl.SsyCursorName + " = 0;"); + _sb.AppendLine("uint " + GlslDecl.SsyCursorName + " = 0;"); - SB.AppendLine("uint " + GlslDecl.SsyStackName + "[" + GlslDecl.SsyStackSize + "];" + Environment.NewLine); + _sb.AppendLine("uint " + GlslDecl.SsyStackName + "[" + GlslDecl.SsyStackSize + "];" + Environment.NewLine); } - private void PrintDecls(IReadOnlyDictionary<int, ShaderDeclInfo> Dict, string CustomType = null, string Suffix = "") + private void PrintDecls(IReadOnlyDictionary<int, ShaderDeclInfo> dict, string customType = null, string suffix = "") { - foreach (ShaderDeclInfo DeclInfo in Dict.Values.OrderBy(DeclKeySelector)) + foreach (ShaderDeclInfo declInfo in dict.Values.OrderBy(DeclKeySelector)) { - string Name; + string name; - if (CustomType != null) + if (customType != null) { - Name = CustomType + " " + DeclInfo.Name + Suffix + ";"; + name = customType + " " + declInfo.Name + suffix + ";"; } - else if (DeclInfo.Name.Contains(GlslDecl.FragmentOutputName)) + else if (declInfo.Name.Contains(GlslDecl.FragmentOutputName)) { - Name = "layout (location = " + DeclInfo.Index / 4 + ") out vec4 " + DeclInfo.Name + Suffix + ";"; + name = "layout (location = " + declInfo.Index / 4 + ") out vec4 " + declInfo.Name + suffix + ";"; } else { - Name = GetDecl(DeclInfo) + Suffix + ";"; + name = GetDecl(declInfo) + suffix + ";"; } - SB.AppendLine(Name); + _sb.AppendLine(name); } - if (Dict.Count > 0) + if (dict.Count > 0) { - SB.AppendLine(); + _sb.AppendLine(); } } - private int DeclKeySelector(ShaderDeclInfo DeclInfo) + private int DeclKeySelector(ShaderDeclInfo declInfo) { - return DeclInfo.Cbuf << 24 | DeclInfo.Index; + return declInfo.Cbuf << 24 | declInfo.Index; } - private string GetDecl(ShaderDeclInfo DeclInfo) + private string GetDecl(ShaderDeclInfo declInfo) { - if (DeclInfo.Size == 4) + if (declInfo.Size == 4) { - return "vec4 " + DeclInfo.Name; + return "vec4 " + declInfo.Name; } else { - return "float " + DeclInfo.Name; + return "float " + declInfo.Name; } } private void PrintMain() { - SB.AppendLine("void main() {"); + _sb.AppendLine("void main() {"); - foreach (KeyValuePair<int, ShaderDeclInfo> KV in Decl.InAttributes) + foreach (KeyValuePair<int, ShaderDeclInfo> kv in _decl.InAttributes) { - if (!Decl.Attributes.TryGetValue(KV.Key, out ShaderDeclInfo Attr)) + if (!_decl.Attributes.TryGetValue(kv.Key, out ShaderDeclInfo attr)) { continue; } - ShaderDeclInfo DeclInfo = KV.Value; + ShaderDeclInfo declInfo = kv.Value; - if (Decl.ShaderType == GalShaderType.Geometry) + if (_decl.ShaderType == GalShaderType.Geometry) { - for (int Vertex = 0; Vertex < MaxVertexInput; Vertex++) + for (int vertex = 0; vertex < MaxVertexInput; vertex++) { - string Dst = Attr.Name + "[" + Vertex + "]"; + string dst = attr.Name + "[" + vertex + "]"; - string Src = "block_in[" + Vertex + "]." + DeclInfo.Name; + string src = "block_in[" + vertex + "]." + declInfo.Name; - SB.AppendLine(IdentationStr + Dst + " = " + Src + ";"); + _sb.AppendLine(IdentationStr + dst + " = " + src + ";"); } } else { - SB.AppendLine(IdentationStr + Attr.Name + " = " + DeclInfo.Name + ";"); + _sb.AppendLine(IdentationStr + attr.Name + " = " + declInfo.Name + ";"); } } - SB.AppendLine(IdentationStr + "uint pc;"); + _sb.AppendLine(IdentationStr + "uint pc;"); - if (BlocksB != null) + if (_blocksB != null) { - PrintProgram(Blocks, GlslDecl.BasicBlockAName); - PrintProgram(BlocksB, GlslDecl.BasicBlockBName); + PrintProgram(_blocks, GlslDecl.BasicBlockAName); + PrintProgram(_blocksB, GlslDecl.BasicBlockBName); } else { - PrintProgram(Blocks, GlslDecl.BasicBlockName); + PrintProgram(_blocks, GlslDecl.BasicBlockName); } - if (Decl.ShaderType != GalShaderType.Geometry) + if (_decl.ShaderType != GalShaderType.Geometry) { PrintAttrToOutput(); } - if (Decl.ShaderType == GalShaderType.Fragment) + if (_decl.ShaderType == GalShaderType.Fragment) { - if (Header.OmapDepth) + if (_header.OmapDepth) { - SB.AppendLine(IdentationStr + "gl_FragDepth = " + GlslDecl.GetGprName(Header.DepthRegister) + ";"); + _sb.AppendLine(IdentationStr + "gl_FragDepth = " + GlslDecl.GetGprName(_header.DepthRegister) + ";"); } - int GprIndex = 0; + int gprIndex = 0; - for (int Attachment = 0; Attachment < 8; Attachment++) + for (int attachment = 0; attachment < 8; attachment++) { - string Output = GlslDecl.FragmentOutputName + Attachment; + string output = GlslDecl.FragmentOutputName + attachment; - OmapTarget Target = Header.OmapTargets[Attachment]; + OmapTarget target = _header.OmapTargets[attachment]; - for (int Component = 0; Component < 4; Component++) + for (int component = 0; component < 4; component++) { - if (Target.ComponentEnabled(Component)) + if (target.ComponentEnabled(component)) { - SB.AppendLine(IdentationStr + Output + "[" + Component + "] = " + GlslDecl.GetGprName(GprIndex) + ";"); + _sb.AppendLine(IdentationStr + output + "[" + component + "] = " + GlslDecl.GetGprName(gprIndex) + ";"); - GprIndex++; + gprIndex++; } } } } - SB.AppendLine("}"); + _sb.AppendLine("}"); } - private void PrintProgram(ShaderIrBlock[] Blocks, string Name) + private void PrintProgram(ShaderIrBlock[] blocks, string name) { - const string Ident1 = IdentationStr; - const string Ident2 = Ident1 + IdentationStr; - const string Ident3 = Ident2 + IdentationStr; - const string Ident4 = Ident3 + IdentationStr; + const string ident1 = IdentationStr; + const string ident2 = ident1 + IdentationStr; + const string ident3 = ident2 + IdentationStr; + const string ident4 = ident3 + IdentationStr; - SB.AppendLine(Ident1 + "pc = " + GetBlockPosition(Blocks[0]) + ";"); - SB.AppendLine(Ident1 + "do {"); - SB.AppendLine(Ident2 + "switch (pc) {"); + _sb.AppendLine(ident1 + "pc = " + GetBlockPosition(blocks[0]) + ";"); + _sb.AppendLine(ident1 + "do {"); + _sb.AppendLine(ident2 + "switch (pc) {"); - foreach (ShaderIrBlock Block in Blocks) + foreach (ShaderIrBlock block in blocks) { - string FunctionName = Block.Position.ToString("x8"); + string functionName = block.Position.ToString("x8"); - SB.AppendLine(Ident3 + "case 0x" + FunctionName + ": pc = " + Name + "_" + FunctionName + "(); break;"); + _sb.AppendLine(ident3 + "case 0x" + functionName + ": pc = " + name + "_" + functionName + "(); break;"); } - SB.AppendLine(Ident3 + "default:"); - SB.AppendLine(Ident4 + "pc = 0;"); - SB.AppendLine(Ident4 + "break;"); + _sb.AppendLine(ident3 + "default:"); + _sb.AppendLine(ident4 + "pc = 0;"); + _sb.AppendLine(ident4 + "break;"); - SB.AppendLine(Ident2 + "}"); - SB.AppendLine(Ident1 + "} while (pc != 0);"); + _sb.AppendLine(ident2 + "}"); + _sb.AppendLine(ident1 + "} while (pc != 0);"); } - private void PrintAttrToOutput(string Identation = IdentationStr) + private void PrintAttrToOutput(string identation = IdentationStr) { - foreach (KeyValuePair<int, ShaderDeclInfo> KV in Decl.OutAttributes) + foreach (KeyValuePair<int, ShaderDeclInfo> kv in _decl.OutAttributes) { - if (!Decl.Attributes.TryGetValue(KV.Key, out ShaderDeclInfo Attr)) + if (!_decl.Attributes.TryGetValue(kv.Key, out ShaderDeclInfo attr)) { continue; } - ShaderDeclInfo DeclInfo = KV.Value; + ShaderDeclInfo declInfo = kv.Value; - string Name = Attr.Name; + string name = attr.Name; - if (Decl.ShaderType == GalShaderType.Geometry) + if (_decl.ShaderType == GalShaderType.Geometry) { - Name += "[0]"; + name += "[0]"; } - SB.AppendLine(Identation + DeclInfo.Name + " = " + Name + ";"); + _sb.AppendLine(identation + declInfo.Name + " = " + name + ";"); } - if (Decl.ShaderType == GalShaderType.Vertex) + if (_decl.ShaderType == GalShaderType.Vertex) { - SB.AppendLine(Identation + "gl_Position.xy *= " + GlslDecl.FlipUniformName + ";"); + _sb.AppendLine(identation + "gl_Position.xy *= " + GlslDecl.FlipUniformName + ";"); } - if (Decl.ShaderType != GalShaderType.Fragment) + if (_decl.ShaderType != GalShaderType.Fragment) { - SB.AppendLine(Identation + GlslDecl.PositionOutAttrName + " = gl_Position;"); - SB.AppendLine(Identation + GlslDecl.PositionOutAttrName + ".w = 1;"); + _sb.AppendLine(identation + GlslDecl.PositionOutAttrName + " = gl_Position;"); + _sb.AppendLine(identation + GlslDecl.PositionOutAttrName + ".w = 1;"); } } - private void PrintBlockScope(ShaderIrBlock[] Blocks, string Name) + private void PrintBlockScope(ShaderIrBlock[] blocks, string name) { - foreach (ShaderIrBlock Block in Blocks) + foreach (ShaderIrBlock block in blocks) { - SB.AppendLine("uint " + Name + "_" + Block.Position.ToString("x8") + "() {"); + _sb.AppendLine("uint " + name + "_" + block.Position.ToString("x8") + "() {"); - PrintNodes(Block, Block.GetNodes()); + PrintNodes(block, block.GetNodes()); - SB.AppendLine("}" + Environment.NewLine); + _sb.AppendLine("}" + Environment.NewLine); } } - private void PrintNodes(ShaderIrBlock Block, ShaderIrNode[] Nodes) + private void PrintNodes(ShaderIrBlock block, ShaderIrNode[] nodes) { - foreach (ShaderIrNode Node in Nodes) + foreach (ShaderIrNode node in nodes) { - PrintNode(Block, Node, IdentationStr); + PrintNode(block, node, IdentationStr); } - if (Nodes.Length == 0) + if (nodes.Length == 0) { - SB.AppendLine(IdentationStr + "return 0u;"); + _sb.AppendLine(IdentationStr + "return 0u;"); return; } - ShaderIrNode Last = Nodes[Nodes.Length - 1]; + ShaderIrNode last = nodes[nodes.Length - 1]; - bool UnconditionalFlowChange = false; + bool unconditionalFlowChange = false; - if (Last is ShaderIrOp Op) + if (last is ShaderIrOp op) { - switch (Op.Inst) + switch (op.Inst) { case ShaderIrInst.Bra: case ShaderIrInst.Exit: case ShaderIrInst.Sync: - UnconditionalFlowChange = true; + unconditionalFlowChange = true; break; } } - if (!UnconditionalFlowChange) + if (!unconditionalFlowChange) { - if (Block.Next != null) + if (block.Next != null) { - SB.AppendLine(IdentationStr + "return " + GetBlockPosition(Block.Next) + ";"); + _sb.AppendLine(IdentationStr + "return " + GetBlockPosition(block.Next) + ";"); } else { - SB.AppendLine(IdentationStr + "return 0u;"); + _sb.AppendLine(IdentationStr + "return 0u;"); } } } - private void PrintNode(ShaderIrBlock Block, ShaderIrNode Node, string Identation) + private void PrintNode(ShaderIrBlock block, ShaderIrNode node, string identation) { - if (Node is ShaderIrCond Cond) + if (node is ShaderIrCond cond) { - string IfExpr = GetSrcExpr(Cond.Pred, true); + string ifExpr = GetSrcExpr(cond.Pred, true); - if (Cond.Not) + if (cond.Not) { - IfExpr = "!(" + IfExpr + ")"; + ifExpr = "!(" + ifExpr + ")"; } - SB.AppendLine(Identation + "if (" + IfExpr + ") {"); + _sb.AppendLine(identation + "if (" + ifExpr + ") {"); - PrintNode(Block, Cond.Child, Identation + IdentationStr); + PrintNode(block, cond.Child, identation + IdentationStr); - SB.AppendLine(Identation + "}"); + _sb.AppendLine(identation + "}"); } - else if (Node is ShaderIrAsg Asg) + else if (node is ShaderIrAsg asg) { - if (IsValidOutOper(Asg.Dst)) + if (IsValidOutOper(asg.Dst)) { - string Expr = GetSrcExpr(Asg.Src, true); + string expr = GetSrcExpr(asg.Src, true); - Expr = GetExprWithCast(Asg.Dst, Asg.Src, Expr); + expr = GetExprWithCast(asg.Dst, asg.Src, expr); - SB.AppendLine(Identation + GetDstOperName(Asg.Dst) + " = " + Expr + ";"); + _sb.AppendLine(identation + GetDstOperName(asg.Dst) + " = " + expr + ";"); } } - else if (Node is ShaderIrOp Op) + else if (node is ShaderIrOp op) { - switch (Op.Inst) + switch (op.Inst) { case ShaderIrInst.Bra: { - SB.AppendLine(Identation + "return " + GetBlockPosition(Block.Branch) + ";"); + _sb.AppendLine(identation + "return " + GetBlockPosition(block.Branch) + ";"); break; } case ShaderIrInst.Emit: { - PrintAttrToOutput(Identation); + PrintAttrToOutput(identation); - SB.AppendLine(Identation + "EmitVertex();"); + _sb.AppendLine(identation + "EmitVertex();"); break; } case ShaderIrInst.Ssy: { - string StackIndex = GlslDecl.SsyStackName + "[" + GlslDecl.SsyCursorName + "]"; + string stackIndex = GlslDecl.SsyStackName + "[" + GlslDecl.SsyCursorName + "]"; - int TargetPosition = (Op.OperandA as ShaderIrOperImm).Value; + int targetPosition = (op.OperandA as ShaderIrOperImm).Value; - string Target = "0x" + TargetPosition.ToString("x8") + "u"; + string target = "0x" + targetPosition.ToString("x8") + "u"; - SB.AppendLine(Identation + StackIndex + " = " + Target + ";"); + _sb.AppendLine(identation + stackIndex + " = " + target + ";"); - SB.AppendLine(Identation + GlslDecl.SsyCursorName + "++;"); + _sb.AppendLine(identation + GlslDecl.SsyCursorName + "++;"); break; } case ShaderIrInst.Sync: { - SB.AppendLine(Identation + GlslDecl.SsyCursorName + "--;"); + _sb.AppendLine(identation + GlslDecl.SsyCursorName + "--;"); - string Target = GlslDecl.SsyStackName + "[" + GlslDecl.SsyCursorName + "]"; + string target = GlslDecl.SsyStackName + "[" + GlslDecl.SsyCursorName + "]"; - SB.AppendLine(Identation + "return " + Target + ";"); + _sb.AppendLine(identation + "return " + target + ";"); break; } default: - SB.AppendLine(Identation + GetSrcExpr(Op, true) + ";"); + _sb.AppendLine(identation + GetSrcExpr(op, true) + ";"); break; } } - else if (Node is ShaderIrCmnt Cmnt) + else if (node is ShaderIrCmnt cmnt) { - SB.AppendLine(Identation + "// " + Cmnt.Comment); + _sb.AppendLine(identation + "// " + cmnt.Comment); } else { @@ -767,13 +767,13 @@ namespace Ryujinx.Graphics.Gal.Shader } } - private bool IsValidOutOper(ShaderIrNode Node) + private bool IsValidOutOper(ShaderIrNode node) { - if (Node is ShaderIrOperGpr Gpr && Gpr.IsConst) + if (node is ShaderIrOperGpr gpr && gpr.IsConst) { return false; } - else if (Node is ShaderIrOperPred Pred && Pred.IsConst) + else if (node is ShaderIrOperPred pred && pred.IsConst) { return false; } @@ -781,61 +781,61 @@ namespace Ryujinx.Graphics.Gal.Shader return true; } - private string GetDstOperName(ShaderIrNode Node) + private string GetDstOperName(ShaderIrNode node) { - if (Node is ShaderIrOperAbuf Abuf) + if (node is ShaderIrOperAbuf abuf) { - return GetOutAbufName(Abuf); + return GetOutAbufName(abuf); } - else if (Node is ShaderIrOperGpr Gpr) + else if (node is ShaderIrOperGpr gpr) { - return GetName(Gpr); + return GetName(gpr); } - else if (Node is ShaderIrOperPred Pred) + else if (node is ShaderIrOperPred pred) { - return GetName(Pred); + return GetName(pred); } - throw new ArgumentException(nameof(Node)); + throw new ArgumentException(nameof(node)); } - private string GetSrcExpr(ShaderIrNode Node, bool Entry = false) + private string GetSrcExpr(ShaderIrNode node, bool entry = false) { - switch (Node) + switch (node) { - case ShaderIrOperAbuf Abuf: return GetName (Abuf); - case ShaderIrOperCbuf Cbuf: return GetName (Cbuf); - case ShaderIrOperGpr Gpr: return GetName (Gpr); - case ShaderIrOperImm Imm: return GetValue(Imm); - case ShaderIrOperImmf Immf: return GetValue(Immf); - case ShaderIrOperPred Pred: return GetName (Pred); + case ShaderIrOperAbuf abuf: return GetName (abuf); + case ShaderIrOperCbuf cbuf: return GetName (cbuf); + case ShaderIrOperGpr gpr: return GetName (gpr); + case ShaderIrOperImm imm: return GetValue(imm); + case ShaderIrOperImmf immf: return GetValue(immf); + case ShaderIrOperPred pred: return GetName (pred); - case ShaderIrOp Op: - string Expr; + case ShaderIrOp op: + string expr; - if (InstsExpr.TryGetValue(Op.Inst, out GetInstExpr GetExpr)) + if (_instsExpr.TryGetValue(op.Inst, out GetInstExpr getExpr)) { - Expr = GetExpr(Op); + expr = getExpr(op); } else { - throw new NotImplementedException(Op.Inst.ToString()); + throw new NotImplementedException(op.Inst.ToString()); } - if (!Entry && NeedsParentheses(Op)) + if (!entry && NeedsParentheses(op)) { - Expr = "(" + Expr + ")"; + expr = "(" + expr + ")"; } - return Expr; + return expr; - default: throw new ArgumentException(nameof(Node)); + default: throw new ArgumentException(nameof(node)); } } - private static bool NeedsParentheses(ShaderIrOp Op) + private static bool NeedsParentheses(ShaderIrOp op) { - switch (Op.Inst) + switch (op.Inst) { case ShaderIrInst.Ipa: case ShaderIrInst.Texq: @@ -848,63 +848,63 @@ namespace Ryujinx.Graphics.Gal.Shader return true; } - private string GetName(ShaderIrOperCbuf Cbuf) + private string GetName(ShaderIrOperCbuf cbuf) { - if (!Decl.Uniforms.TryGetValue(Cbuf.Index, out ShaderDeclInfo DeclInfo)) + if (!_decl.Uniforms.TryGetValue(cbuf.Index, out ShaderDeclInfo declInfo)) { throw new InvalidOperationException(); } - if (Cbuf.Offs != null) + if (cbuf.Offs != null) { - string Offset = "floatBitsToInt(" + GetSrcExpr(Cbuf.Offs) + ")"; + string offset = "floatBitsToInt(" + GetSrcExpr(cbuf.Offs) + ")"; - string Index = "(" + Cbuf.Pos * 4 + " + " + Offset + ")"; + string index = "(" + cbuf.Pos * 4 + " + " + offset + ")"; - return $"{DeclInfo.Name}_data[{Index} / 16][({Index} / 4) % 4]"; + return $"{declInfo.Name}_data[{index} / 16][({index} / 4) % 4]"; } else { - return $"{DeclInfo.Name}_data[{Cbuf.Pos / 4}][{Cbuf.Pos % 4}]"; + return $"{declInfo.Name}_data[{cbuf.Pos / 4}][{cbuf.Pos % 4}]"; } } - private string GetOutAbufName(ShaderIrOperAbuf Abuf) + private string GetOutAbufName(ShaderIrOperAbuf abuf) { - if (Decl.ShaderType == GalShaderType.Geometry) + if (_decl.ShaderType == GalShaderType.Geometry) { - switch (Abuf.Offs) + switch (abuf.Offs) { case GlslDecl.LayerAttr: return "gl_Layer"; } } - return GetAttrTempName(Abuf); + return GetAttrTempName(abuf); } - private string GetName(ShaderIrOperAbuf Abuf) + private string GetName(ShaderIrOperAbuf abuf) { //Handle special scalar read-only attributes here. - if (Decl.ShaderType == GalShaderType.Vertex) + if (_decl.ShaderType == GalShaderType.Vertex) { - switch (Abuf.Offs) + switch (abuf.Offs) { case GlslDecl.VertexIdAttr: return "gl_VertexID"; case GlslDecl.InstanceIdAttr: return GlslDecl.InstanceUniformName; } } - else if (Decl.ShaderType == GalShaderType.TessEvaluation) + else if (_decl.ShaderType == GalShaderType.TessEvaluation) { - switch (Abuf.Offs) + switch (abuf.Offs) { case GlslDecl.TessCoordAttrX: return "gl_TessCoord.x"; case GlslDecl.TessCoordAttrY: return "gl_TessCoord.y"; case GlslDecl.TessCoordAttrZ: return "gl_TessCoord.z"; } } - else if (Decl.ShaderType == GalShaderType.Fragment) + else if (_decl.ShaderType == GalShaderType.Fragment) { - switch (Abuf.Offs) + switch (abuf.Offs) { case GlslDecl.PointCoordAttrX: return "gl_PointCoord.x"; case GlslDecl.PointCoordAttrY: return "gl_PointCoord.y"; @@ -912,65 +912,65 @@ namespace Ryujinx.Graphics.Gal.Shader } } - return GetAttrTempName(Abuf); + return GetAttrTempName(abuf); } - private string GetAttrTempName(ShaderIrOperAbuf Abuf) + private string GetAttrTempName(ShaderIrOperAbuf abuf) { - int Index = Abuf.Offs >> 4; - int Elem = (Abuf.Offs >> 2) & 3; + int index = abuf.Offs >> 4; + int elem = (abuf.Offs >> 2) & 3; - string Swizzle = "." + GetAttrSwizzle(Elem); + string swizzle = "." + GetAttrSwizzle(elem); - if (!Decl.Attributes.TryGetValue(Index, out ShaderDeclInfo DeclInfo)) + if (!_decl.Attributes.TryGetValue(index, out ShaderDeclInfo declInfo)) { //Handle special vec4 attributes here //(for example, index 7 is always gl_Position). - if (Index == GlslDecl.GlPositionVec4Index) + if (index == GlslDecl.GlPositionVec4Index) { - string Name = - Decl.ShaderType != GalShaderType.Vertex && - Decl.ShaderType != GalShaderType.Geometry ? GlslDecl.PositionOutAttrName : "gl_Position"; + string name = + _decl.ShaderType != GalShaderType.Vertex && + _decl.ShaderType != GalShaderType.Geometry ? GlslDecl.PositionOutAttrName : "gl_Position"; - return Name + Swizzle; + return name + swizzle; } - else if (Abuf.Offs == GlslDecl.PointSizeAttr) + else if (abuf.Offs == GlslDecl.PointSizeAttr) { return "gl_PointSize"; } } - if (DeclInfo.Index >= 32) + if (declInfo.Index >= 32) { - throw new InvalidOperationException($"Shader attribute offset {Abuf.Offs} is invalid."); + throw new InvalidOperationException($"Shader attribute offset {abuf.Offs} is invalid."); } - if (Decl.ShaderType == GalShaderType.Geometry) + if (_decl.ShaderType == GalShaderType.Geometry) { - string Vertex = "floatBitsToInt(" + GetSrcExpr(Abuf.Vertex) + ")"; + string vertex = "floatBitsToInt(" + GetSrcExpr(abuf.Vertex) + ")"; - return DeclInfo.Name + "[" + Vertex + "]" + Swizzle; + return declInfo.Name + "[" + vertex + "]" + swizzle; } else { - return DeclInfo.Name + Swizzle; + return declInfo.Name + swizzle; } } - private string GetName(ShaderIrOperGpr Gpr) + private string GetName(ShaderIrOperGpr gpr) { - if (Gpr.IsConst) + if (gpr.IsConst) { return "0"; } - if (Gpr.RegisterSize == ShaderRegisterSize.Single) + if (gpr.RegisterSize == ShaderRegisterSize.Single) { - return GetNameWithSwizzle(Decl.Gprs, Gpr.Index); + return GetNameWithSwizzle(_decl.Gprs, gpr.Index); } - else if (Gpr.RegisterSize == ShaderRegisterSize.Half) + else if (gpr.RegisterSize == ShaderRegisterSize.Half) { - return GetNameWithSwizzle(Decl.GprsHalf, (Gpr.Index << 1) | Gpr.HalfPart); + return GetNameWithSwizzle(_decl.GprsHalf, (gpr.Index << 1) | gpr.HalfPart); } else /* if (Gpr.RegisterSize == ShaderRegisterSize.Double) */ { @@ -978,163 +978,163 @@ namespace Ryujinx.Graphics.Gal.Shader } } - private string GetValue(ShaderIrOperImm Imm) + private string GetValue(ShaderIrOperImm imm) { //Only use hex is the value is too big and would likely be hard to read as int. - if (Imm.Value > 0xfff || - Imm.Value < -0xfff) + if (imm.Value > 0xfff || + imm.Value < -0xfff) { - return "0x" + Imm.Value.ToString("x8", CultureInfo.InvariantCulture); + return "0x" + imm.Value.ToString("x8", CultureInfo.InvariantCulture); } else { - return GetIntConst(Imm.Value); + return GetIntConst(imm.Value); } } - private string GetValue(ShaderIrOperImmf Immf) + private string GetValue(ShaderIrOperImmf immf) { - return GetFloatConst(Immf.Value); + return GetFloatConst(immf.Value); } - private string GetName(ShaderIrOperPred Pred) + private string GetName(ShaderIrOperPred pred) { - return Pred.IsConst ? "true" : GetNameWithSwizzle(Decl.Preds, Pred.Index); + return pred.IsConst ? "true" : GetNameWithSwizzle(_decl.Preds, pred.Index); } - private string GetNameWithSwizzle(IReadOnlyDictionary<int, ShaderDeclInfo> Dict, int Index) + private string GetNameWithSwizzle(IReadOnlyDictionary<int, ShaderDeclInfo> dict, int index) { - int VecIndex = Index & ~3; + int vecIndex = index & ~3; - if (Dict.TryGetValue(VecIndex, out ShaderDeclInfo DeclInfo)) + if (dict.TryGetValue(vecIndex, out ShaderDeclInfo declInfo)) { - if (DeclInfo.Size > 1 && Index < VecIndex + DeclInfo.Size) + if (declInfo.Size > 1 && index < vecIndex + declInfo.Size) { - return DeclInfo.Name + "." + GetAttrSwizzle(Index & 3); + return declInfo.Name + "." + GetAttrSwizzle(index & 3); } } - if (!Dict.TryGetValue(Index, out DeclInfo)) + if (!dict.TryGetValue(index, out declInfo)) { throw new InvalidOperationException(); } - return DeclInfo.Name; + return declInfo.Name; } - private string GetAttrSwizzle(int Elem) + private string GetAttrSwizzle(int elem) { - return "xyzw".Substring(Elem, 1); + return "xyzw".Substring(elem, 1); } - private string GetAbsExpr(ShaderIrOp Op) => GetUnaryCall(Op, "abs"); + private string GetAbsExpr(ShaderIrOp op) => GetUnaryCall(op, "abs"); - private string GetAddExpr(ShaderIrOp Op) => GetBinaryExpr(Op, "+"); + private string GetAddExpr(ShaderIrOp op) => GetBinaryExpr(op, "+"); - private string GetAndExpr(ShaderIrOp Op) => GetBinaryExpr(Op, "&"); + private string GetAndExpr(ShaderIrOp op) => GetBinaryExpr(op, "&"); - private string GetAsrExpr(ShaderIrOp Op) => GetBinaryExpr(Op, ">>"); + private string GetAsrExpr(ShaderIrOp op) => GetBinaryExpr(op, ">>"); - private string GetBandExpr(ShaderIrOp Op) => GetBinaryExpr(Op, "&&"); + private string GetBandExpr(ShaderIrOp op) => GetBinaryExpr(op, "&&"); - private string GetBnotExpr(ShaderIrOp Op) => GetUnaryExpr(Op, "!"); + private string GetBnotExpr(ShaderIrOp op) => GetUnaryExpr(op, "!"); - private string GetBorExpr(ShaderIrOp Op) => GetBinaryExpr(Op, "||"); + private string GetBorExpr(ShaderIrOp op) => GetBinaryExpr(op, "||"); - private string GetBxorExpr(ShaderIrOp Op) => GetBinaryExpr(Op, "^^"); + private string GetBxorExpr(ShaderIrOp op) => GetBinaryExpr(op, "^^"); - private string GetCeilExpr(ShaderIrOp Op) => GetUnaryCall(Op, "ceil"); + private string GetCeilExpr(ShaderIrOp op) => GetUnaryCall(op, "ceil"); - private string GetClampsExpr(ShaderIrOp Op) + private string GetClampsExpr(ShaderIrOp op) { - return "clamp(" + GetOperExpr(Op, Op.OperandA) + ", " + - GetOperExpr(Op, Op.OperandB) + ", " + - GetOperExpr(Op, Op.OperandC) + ")"; + return "clamp(" + GetOperExpr(op, op.OperandA) + ", " + + GetOperExpr(op, op.OperandB) + ", " + + GetOperExpr(op, op.OperandC) + ")"; } - private string GetClampuExpr(ShaderIrOp Op) + private string GetClampuExpr(ShaderIrOp op) { - return "int(clamp(uint(" + GetOperExpr(Op, Op.OperandA) + "), " + - "uint(" + GetOperExpr(Op, Op.OperandB) + "), " + - "uint(" + GetOperExpr(Op, Op.OperandC) + ")))"; + return "int(clamp(uint(" + GetOperExpr(op, op.OperandA) + "), " + + "uint(" + GetOperExpr(op, op.OperandB) + "), " + + "uint(" + GetOperExpr(op, op.OperandC) + ")))"; } - private string GetCeqExpr(ShaderIrOp Op) => GetBinaryExpr(Op, "=="); + private string GetCeqExpr(ShaderIrOp op) => GetBinaryExpr(op, "=="); - private string GetCequExpr(ShaderIrOp Op) => GetBinaryExprWithNaN(Op, "=="); + private string GetCequExpr(ShaderIrOp op) => GetBinaryExprWithNaN(op, "=="); - private string GetCgeExpr(ShaderIrOp Op) => GetBinaryExpr(Op, ">="); + private string GetCgeExpr(ShaderIrOp op) => GetBinaryExpr(op, ">="); - private string GetCgeuExpr(ShaderIrOp Op) => GetBinaryExprWithNaN(Op, ">="); + private string GetCgeuExpr(ShaderIrOp op) => GetBinaryExprWithNaN(op, ">="); - private string GetCgtExpr(ShaderIrOp Op) => GetBinaryExpr(Op, ">"); + private string GetCgtExpr(ShaderIrOp op) => GetBinaryExpr(op, ">"); - private string GetCgtuExpr(ShaderIrOp Op) => GetBinaryExprWithNaN(Op, ">"); + private string GetCgtuExpr(ShaderIrOp op) => GetBinaryExprWithNaN(op, ">"); - private string GetCleExpr(ShaderIrOp Op) => GetBinaryExpr(Op, "<="); + private string GetCleExpr(ShaderIrOp op) => GetBinaryExpr(op, "<="); - private string GetCleuExpr(ShaderIrOp Op) => GetBinaryExprWithNaN(Op, "<="); + private string GetCleuExpr(ShaderIrOp op) => GetBinaryExprWithNaN(op, "<="); - private string GetCltExpr(ShaderIrOp Op) => GetBinaryExpr(Op, "<"); + private string GetCltExpr(ShaderIrOp op) => GetBinaryExpr(op, "<"); - private string GetCltuExpr(ShaderIrOp Op) => GetBinaryExprWithNaN(Op, "<"); + private string GetCltuExpr(ShaderIrOp op) => GetBinaryExprWithNaN(op, "<"); - private string GetCnanExpr(ShaderIrOp Op) => GetUnaryCall(Op, "isnan"); + private string GetCnanExpr(ShaderIrOp op) => GetUnaryCall(op, "isnan"); - private string GetCneExpr(ShaderIrOp Op) => GetBinaryExpr(Op, "!="); + private string GetCneExpr(ShaderIrOp op) => GetBinaryExpr(op, "!="); - private string GetCutExpr(ShaderIrOp Op) => "EndPrimitive()"; + private string GetCutExpr(ShaderIrOp op) => "EndPrimitive()"; - private string GetCneuExpr(ShaderIrOp Op) => GetBinaryExprWithNaN(Op, "!="); + private string GetCneuExpr(ShaderIrOp op) => GetBinaryExprWithNaN(op, "!="); - private string GetCnumExpr(ShaderIrOp Op) => GetUnaryCall(Op, "!isnan"); + private string GetCnumExpr(ShaderIrOp op) => GetUnaryCall(op, "!isnan"); - private string GetExitExpr(ShaderIrOp Op) => "return 0u"; + private string GetExitExpr(ShaderIrOp op) => "return 0u"; - private string GetFcosExpr(ShaderIrOp Op) => GetUnaryCall(Op, "cos"); + private string GetFcosExpr(ShaderIrOp op) => GetUnaryCall(op, "cos"); - private string GetFex2Expr(ShaderIrOp Op) => GetUnaryCall(Op, "exp2"); + private string GetFex2Expr(ShaderIrOp op) => GetUnaryCall(op, "exp2"); - private string GetFfmaExpr(ShaderIrOp Op) => GetTernaryExpr(Op, "*", "+"); + private string GetFfmaExpr(ShaderIrOp op) => GetTernaryExpr(op, "*", "+"); - private string GetFclampExpr(ShaderIrOp Op) => GetTernaryCall(Op, "clamp"); + private string GetFclampExpr(ShaderIrOp op) => GetTernaryCall(op, "clamp"); - private string GetFlg2Expr(ShaderIrOp Op) => GetUnaryCall(Op, "log2"); + private string GetFlg2Expr(ShaderIrOp op) => GetUnaryCall(op, "log2"); - private string GetFloorExpr(ShaderIrOp Op) => GetUnaryCall(Op, "floor"); + private string GetFloorExpr(ShaderIrOp op) => GetUnaryCall(op, "floor"); - private string GetFrcpExpr(ShaderIrOp Op) => GetUnaryExpr(Op, "1 / "); + private string GetFrcpExpr(ShaderIrOp op) => GetUnaryExpr(op, "1 / "); - private string GetFrsqExpr(ShaderIrOp Op) => GetUnaryCall(Op, "inversesqrt"); + private string GetFrsqExpr(ShaderIrOp op) => GetUnaryCall(op, "inversesqrt"); - private string GetFsinExpr(ShaderIrOp Op) => GetUnaryCall(Op, "sin"); + private string GetFsinExpr(ShaderIrOp op) => GetUnaryCall(op, "sin"); - private string GetFsqrtExpr(ShaderIrOp Op) => GetUnaryCall(Op, "sqrt"); + private string GetFsqrtExpr(ShaderIrOp op) => GetUnaryCall(op, "sqrt"); - private string GetFtosExpr(ShaderIrOp Op) + private string GetFtosExpr(ShaderIrOp op) { - return "int(" + GetOperExpr(Op, Op.OperandA) + ")"; + return "int(" + GetOperExpr(op, op.OperandA) + ")"; } - private string GetFtouExpr(ShaderIrOp Op) + private string GetFtouExpr(ShaderIrOp op) { - return "int(uint(" + GetOperExpr(Op, Op.OperandA) + "))"; + return "int(uint(" + GetOperExpr(op, op.OperandA) + "))"; } - private string GetIpaExpr(ShaderIrOp Op) + private string GetIpaExpr(ShaderIrOp op) { - ShaderIrMetaIpa Meta = (ShaderIrMetaIpa)Op.MetaData; + ShaderIrMetaIpa meta = (ShaderIrMetaIpa)op.MetaData; - ShaderIrOperAbuf Abuf = (ShaderIrOperAbuf)Op.OperandA; + ShaderIrOperAbuf abuf = (ShaderIrOperAbuf)op.OperandA; - if (Meta.Mode == ShaderIpaMode.Pass) + if (meta.Mode == ShaderIpaMode.Pass) { - int Index = Abuf.Offs >> 4; - int Elem = (Abuf.Offs >> 2) & 3; + int index = abuf.Offs >> 4; + int elem = (abuf.Offs >> 2) & 3; - if (Decl.ShaderType == GalShaderType.Fragment && Index == GlslDecl.GlPositionVec4Index) + if (_decl.ShaderType == GalShaderType.Fragment && index == GlslDecl.GlPositionVec4Index) { - switch (Elem) + switch (elem) { case 0: return "gl_FragCoord.x"; case 1: return "gl_FragCoord.y"; @@ -1144,433 +1144,433 @@ namespace Ryujinx.Graphics.Gal.Shader } } - return GetSrcExpr(Op.OperandA); + return GetSrcExpr(op.OperandA); } - private string GetKilExpr(ShaderIrOp Op) => "discard"; + private string GetKilExpr(ShaderIrOp op) => "discard"; - private string GetLslExpr(ShaderIrOp Op) => GetBinaryExpr(Op, "<<"); - private string GetLsrExpr(ShaderIrOp Op) + private string GetLslExpr(ShaderIrOp op) => GetBinaryExpr(op, "<<"); + private string GetLsrExpr(ShaderIrOp op) { - return "int(uint(" + GetOperExpr(Op, Op.OperandA) + ") >> " + - GetOperExpr(Op, Op.OperandB) + ")"; + return "int(uint(" + GetOperExpr(op, op.OperandA) + ") >> " + + GetOperExpr(op, op.OperandB) + ")"; } - private string GetMaxExpr(ShaderIrOp Op) => GetBinaryCall(Op, "max"); - private string GetMinExpr(ShaderIrOp Op) => GetBinaryCall(Op, "min"); + private string GetMaxExpr(ShaderIrOp op) => GetBinaryCall(op, "max"); + private string GetMinExpr(ShaderIrOp op) => GetBinaryCall(op, "min"); - private string GetMulExpr(ShaderIrOp Op) => GetBinaryExpr(Op, "*"); + private string GetMulExpr(ShaderIrOp op) => GetBinaryExpr(op, "*"); - private string GetNegExpr(ShaderIrOp Op) => GetUnaryExpr(Op, "-"); + private string GetNegExpr(ShaderIrOp op) => GetUnaryExpr(op, "-"); - private string GetNotExpr(ShaderIrOp Op) => GetUnaryExpr(Op, "~"); + private string GetNotExpr(ShaderIrOp op) => GetUnaryExpr(op, "~"); - private string GetOrExpr(ShaderIrOp Op) => GetBinaryExpr(Op, "|"); + private string GetOrExpr(ShaderIrOp op) => GetBinaryExpr(op, "|"); - private string GetStofExpr(ShaderIrOp Op) + private string GetStofExpr(ShaderIrOp op) { - return "float(" + GetOperExpr(Op, Op.OperandA) + ")"; + return "float(" + GetOperExpr(op, op.OperandA) + ")"; } - private string GetSubExpr(ShaderIrOp Op) => GetBinaryExpr(Op, "-"); + private string GetSubExpr(ShaderIrOp op) => GetBinaryExpr(op, "-"); - private string GetTexbExpr(ShaderIrOp Op) + private string GetTexbExpr(ShaderIrOp op) { - ShaderIrMetaTex Meta = (ShaderIrMetaTex)Op.MetaData; + ShaderIrMetaTex meta = (ShaderIrMetaTex)op.MetaData; - if (!Decl.CbTextures.TryGetValue(Op, out ShaderDeclInfo DeclInfo)) + if (!_decl.CbTextures.TryGetValue(op, out ShaderDeclInfo declInfo)) { throw new InvalidOperationException(); } - string Coords = GetTexSamplerCoords(Op); + string coords = GetTexSamplerCoords(op); - string Ch = "rgba".Substring(Meta.Elem, 1); + string ch = "rgba".Substring(meta.Elem, 1); - return GetTextureOperation(Op, DeclInfo.Name, Coords, Ch); + return GetTextureOperation(op, declInfo.Name, coords, ch); } - private string GetTexqExpr(ShaderIrOp Op) + private string GetTexqExpr(ShaderIrOp op) { - ShaderIrMetaTexq Meta = (ShaderIrMetaTexq)Op.MetaData; + ShaderIrMetaTexq meta = (ShaderIrMetaTexq)op.MetaData; - string Ch = "xyzw".Substring(Meta.Elem, 1); + string ch = "xyzw".Substring(meta.Elem, 1); - if (Meta.Info == ShaderTexqInfo.Dimension) + if (meta.Info == ShaderTexqInfo.Dimension) { - string Sampler = GetTexSamplerName(Op); + string sampler = GetTexSamplerName(op); - string Lod = GetOperExpr(Op, Op.OperandA); //??? + string lod = GetOperExpr(op, op.OperandA); //??? - return "textureSize(" + Sampler + ", " + Lod + ")." + Ch; + return "textureSize(" + sampler + ", " + lod + ")." + ch; } else { - throw new NotImplementedException(Meta.Info.ToString()); + throw new NotImplementedException(meta.Info.ToString()); } } - private string GetTexsExpr(ShaderIrOp Op) + private string GetTexsExpr(ShaderIrOp op) { - ShaderIrMetaTex Meta = (ShaderIrMetaTex)Op.MetaData; + ShaderIrMetaTex meta = (ShaderIrMetaTex)op.MetaData; - string Sampler = GetTexSamplerName(Op); + string sampler = GetTexSamplerName(op); - string Coords = GetTexSamplerCoords(Op); + string coords = GetTexSamplerCoords(op); - string Ch = "rgba".Substring(Meta.Elem, 1); + string ch = "rgba".Substring(meta.Elem, 1); - return GetTextureOperation(Op, Sampler, Coords, Ch); + return GetTextureOperation(op, sampler, coords, ch); } - private string GetTld4Expr(ShaderIrOp Op) + private string GetTld4Expr(ShaderIrOp op) { - ShaderIrMetaTex Meta = (ShaderIrMetaTex)Op.MetaData; + ShaderIrMetaTex meta = (ShaderIrMetaTex)op.MetaData; - string Sampler = GetTexSamplerName(Op); + string sampler = GetTexSamplerName(op); - string Coords = GetTexSamplerCoords(Op); + string coords = GetTexSamplerCoords(op); - string Ch = "rgba".Substring(Meta.Elem, 1); + string ch = "rgba".Substring(meta.Elem, 1); - return GetTextureGatherOperation(Op, Sampler, Coords, Ch); + return GetTextureGatherOperation(op, sampler, coords, ch); } // TODO: support AOFFI on non nvidia drivers - private string GetTxlfExpr(ShaderIrOp Op) + private string GetTxlfExpr(ShaderIrOp op) { // TODO: Support all suffixes - ShaderIrMetaTex Meta = (ShaderIrMetaTex)Op.MetaData; + ShaderIrMetaTex meta = (ShaderIrMetaTex)op.MetaData; - TextureInstructionSuffix Suffix = Meta.TextureInstructionSuffix; + TextureInstructionSuffix suffix = meta.TextureInstructionSuffix; - string Sampler = GetTexSamplerName(Op); + string sampler = GetTexSamplerName(op); - string Coords = GetITexSamplerCoords(Op); + string coords = GetITexSamplerCoords(op); - string Ch = "rgba".Substring(Meta.Elem, 1); + string ch = "rgba".Substring(meta.Elem, 1); - string Lod = "0"; + string lod = "0"; - if (Meta.LevelOfDetail != null) + if (meta.LevelOfDetail != null) { - Lod = GetOperExpr(Op, Meta.LevelOfDetail); + lod = GetOperExpr(op, meta.LevelOfDetail); } - if ((Suffix & TextureInstructionSuffix.AOffI) != 0 && IsNvidiaDriver) + if ((suffix & TextureInstructionSuffix.AOffI) != 0 && _isNvidiaDriver) { - string Offset = GetTextureOffset(Meta, GetOperExpr(Op, Meta.Offset)); - return "texelFetchOffset(" + Sampler + ", " + Coords + ", " + Lod + ", " + Offset + ")." + Ch; + string offset = GetTextureOffset(meta, GetOperExpr(op, meta.Offset)); + return "texelFetchOffset(" + sampler + ", " + coords + ", " + lod + ", " + offset + ")." + ch; } - return "texelFetch(" + Sampler + ", " + Coords + ", " + Lod + ")." + Ch; + return "texelFetch(" + sampler + ", " + coords + ", " + lod + ")." + ch; } - private string GetTruncExpr(ShaderIrOp Op) => GetUnaryCall(Op, "trunc"); + private string GetTruncExpr(ShaderIrOp op) => GetUnaryCall(op, "trunc"); - private string GetUtofExpr(ShaderIrOp Op) + private string GetUtofExpr(ShaderIrOp op) { - return "float(uint(" + GetOperExpr(Op, Op.OperandA) + "))"; + return "float(uint(" + GetOperExpr(op, op.OperandA) + "))"; } - private string GetXorExpr(ShaderIrOp Op) => GetBinaryExpr(Op, "^"); + private string GetXorExpr(ShaderIrOp op) => GetBinaryExpr(op, "^"); - private string GetUnaryCall(ShaderIrOp Op, string FuncName) + private string GetUnaryCall(ShaderIrOp op, string funcName) { - return FuncName + "(" + GetOperExpr(Op, Op.OperandA) + ")"; + return funcName + "(" + GetOperExpr(op, op.OperandA) + ")"; } - private string GetBinaryCall(ShaderIrOp Op, string FuncName) + private string GetBinaryCall(ShaderIrOp op, string funcName) { - return FuncName + "(" + GetOperExpr(Op, Op.OperandA) + ", " + - GetOperExpr(Op, Op.OperandB) + ")"; + return funcName + "(" + GetOperExpr(op, op.OperandA) + ", " + + GetOperExpr(op, op.OperandB) + ")"; } - private string GetTernaryCall(ShaderIrOp Op, string FuncName) + private string GetTernaryCall(ShaderIrOp op, string funcName) { - return FuncName + "(" + GetOperExpr(Op, Op.OperandA) + ", " + - GetOperExpr(Op, Op.OperandB) + ", " + - GetOperExpr(Op, Op.OperandC) + ")"; + return funcName + "(" + GetOperExpr(op, op.OperandA) + ", " + + GetOperExpr(op, op.OperandB) + ", " + + GetOperExpr(op, op.OperandC) + ")"; } - private string GetUnaryExpr(ShaderIrOp Op, string Opr) + private string GetUnaryExpr(ShaderIrOp op, string opr) { - return Opr + GetOperExpr(Op, Op.OperandA); + return opr + GetOperExpr(op, op.OperandA); } - private string GetBinaryExpr(ShaderIrOp Op, string Opr) + private string GetBinaryExpr(ShaderIrOp op, string opr) { - return GetOperExpr(Op, Op.OperandA) + " " + Opr + " " + - GetOperExpr(Op, Op.OperandB); + return GetOperExpr(op, op.OperandA) + " " + opr + " " + + GetOperExpr(op, op.OperandB); } - private string GetBinaryExprWithNaN(ShaderIrOp Op, string Opr) + private string GetBinaryExprWithNaN(ShaderIrOp op, string opr) { - string A = GetOperExpr(Op, Op.OperandA); - string B = GetOperExpr(Op, Op.OperandB); + string a = GetOperExpr(op, op.OperandA); + string b = GetOperExpr(op, op.OperandB); - string NaNCheck = - " || isnan(" + A + ")" + - " || isnan(" + B + ")"; + string nanCheck = + " || isnan(" + a + ")" + + " || isnan(" + b + ")"; - return A + " " + Opr + " " + B + NaNCheck; + return a + " " + opr + " " + b + nanCheck; } - private string GetTernaryExpr(ShaderIrOp Op, string Opr1, string Opr2) + private string GetTernaryExpr(ShaderIrOp op, string opr1, string opr2) { - return GetOperExpr(Op, Op.OperandA) + " " + Opr1 + " " + - GetOperExpr(Op, Op.OperandB) + " " + Opr2 + " " + - GetOperExpr(Op, Op.OperandC); + return GetOperExpr(op, op.OperandA) + " " + opr1 + " " + + GetOperExpr(op, op.OperandB) + " " + opr2 + " " + + GetOperExpr(op, op.OperandC); } - private string GetTexSamplerName(ShaderIrOp Op) + private string GetTexSamplerName(ShaderIrOp op) { - ShaderIrOperImm Node = (ShaderIrOperImm)Op.OperandC; + ShaderIrOperImm node = (ShaderIrOperImm)op.OperandC; - int Handle = ((ShaderIrOperImm)Op.OperandC).Value; + int handle = ((ShaderIrOperImm)op.OperandC).Value; - if (!Decl.Textures.TryGetValue(Handle, out ShaderDeclInfo DeclInfo)) + if (!_decl.Textures.TryGetValue(handle, out ShaderDeclInfo declInfo)) { throw new InvalidOperationException(); } - return DeclInfo.Name; + return declInfo.Name; } - private string GetTexSamplerCoords(ShaderIrOp Op) + private string GetTexSamplerCoords(ShaderIrOp op) { - ShaderIrMetaTex Meta = (ShaderIrMetaTex)Op.MetaData; + ShaderIrMetaTex meta = (ShaderIrMetaTex)op.MetaData; - bool HasDepth = (Meta.TextureInstructionSuffix & TextureInstructionSuffix.DC) != 0; + bool hasDepth = (meta.TextureInstructionSuffix & TextureInstructionSuffix.Dc) != 0; - int Coords = ImageUtils.GetCoordsCountTextureTarget(Meta.TextureTarget); + int coords = ImageUtils.GetCoordsCountTextureTarget(meta.TextureTarget); - bool IsArray = ImageUtils.IsArray(Meta.TextureTarget); + bool isArray = ImageUtils.IsArray(meta.TextureTarget); - string GetLastArgument(ShaderIrNode Node) + string GetLastArgument(ShaderIrNode node) { - string Result = GetOperExpr(Op, Node); + string result = GetOperExpr(op, node); // array index is actually an integer so we need to pass it correctly - if (IsArray) + if (isArray) { - Result = "float(floatBitsToInt(" + Result + "))"; + result = "float(floatBitsToInt(" + result + "))"; } - return Result; + return result; } - string LastArgument; - string DepthArgument = ""; + string lastArgument; + string depthArgument = ""; - int VecSize = Coords; - if (HasDepth && Op.Inst != ShaderIrInst.Tld4) + int vecSize = coords; + if (hasDepth && op.Inst != ShaderIrInst.Tld4) { - VecSize++; - DepthArgument = $", {GetOperExpr(Op, Meta.DepthCompare)}"; + vecSize++; + depthArgument = $", {GetOperExpr(op, meta.DepthCompare)}"; } - switch (Coords) + switch (coords) { case 1: - if (HasDepth) + if (hasDepth) { - return $"vec3({GetOperExpr(Op, Meta.Coordinates[0])}, 0.0{DepthArgument})"; + return $"vec3({GetOperExpr(op, meta.Coordinates[0])}, 0.0{depthArgument})"; } - return GetOperExpr(Op, Meta.Coordinates[0]); + return GetOperExpr(op, meta.Coordinates[0]); case 2: - LastArgument = GetLastArgument(Meta.Coordinates[1]); + lastArgument = GetLastArgument(meta.Coordinates[1]); - return $"vec{VecSize}({GetOperExpr(Op, Meta.Coordinates[0])}, {LastArgument}{DepthArgument})"; + return $"vec{vecSize}({GetOperExpr(op, meta.Coordinates[0])}, {lastArgument}{depthArgument})"; case 3: - LastArgument = GetLastArgument(Meta.Coordinates[2]); + lastArgument = GetLastArgument(meta.Coordinates[2]); - return $"vec{VecSize}({GetOperExpr(Op, Meta.Coordinates[0])}, {GetOperExpr(Op, Meta.Coordinates[1])}, {LastArgument}{DepthArgument})"; + return $"vec{vecSize}({GetOperExpr(op, meta.Coordinates[0])}, {GetOperExpr(op, meta.Coordinates[1])}, {lastArgument}{depthArgument})"; case 4: - LastArgument = GetLastArgument(Meta.Coordinates[3]); + lastArgument = GetLastArgument(meta.Coordinates[3]); - return $"vec4({GetOperExpr(Op, Meta.Coordinates[0])}, {GetOperExpr(Op, Meta.Coordinates[1])}, {GetOperExpr(Op, Meta.Coordinates[2])}, {LastArgument}){DepthArgument}"; + return $"vec4({GetOperExpr(op, meta.Coordinates[0])}, {GetOperExpr(op, meta.Coordinates[1])}, {GetOperExpr(op, meta.Coordinates[2])}, {lastArgument}){depthArgument}"; default: throw new InvalidOperationException(); } } - private string GetTextureOffset(ShaderIrMetaTex Meta, string Oper, int Shift = 4, int Mask = 0xF) + private string GetTextureOffset(ShaderIrMetaTex meta, string oper, int shift = 4, int mask = 0xF) { - string GetOffset(string Operation, int Index) + string GetOffset(string operation, int index) { - return $"({Operation} >> {Index * Shift}) & 0x{Mask:x}"; + return $"({operation} >> {index * shift}) & 0x{mask:x}"; } - int Coords = ImageUtils.GetCoordsCountTextureTarget(Meta.TextureTarget); + int coords = ImageUtils.GetCoordsCountTextureTarget(meta.TextureTarget); - if (ImageUtils.IsArray(Meta.TextureTarget)) - Coords -= 1; + if (ImageUtils.IsArray(meta.TextureTarget)) + coords -= 1; - switch (Coords) + switch (coords) { case 1: - return GetOffset(Oper, 0); + return GetOffset(oper, 0); case 2: - return "ivec2(" + GetOffset(Oper, 0) + ", " + GetOffset(Oper, 1) + ")"; + return "ivec2(" + GetOffset(oper, 0) + ", " + GetOffset(oper, 1) + ")"; case 3: - return "ivec3(" + GetOffset(Oper, 0) + ", " + GetOffset(Oper, 1) + ", " + GetOffset(Oper, 2) + ")"; + return "ivec3(" + GetOffset(oper, 0) + ", " + GetOffset(oper, 1) + ", " + GetOffset(oper, 2) + ")"; case 4: - return "ivec4(" + GetOffset(Oper, 0) + ", " + GetOffset(Oper, 1) + ", " + GetOffset(Oper, 2) + ", " + GetOffset(Oper, 3) + ")"; + return "ivec4(" + GetOffset(oper, 0) + ", " + GetOffset(oper, 1) + ", " + GetOffset(oper, 2) + ", " + GetOffset(oper, 3) + ")"; default: throw new InvalidOperationException(); } } // TODO: support AOFFI on non nvidia drivers - private string GetTextureGatherOperation(ShaderIrOp Op, string Sampler, string Coords, string Ch) + private string GetTextureGatherOperation(ShaderIrOp op, string sampler, string coords, string ch) { - ShaderIrMetaTex Meta = (ShaderIrMetaTex)Op.MetaData; + ShaderIrMetaTex meta = (ShaderIrMetaTex)op.MetaData; - TextureInstructionSuffix Suffix = Meta.TextureInstructionSuffix; + TextureInstructionSuffix suffix = meta.TextureInstructionSuffix; - string ChString = "." + Ch; + string chString = "." + ch; - string Comp = Meta.Component.ToString(); + string comp = meta.Component.ToString(); - if ((Suffix & TextureInstructionSuffix.DC) != 0) + if ((suffix & TextureInstructionSuffix.Dc) != 0) { - Comp = GetOperExpr(Op, Meta.DepthCompare); + comp = GetOperExpr(op, meta.DepthCompare); } - if ((Suffix & TextureInstructionSuffix.AOffI) != 0 && IsNvidiaDriver) + if ((suffix & TextureInstructionSuffix.AOffI) != 0 && _isNvidiaDriver) { - string Offset = GetTextureOffset(Meta, "floatBitsToInt((" + GetOperExpr(Op, Meta.Offset) + "))", 8, 0x3F); + string offset = GetTextureOffset(meta, "floatBitsToInt((" + GetOperExpr(op, meta.Offset) + "))", 8, 0x3F); - if ((Suffix & TextureInstructionSuffix.DC) != 0) + if ((suffix & TextureInstructionSuffix.Dc) != 0) { - return "textureGatherOffset(" + Sampler + ", " + Coords + ", " + Comp + ", " + Offset + ")" + ChString; + return "textureGatherOffset(" + sampler + ", " + coords + ", " + comp + ", " + offset + ")" + chString; } - return "textureGatherOffset(" + Sampler + ", " + Coords + ", " + Offset + ", " + Comp + ")" + ChString; + return "textureGatherOffset(" + sampler + ", " + coords + ", " + offset + ", " + comp + ")" + chString; } // TODO: Support PTP - else if ((Suffix & TextureInstructionSuffix.PTP) != 0) + else if ((suffix & TextureInstructionSuffix.Ptp) != 0) { throw new NotImplementedException(); } - return "textureGather(" + Sampler + ", " + Coords + ", " + Comp + ")" + ChString; + return "textureGather(" + sampler + ", " + coords + ", " + comp + ")" + chString; } // TODO: support AOFFI on non nvidia drivers - private string GetTextureOperation(ShaderIrOp Op, string Sampler, string Coords, string Ch) + private string GetTextureOperation(ShaderIrOp op, string sampler, string coords, string ch) { - ShaderIrMetaTex Meta = (ShaderIrMetaTex)Op.MetaData; + ShaderIrMetaTex meta = (ShaderIrMetaTex)op.MetaData; - TextureInstructionSuffix Suffix = Meta.TextureInstructionSuffix; + TextureInstructionSuffix suffix = meta.TextureInstructionSuffix; - string ChString = "." + Ch; + string chString = "." + ch; - if ((Suffix & TextureInstructionSuffix.DC) != 0) + if ((suffix & TextureInstructionSuffix.Dc) != 0) { - ChString = ""; + chString = ""; } // TODO: Support LBA and LLA - if ((Suffix & TextureInstructionSuffix.LZ) != 0) + if ((suffix & TextureInstructionSuffix.Lz) != 0) { - if ((Suffix & TextureInstructionSuffix.AOffI) != 0 && IsNvidiaDriver) + if ((suffix & TextureInstructionSuffix.AOffI) != 0 && _isNvidiaDriver) { - string Offset = GetTextureOffset(Meta, "floatBitsToInt((" + GetOperExpr(Op, Meta.Offset) + "))"); + string offset = GetTextureOffset(meta, "floatBitsToInt((" + GetOperExpr(op, meta.Offset) + "))"); - return "textureLodOffset(" + Sampler + ", " + Coords + ", 0.0, " + Offset + ")" + ChString; + return "textureLodOffset(" + sampler + ", " + coords + ", 0.0, " + offset + ")" + chString; } - return "textureLod(" + Sampler + ", " + Coords + ", 0.0)" + ChString; + return "textureLod(" + sampler + ", " + coords + ", 0.0)" + chString; } - else if ((Suffix & TextureInstructionSuffix.LB) != 0) + else if ((suffix & TextureInstructionSuffix.Lb) != 0) { - if ((Suffix & TextureInstructionSuffix.AOffI) != 0 && IsNvidiaDriver) + if ((suffix & TextureInstructionSuffix.AOffI) != 0 && _isNvidiaDriver) { - string Offset = GetTextureOffset(Meta, "floatBitsToInt((" + GetOperExpr(Op, Meta.Offset) + "))"); + string offset = GetTextureOffset(meta, "floatBitsToInt((" + GetOperExpr(op, meta.Offset) + "))"); - return "textureOffset(" + Sampler + ", " + Coords + ", " + Offset + ", " + GetOperExpr(Op, Meta.LevelOfDetail) + ")" + ChString; + return "textureOffset(" + sampler + ", " + coords + ", " + offset + ", " + GetOperExpr(op, meta.LevelOfDetail) + ")" + chString; } - return "texture(" + Sampler + ", " + Coords + ", " + GetOperExpr(Op, Meta.LevelOfDetail) + ")" + ChString; + return "texture(" + sampler + ", " + coords + ", " + GetOperExpr(op, meta.LevelOfDetail) + ")" + chString; } - else if ((Suffix & TextureInstructionSuffix.LL) != 0) + else if ((suffix & TextureInstructionSuffix.Ll) != 0) { - if ((Suffix & TextureInstructionSuffix.AOffI) != 0 && IsNvidiaDriver) + if ((suffix & TextureInstructionSuffix.AOffI) != 0 && _isNvidiaDriver) { - string Offset = GetTextureOffset(Meta, "floatBitsToInt((" + GetOperExpr(Op, Meta.Offset) + "))"); + string offset = GetTextureOffset(meta, "floatBitsToInt((" + GetOperExpr(op, meta.Offset) + "))"); - return "textureLodOffset(" + Sampler + ", " + Coords + ", " + GetOperExpr(Op, Meta.LevelOfDetail) + ", " + Offset + ")" + ChString; + return "textureLodOffset(" + sampler + ", " + coords + ", " + GetOperExpr(op, meta.LevelOfDetail) + ", " + offset + ")" + chString; } - return "textureLod(" + Sampler + ", " + Coords + ", " + GetOperExpr(Op, Meta.LevelOfDetail) + ")" + ChString; + return "textureLod(" + sampler + ", " + coords + ", " + GetOperExpr(op, meta.LevelOfDetail) + ")" + chString; } - else if ((Suffix & TextureInstructionSuffix.AOffI) != 0 && IsNvidiaDriver) + else if ((suffix & TextureInstructionSuffix.AOffI) != 0 && _isNvidiaDriver) { - string Offset = GetTextureOffset(Meta, "floatBitsToInt((" + GetOperExpr(Op, Meta.Offset) + "))"); + string offset = GetTextureOffset(meta, "floatBitsToInt((" + GetOperExpr(op, meta.Offset) + "))"); - return "textureOffset(" + Sampler + ", " + Coords + ", " + Offset + ")" + ChString; + return "textureOffset(" + sampler + ", " + coords + ", " + offset + ")" + chString; } else { - return "texture(" + Sampler + ", " + Coords + ")" + ChString; + return "texture(" + sampler + ", " + coords + ")" + chString; } - throw new NotImplementedException($"Texture Suffix {Meta.TextureInstructionSuffix} is not implemented"); + throw new NotImplementedException($"Texture Suffix {meta.TextureInstructionSuffix} is not implemented"); } - private string GetITexSamplerCoords(ShaderIrOp Op) + private string GetITexSamplerCoords(ShaderIrOp op) { - ShaderIrMetaTex Meta = (ShaderIrMetaTex)Op.MetaData; + ShaderIrMetaTex meta = (ShaderIrMetaTex)op.MetaData; - switch (ImageUtils.GetCoordsCountTextureTarget(Meta.TextureTarget)) + switch (ImageUtils.GetCoordsCountTextureTarget(meta.TextureTarget)) { case 1: - return GetOperExpr(Op, Meta.Coordinates[0]); + return GetOperExpr(op, meta.Coordinates[0]); case 2: - return "ivec2(" + GetOperExpr(Op, Meta.Coordinates[0]) + ", " + GetOperExpr(Op, Meta.Coordinates[1]) + ")"; + return "ivec2(" + GetOperExpr(op, meta.Coordinates[0]) + ", " + GetOperExpr(op, meta.Coordinates[1]) + ")"; case 3: - return "ivec3(" + GetOperExpr(Op, Meta.Coordinates[0]) + ", " + GetOperExpr(Op, Meta.Coordinates[1]) + ", " + GetOperExpr(Op, Meta.Coordinates[2]) + ")"; + return "ivec3(" + GetOperExpr(op, meta.Coordinates[0]) + ", " + GetOperExpr(op, meta.Coordinates[1]) + ", " + GetOperExpr(op, meta.Coordinates[2]) + ")"; default: throw new InvalidOperationException(); } } - private string GetOperExpr(ShaderIrOp Op, ShaderIrNode Oper) + private string GetOperExpr(ShaderIrOp op, ShaderIrNode oper) { - return GetExprWithCast(Op, Oper, GetSrcExpr(Oper)); + return GetExprWithCast(op, oper, GetSrcExpr(oper)); } - private static string GetExprWithCast(ShaderIrNode Dst, ShaderIrNode Src, string Expr) + private static string GetExprWithCast(ShaderIrNode dst, ShaderIrNode src, string expr) { //Note: The "DstType" (of the cast) is the type that the operation //uses on the source operands, while the "SrcType" is the destination //type of the operand result (if it is a operation) or just the type //of the variable for registers/uniforms/attributes. - OperType DstType = GetSrcNodeType(Dst); - OperType SrcType = GetDstNodeType(Src); + OperType dstType = GetSrcNodeType(dst); + OperType srcType = GetDstNodeType(src); - if (DstType != SrcType) + if (dstType != srcType) { //Check for invalid casts //(like bool to int/float and others). - if (SrcType != OperType.F32 && - SrcType != OperType.I32) + if (srcType != OperType.F32 && + srcType != OperType.I32) { throw new InvalidOperationException(); } - switch (Src) + switch (src) { - case ShaderIrOperGpr Gpr: + case ShaderIrOperGpr gpr: { //When the Gpr is ZR, just return the 0 value directly, //since the float encoding for 0 is 0. - if (Gpr.IsConst) + if (gpr.IsConst) { return "0"; } @@ -1578,37 +1578,37 @@ namespace Ryujinx.Graphics.Gal.Shader } } - switch (DstType) + switch (dstType) { - case OperType.F32: Expr = "intBitsToFloat(" + Expr + ")"; break; - case OperType.I32: Expr = "floatBitsToInt(" + Expr + ")"; break; + case OperType.F32: expr = "intBitsToFloat(" + expr + ")"; break; + case OperType.I32: expr = "floatBitsToInt(" + expr + ")"; break; } } - return Expr; + return expr; } - private static string GetIntConst(int Value) + private static string GetIntConst(int value) { - string Expr = Value.ToString(CultureInfo.InvariantCulture); + string expr = value.ToString(CultureInfo.InvariantCulture); - return Value < 0 ? "(" + Expr + ")" : Expr; + return value < 0 ? "(" + expr + ")" : expr; } - private static string GetFloatConst(float Value) + private static string GetFloatConst(float value) { - string Expr = Value.ToString(CultureInfo.InvariantCulture); + string expr = value.ToString(CultureInfo.InvariantCulture); - return Value < 0 ? "(" + Expr + ")" : Expr; + return value < 0 ? "(" + expr + ")" : expr; } - private static OperType GetDstNodeType(ShaderIrNode Node) + private static OperType GetDstNodeType(ShaderIrNode node) { //Special case instructions with the result type different //from the input types (like integer <-> float conversion) here. - if (Node is ShaderIrOp Op) + if (node is ShaderIrOp op) { - switch (Op.Inst) + switch (op.Inst) { case ShaderIrInst.Stof: case ShaderIrInst.Txlf: @@ -1621,54 +1621,54 @@ namespace Ryujinx.Graphics.Gal.Shader } } - return GetSrcNodeType(Node); + return GetSrcNodeType(node); } - private static OperType GetSrcNodeType(ShaderIrNode Node) + private static OperType GetSrcNodeType(ShaderIrNode node) { - switch (Node) + switch (node) { - case ShaderIrOperAbuf Abuf: - return Abuf.Offs == GlslDecl.LayerAttr || - Abuf.Offs == GlslDecl.InstanceIdAttr || - Abuf.Offs == GlslDecl.VertexIdAttr || - Abuf.Offs == GlslDecl.FaceAttr + case ShaderIrOperAbuf abuf: + return abuf.Offs == GlslDecl.LayerAttr || + abuf.Offs == GlslDecl.InstanceIdAttr || + abuf.Offs == GlslDecl.VertexIdAttr || + abuf.Offs == GlslDecl.FaceAttr ? OperType.I32 : OperType.F32; - case ShaderIrOperCbuf Cbuf: return OperType.F32; - case ShaderIrOperGpr Gpr: return OperType.F32; - case ShaderIrOperImm Imm: return OperType.I32; - case ShaderIrOperImmf Immf: return OperType.F32; - case ShaderIrOperPred Pred: return OperType.Bool; + case ShaderIrOperCbuf cbuf: return OperType.F32; + case ShaderIrOperGpr gpr: return OperType.F32; + case ShaderIrOperImm imm: return OperType.I32; + case ShaderIrOperImmf immf: return OperType.F32; + case ShaderIrOperPred pred: return OperType.Bool; - case ShaderIrOp Op: - if (Op.Inst > ShaderIrInst.B_Start && - Op.Inst < ShaderIrInst.B_End) + case ShaderIrOp op: + if (op.Inst > ShaderIrInst.B_Start && + op.Inst < ShaderIrInst.B_End) { return OperType.Bool; } - else if (Op.Inst > ShaderIrInst.F_Start && - Op.Inst < ShaderIrInst.F_End) + else if (op.Inst > ShaderIrInst.F_Start && + op.Inst < ShaderIrInst.F_End) { return OperType.F32; } - else if (Op.Inst > ShaderIrInst.I_Start && - Op.Inst < ShaderIrInst.I_End) + else if (op.Inst > ShaderIrInst.I_Start && + op.Inst < ShaderIrInst.I_End) { return OperType.I32; } break; } - throw new ArgumentException(nameof(Node)); + throw new ArgumentException(nameof(node)); } - private static string GetBlockPosition(ShaderIrBlock Block) + private static string GetBlockPosition(ShaderIrBlock block) { - if (Block != null) + if (block != null) { - return "0x" + Block.Position.ToString("x8") + "u"; + return "0x" + block.Position.ToString("x8") + "u"; } else { diff --git a/Ryujinx.Graphics/Gal/Shader/GlslProgram.cs b/Ryujinx.Graphics/Gal/Shader/GlslProgram.cs index a7af05ae..be8555d5 100644 --- a/Ryujinx.Graphics/Gal/Shader/GlslProgram.cs +++ b/Ryujinx.Graphics/Gal/Shader/GlslProgram.cs @@ -10,13 +10,13 @@ namespace Ryujinx.Graphics.Gal.Shader public IEnumerable<ShaderDeclInfo> Uniforms { get; private set; } public GlslProgram( - string Code, - IEnumerable<ShaderDeclInfo> Textures, - IEnumerable<ShaderDeclInfo> Uniforms) + string code, + IEnumerable<ShaderDeclInfo> textures, + IEnumerable<ShaderDeclInfo> uniforms) { - this.Code = Code; - this.Textures = Textures; - this.Uniforms = Uniforms; + Code = code; + Textures = textures; + Uniforms = uniforms; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeAlu.cs b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeAlu.cs index 469092a2..f935be74 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeAlu.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeAlu.cs @@ -14,1138 +14,1138 @@ namespace Ryujinx.Graphics.Gal.Shader MergeH1 } - public static void Bfe_C(ShaderIrBlock Block, long OpCode, int Position) + public static void Bfe_C(ShaderIrBlock block, long opCode, int position) { - EmitBfe(Block, OpCode, ShaderOper.CR); + EmitBfe(block, opCode, ShaderOper.Cr); } - public static void Bfe_I(ShaderIrBlock Block, long OpCode, int Position) + public static void Bfe_I(ShaderIrBlock block, long opCode, int position) { - EmitBfe(Block, OpCode, ShaderOper.Imm); + EmitBfe(block, opCode, ShaderOper.Imm); } - public static void Bfe_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Bfe_R(ShaderIrBlock block, long opCode, int position) { - EmitBfe(Block, OpCode, ShaderOper.RR); + EmitBfe(block, opCode, ShaderOper.Rr); } - public static void Fadd_C(ShaderIrBlock Block, long OpCode, int Position) + public static void Fadd_C(ShaderIrBlock block, long opCode, int position) { - EmitFadd(Block, OpCode, ShaderOper.CR); + EmitFadd(block, opCode, ShaderOper.Cr); } - public static void Fadd_I(ShaderIrBlock Block, long OpCode, int Position) + public static void Fadd_I(ShaderIrBlock block, long opCode, int position) { - EmitFadd(Block, OpCode, ShaderOper.Immf); + EmitFadd(block, opCode, ShaderOper.Immf); } - public static void Fadd_I32(ShaderIrBlock Block, long OpCode, int Position) + public static void Fadd_I32(ShaderIrBlock block, long opCode, int position) { - ShaderIrNode OperA = OpCode.Gpr8(); - ShaderIrNode OperB = OpCode.Immf32_20(); + ShaderIrNode operA = opCode.Gpr8(); + ShaderIrNode operB = opCode.Immf32_20(); - bool NegB = OpCode.Read(53); - bool AbsA = OpCode.Read(54); - bool NegA = OpCode.Read(56); - bool AbsB = OpCode.Read(57); + bool negB = opCode.Read(53); + bool absA = opCode.Read(54); + bool negA = opCode.Read(56); + bool absB = opCode.Read(57); - OperA = GetAluFabsFneg(OperA, AbsA, NegA); - OperB = GetAluFabsFneg(OperB, AbsB, NegB); + operA = GetAluFabsFneg(operA, absA, negA); + operB = GetAluFabsFneg(operB, absB, negB); - ShaderIrOp Op = new ShaderIrOp(ShaderIrInst.Fadd, OperA, OperB); + ShaderIrOp op = new ShaderIrOp(ShaderIrInst.Fadd, operA, operB); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(opCode.Gpr0(), op))); } - public static void Fadd_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Fadd_R(ShaderIrBlock block, long opCode, int position) { - EmitFadd(Block, OpCode, ShaderOper.RR); + EmitFadd(block, opCode, ShaderOper.Rr); } - public static void Ffma_CR(ShaderIrBlock Block, long OpCode, int Position) + public static void Ffma_CR(ShaderIrBlock block, long opCode, int position) { - EmitFfma(Block, OpCode, ShaderOper.CR); + EmitFfma(block, opCode, ShaderOper.Cr); } - public static void Ffma_I(ShaderIrBlock Block, long OpCode, int Position) + public static void Ffma_I(ShaderIrBlock block, long opCode, int position) { - EmitFfma(Block, OpCode, ShaderOper.Immf); + EmitFfma(block, opCode, ShaderOper.Immf); } - public static void Ffma_RC(ShaderIrBlock Block, long OpCode, int Position) + public static void Ffma_RC(ShaderIrBlock block, long opCode, int position) { - EmitFfma(Block, OpCode, ShaderOper.RC); + EmitFfma(block, opCode, ShaderOper.Rc); } - public static void Ffma_RR(ShaderIrBlock Block, long OpCode, int Position) + public static void Ffma_RR(ShaderIrBlock block, long opCode, int position) { - EmitFfma(Block, OpCode, ShaderOper.RR); + EmitFfma(block, opCode, ShaderOper.Rr); } - public static void Fmnmx_C(ShaderIrBlock Block, long OpCode, int Position) + public static void Fmnmx_C(ShaderIrBlock block, long opCode, int position) { - EmitFmnmx(Block, OpCode, ShaderOper.CR); + EmitFmnmx(block, opCode, ShaderOper.Cr); } - public static void Fmnmx_I(ShaderIrBlock Block, long OpCode, int Position) + public static void Fmnmx_I(ShaderIrBlock block, long opCode, int position) { - EmitFmnmx(Block, OpCode, ShaderOper.Immf); + EmitFmnmx(block, opCode, ShaderOper.Immf); } - public static void Fmnmx_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Fmnmx_R(ShaderIrBlock block, long opCode, int position) { - EmitFmnmx(Block, OpCode, ShaderOper.RR); + EmitFmnmx(block, opCode, ShaderOper.Rr); } - public static void Fmul_I32(ShaderIrBlock Block, long OpCode, int Position) + public static void Fmul_I32(ShaderIrBlock block, long opCode, int position) { - ShaderIrNode OperA = OpCode.Gpr8(); - ShaderIrNode OperB = OpCode.Immf32_20(); + ShaderIrNode operA = opCode.Gpr8(); + ShaderIrNode operB = opCode.Immf32_20(); - ShaderIrOp Op = new ShaderIrOp(ShaderIrInst.Fmul, OperA, OperB); + ShaderIrOp op = new ShaderIrOp(ShaderIrInst.Fmul, operA, operB); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(opCode.Gpr0(), op))); } - public static void Fmul_C(ShaderIrBlock Block, long OpCode, int Position) + public static void Fmul_C(ShaderIrBlock block, long opCode, int position) { - EmitFmul(Block, OpCode, ShaderOper.CR); + EmitFmul(block, opCode, ShaderOper.Cr); } - public static void Fmul_I(ShaderIrBlock Block, long OpCode, int Position) + public static void Fmul_I(ShaderIrBlock block, long opCode, int position) { - EmitFmul(Block, OpCode, ShaderOper.Immf); + EmitFmul(block, opCode, ShaderOper.Immf); } - public static void Fmul_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Fmul_R(ShaderIrBlock block, long opCode, int position) { - EmitFmul(Block, OpCode, ShaderOper.RR); + EmitFmul(block, opCode, ShaderOper.Rr); } - public static void Fset_C(ShaderIrBlock Block, long OpCode, int Position) + public static void Fset_C(ShaderIrBlock block, long opCode, int position) { - EmitFset(Block, OpCode, ShaderOper.CR); + EmitFset(block, opCode, ShaderOper.Cr); } - public static void Fset_I(ShaderIrBlock Block, long OpCode, int Position) + public static void Fset_I(ShaderIrBlock block, long opCode, int position) { - EmitFset(Block, OpCode, ShaderOper.Immf); + EmitFset(block, opCode, ShaderOper.Immf); } - public static void Fset_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Fset_R(ShaderIrBlock block, long opCode, int position) { - EmitFset(Block, OpCode, ShaderOper.RR); + EmitFset(block, opCode, ShaderOper.Rr); } - public static void Fsetp_C(ShaderIrBlock Block, long OpCode, int Position) + public static void Fsetp_C(ShaderIrBlock block, long opCode, int position) { - EmitFsetp(Block, OpCode, ShaderOper.CR); + EmitFsetp(block, opCode, ShaderOper.Cr); } - public static void Fsetp_I(ShaderIrBlock Block, long OpCode, int Position) + public static void Fsetp_I(ShaderIrBlock block, long opCode, int position) { - EmitFsetp(Block, OpCode, ShaderOper.Immf); + EmitFsetp(block, opCode, ShaderOper.Immf); } - public static void Fsetp_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Fsetp_R(ShaderIrBlock block, long opCode, int position) { - EmitFsetp(Block, OpCode, ShaderOper.RR); + EmitFsetp(block, opCode, ShaderOper.Rr); } - public static void Hadd2_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Hadd2_R(ShaderIrBlock block, long opCode, int position) { - EmitBinaryHalfOp(Block, OpCode, ShaderIrInst.Fadd); + EmitBinaryHalfOp(block, opCode, ShaderIrInst.Fadd); } - public static void Hmul2_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Hmul2_R(ShaderIrBlock block, long opCode, int position) { - EmitBinaryHalfOp(Block, OpCode, ShaderIrInst.Fmul); + EmitBinaryHalfOp(block, opCode, ShaderIrInst.Fmul); } - public static void Iadd_C(ShaderIrBlock Block, long OpCode, int Position) + public static void Iadd_C(ShaderIrBlock block, long opCode, int position) { - EmitIadd(Block, OpCode, ShaderOper.CR); + EmitIadd(block, opCode, ShaderOper.Cr); } - public static void Iadd_I(ShaderIrBlock Block, long OpCode, int Position) + public static void Iadd_I(ShaderIrBlock block, long opCode, int position) { - EmitIadd(Block, OpCode, ShaderOper.Imm); + EmitIadd(block, opCode, ShaderOper.Imm); } - public static void Iadd_I32(ShaderIrBlock Block, long OpCode, int Position) + public static void Iadd_I32(ShaderIrBlock block, long opCode, int position) { - ShaderIrNode OperA = OpCode.Gpr8(); - ShaderIrNode OperB = OpCode.Imm32_20(); + ShaderIrNode operA = opCode.Gpr8(); + ShaderIrNode operB = opCode.Imm32_20(); - bool NegA = OpCode.Read(56); + 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(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(opCode.Gpr0(), op))); } - public static void Iadd_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Iadd_R(ShaderIrBlock block, long opCode, int position) { - EmitIadd(Block, OpCode, ShaderOper.RR); + EmitIadd(block, opCode, ShaderOper.Rr); } - public static void Iadd3_C(ShaderIrBlock Block, long OpCode, int Position) + public static void Iadd3_C(ShaderIrBlock block, long opCode, int position) { - EmitIadd3(Block, OpCode, ShaderOper.CR); + EmitIadd3(block, opCode, ShaderOper.Cr); } - public static void Iadd3_I(ShaderIrBlock Block, long OpCode, int Position) + public static void Iadd3_I(ShaderIrBlock block, long opCode, int position) { - EmitIadd3(Block, OpCode, ShaderOper.Imm); + EmitIadd3(block, opCode, ShaderOper.Imm); } - public static void Iadd3_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Iadd3_R(ShaderIrBlock block, long opCode, int position) { - EmitIadd3(Block, OpCode, ShaderOper.RR); + EmitIadd3(block, opCode, ShaderOper.Rr); } - public static void Imnmx_C(ShaderIrBlock Block, long OpCode, int Position) + public static void Imnmx_C(ShaderIrBlock block, long opCode, int position) { - EmitImnmx(Block, OpCode, ShaderOper.CR); + EmitImnmx(block, opCode, ShaderOper.Cr); } - public static void Imnmx_I(ShaderIrBlock Block, long OpCode, int Position) + public static void Imnmx_I(ShaderIrBlock block, long opCode, int position) { - EmitImnmx(Block, OpCode, ShaderOper.Imm); + EmitImnmx(block, opCode, ShaderOper.Imm); } - public static void Imnmx_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Imnmx_R(ShaderIrBlock block, long opCode, int position) { - EmitImnmx(Block, OpCode, ShaderOper.RR); + EmitImnmx(block, opCode, ShaderOper.Rr); } - public static void Ipa(ShaderIrBlock Block, long OpCode, int Position) + public static void Ipa(ShaderIrBlock block, long opCode, int position) { - ShaderIrNode OperA = OpCode.Abuf28(); - ShaderIrNode OperB = OpCode.Gpr20(); + ShaderIrNode operA = opCode.Abuf28(); + ShaderIrNode operB = opCode.Gpr20(); - ShaderIpaMode Mode = (ShaderIpaMode)(OpCode.Read(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(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(opCode.Gpr0(), op))); } - public static void Iscadd_C(ShaderIrBlock Block, long OpCode, int Position) + public static void Iscadd_C(ShaderIrBlock block, long opCode, int position) { - EmitIscadd(Block, OpCode, ShaderOper.CR); + EmitIscadd(block, opCode, ShaderOper.Cr); } - public static void Iscadd_I(ShaderIrBlock Block, long OpCode, int Position) + public static void Iscadd_I(ShaderIrBlock block, long opCode, int position) { - EmitIscadd(Block, OpCode, ShaderOper.Imm); + EmitIscadd(block, opCode, ShaderOper.Imm); } - public static void Iscadd_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Iscadd_R(ShaderIrBlock block, long opCode, int position) { - EmitIscadd(Block, OpCode, ShaderOper.RR); + EmitIscadd(block, opCode, ShaderOper.Rr); } - public static void Iset_C(ShaderIrBlock Block, long OpCode, int Position) + public static void Iset_C(ShaderIrBlock block, long opCode, int position) { - EmitIset(Block, OpCode, ShaderOper.CR); + EmitIset(block, opCode, ShaderOper.Cr); } - public static void Iset_I(ShaderIrBlock Block, long OpCode, int Position) + public static void Iset_I(ShaderIrBlock block, long opCode, int position) { - EmitIset(Block, OpCode, ShaderOper.Imm); + EmitIset(block, opCode, ShaderOper.Imm); } - public static void Iset_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Iset_R(ShaderIrBlock block, long opCode, int position) { - EmitIset(Block, OpCode, ShaderOper.RR); + EmitIset(block, opCode, ShaderOper.Rr); } - public static void Isetp_C(ShaderIrBlock Block, long OpCode, int Position) + public static void Isetp_C(ShaderIrBlock block, long opCode, int position) { - EmitIsetp(Block, OpCode, ShaderOper.CR); + EmitIsetp(block, opCode, ShaderOper.Cr); } - public static void Isetp_I(ShaderIrBlock Block, long OpCode, int Position) + public static void Isetp_I(ShaderIrBlock block, long opCode, int position) { - EmitIsetp(Block, OpCode, ShaderOper.Imm); + EmitIsetp(block, opCode, ShaderOper.Imm); } - public static void Isetp_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Isetp_R(ShaderIrBlock block, long opCode, int position) { - EmitIsetp(Block, OpCode, ShaderOper.RR); + EmitIsetp(block, opCode, ShaderOper.Rr); } - public static void Lop_I32(ShaderIrBlock Block, long OpCode, int Position) + public static void Lop_I32(ShaderIrBlock block, long opCode, int position) { - int SubOp = OpCode.Read(53, 3); + int subOp = opCode.Read(53, 3); - bool InvA = OpCode.Read(55); - bool InvB = OpCode.Read(56); + bool invA = opCode.Read(55); + bool invB = opCode.Read(56); - ShaderIrInst Inst = 0; + ShaderIrInst inst = 0; - switch (SubOp) + switch (subOp) { - case 0: Inst = ShaderIrInst.And; break; - case 1: Inst = ShaderIrInst.Or; break; - case 2: Inst = ShaderIrInst.Xor; break; + case 0: inst = ShaderIrInst.And; break; + case 1: inst = ShaderIrInst.Or; break; + case 2: inst = ShaderIrInst.Xor; break; } - ShaderIrNode OperB = GetAluNot(OpCode.Imm32_20(), InvB); + ShaderIrNode operB = GetAluNot(opCode.Imm32_20(), invB); //SubOp == 3 is pass, used by the not instruction //which just moves the inverted register value. - if (SubOp < 3) + if (subOp < 3) { - ShaderIrNode OperA = GetAluNot(OpCode.Gpr8(), InvA); + ShaderIrNode operA = GetAluNot(opCode.Gpr8(), invA); - ShaderIrOp Op = new ShaderIrOp(Inst, OperA, OperB); + ShaderIrOp op = new ShaderIrOp(inst, operA, operB); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(opCode.Gpr0(), op))); } else { - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), OperB))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(opCode.Gpr0(), operB))); } } - public static void Lop_C(ShaderIrBlock Block, long OpCode, int Position) + public static void Lop_C(ShaderIrBlock block, long opCode, int position) { - EmitLop(Block, OpCode, ShaderOper.CR); + EmitLop(block, opCode, ShaderOper.Cr); } - public static void Lop_I(ShaderIrBlock Block, long OpCode, int Position) + public static void Lop_I(ShaderIrBlock block, long opCode, int position) { - EmitLop(Block, OpCode, ShaderOper.Imm); + EmitLop(block, opCode, ShaderOper.Imm); } - public static void Lop_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Lop_R(ShaderIrBlock block, long opCode, int position) { - EmitLop(Block, OpCode, ShaderOper.RR); + EmitLop(block, opCode, ShaderOper.Rr); } - public static void Mufu(ShaderIrBlock Block, long OpCode, int Position) + public static void Mufu(ShaderIrBlock block, long opCode, int position) { - int SubOp = OpCode.Read(20, 0xf); + int subOp = opCode.Read(20, 0xf); - bool AbsA = OpCode.Read(46); - bool NegA = OpCode.Read(48); + bool absA = opCode.Read(46); + bool negA = opCode.Read(48); - ShaderIrInst Inst = 0; + ShaderIrInst inst = 0; - switch (SubOp) + switch (subOp) { - case 0: Inst = ShaderIrInst.Fcos; break; - case 1: Inst = ShaderIrInst.Fsin; break; - case 2: Inst = ShaderIrInst.Fex2; break; - case 3: Inst = ShaderIrInst.Flg2; break; - case 4: Inst = ShaderIrInst.Frcp; break; - case 5: Inst = ShaderIrInst.Frsq; break; - case 8: Inst = ShaderIrInst.Fsqrt; break; - - default: throw new NotImplementedException(SubOp.ToString()); + case 0: inst = ShaderIrInst.Fcos; break; + case 1: inst = ShaderIrInst.Fsin; break; + case 2: inst = ShaderIrInst.Fex2; break; + case 3: inst = ShaderIrInst.Flg2; break; + case 4: inst = ShaderIrInst.Frcp; break; + case 5: inst = ShaderIrInst.Frsq; break; + case 8: inst = ShaderIrInst.Fsqrt; break; + + default: throw new NotImplementedException(subOp.ToString()); } - ShaderIrNode OperA = OpCode.Gpr8(); + ShaderIrNode operA = opCode.Gpr8(); - ShaderIrOp Op = new ShaderIrOp(Inst, GetAluFabsFneg(OperA, AbsA, NegA)); + ShaderIrOp op = new ShaderIrOp(inst, GetAluFabsFneg(operA, absA, negA)); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(opCode.Gpr0(), op))); } - public static void Psetp(ShaderIrBlock Block, long OpCode, int Position) + public static void Psetp(ShaderIrBlock block, long opCode, int position) { - bool NegA = OpCode.Read(15); - bool NegB = OpCode.Read(32); - bool NegP = OpCode.Read(42); + bool negA = opCode.Read(15); + bool negB = opCode.Read(32); + bool negP = opCode.Read(42); - ShaderIrInst LopInst = OpCode.BLop24(); + ShaderIrInst lopInst = opCode.BLop24(); - ShaderIrNode OperA = OpCode.Pred12(); - ShaderIrNode OperB = OpCode.Pred29(); + ShaderIrNode operA = opCode.Pred12(); + ShaderIrNode operB = opCode.Pred29(); - if (NegA) + if (negA) { - OperA = new ShaderIrOp(ShaderIrInst.Bnot, OperA); + operA = new ShaderIrOp(ShaderIrInst.Bnot, operA); } - if (NegB) + if (negB) { - OperB = new ShaderIrOp(ShaderIrInst.Bnot, OperB); + operB = new ShaderIrOp(ShaderIrInst.Bnot, operB); } - ShaderIrOp Op = new ShaderIrOp(LopInst, OperA, OperB); + ShaderIrOp op = new ShaderIrOp(lopInst, operA, operB); - ShaderIrOperPred P0Node = OpCode.Pred3(); - ShaderIrOperPred P1Node = OpCode.Pred0(); - ShaderIrOperPred P2Node = OpCode.Pred39(); + ShaderIrOperPred p0Node = opCode.Pred3(); + ShaderIrOperPred p1Node = opCode.Pred0(); + ShaderIrOperPred p2Node = opCode.Pred39(); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(P0Node, Op))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(p0Node, op))); - LopInst = OpCode.BLop45(); + lopInst = opCode.BLop45(); - if (LopInst == ShaderIrInst.Band && P1Node.IsConst && P2Node.IsConst) + if (lopInst == ShaderIrInst.Band && p1Node.IsConst && p2Node.IsConst) { return; } - ShaderIrNode P2NNode = P2Node; + ShaderIrNode p2NNode = p2Node; - if (NegP) + if (negP) { - P2NNode = new ShaderIrOp(ShaderIrInst.Bnot, P2NNode); + p2NNode = new ShaderIrOp(ShaderIrInst.Bnot, p2NNode); } - Op = new ShaderIrOp(ShaderIrInst.Bnot, P0Node); + op = new ShaderIrOp(ShaderIrInst.Bnot, p0Node); - Op = new ShaderIrOp(LopInst, Op, P2NNode); + op = new ShaderIrOp(lopInst, op, p2NNode); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(P1Node, Op))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(p1Node, op))); - Op = new ShaderIrOp(LopInst, P0Node, P2NNode); + op = new ShaderIrOp(lopInst, p0Node, p2NNode); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(P0Node, Op))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(p0Node, op))); } - public static void Rro_C(ShaderIrBlock Block, long OpCode, int Position) + public static void Rro_C(ShaderIrBlock block, long opCode, int position) { - EmitRro(Block, OpCode, ShaderOper.CR); + EmitRro(block, opCode, ShaderOper.Cr); } - public static void Rro_I(ShaderIrBlock Block, long OpCode, int Position) + public static void Rro_I(ShaderIrBlock block, long opCode, int position) { - EmitRro(Block, OpCode, ShaderOper.Immf); + EmitRro(block, opCode, ShaderOper.Immf); } - public static void Rro_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Rro_R(ShaderIrBlock block, long opCode, int position) { - EmitRro(Block, OpCode, ShaderOper.RR); + EmitRro(block, opCode, ShaderOper.Rr); } - public static void Shl_C(ShaderIrBlock Block, long OpCode, int Position) + public static void Shl_C(ShaderIrBlock block, long opCode, int position) { - EmitAluBinary(Block, OpCode, ShaderOper.CR, ShaderIrInst.Lsl); + EmitAluBinary(block, opCode, ShaderOper.Cr, ShaderIrInst.Lsl); } - public static void Shl_I(ShaderIrBlock Block, long OpCode, int Position) + public static void Shl_I(ShaderIrBlock block, long opCode, int position) { - EmitAluBinary(Block, OpCode, ShaderOper.Imm, ShaderIrInst.Lsl); + EmitAluBinary(block, opCode, ShaderOper.Imm, ShaderIrInst.Lsl); } - public static void Shl_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Shl_R(ShaderIrBlock block, long opCode, int position) { - EmitAluBinary(Block, OpCode, ShaderOper.RR, ShaderIrInst.Lsl); + EmitAluBinary(block, opCode, ShaderOper.Rr, ShaderIrInst.Lsl); } - public static void Shr_C(ShaderIrBlock Block, long OpCode, int Position) + public static void Shr_C(ShaderIrBlock block, long opCode, int position) { - EmitAluBinary(Block, OpCode, ShaderOper.CR, GetShrInst(OpCode)); + EmitAluBinary(block, opCode, ShaderOper.Cr, GetShrInst(opCode)); } - public static void Shr_I(ShaderIrBlock Block, long OpCode, int Position) + public static void Shr_I(ShaderIrBlock block, long opCode, int position) { - EmitAluBinary(Block, OpCode, ShaderOper.Imm, GetShrInst(OpCode)); + EmitAluBinary(block, opCode, ShaderOper.Imm, GetShrInst(opCode)); } - public static void Shr_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Shr_R(ShaderIrBlock block, long opCode, int position) { - EmitAluBinary(Block, OpCode, ShaderOper.RR, GetShrInst(OpCode)); + EmitAluBinary(block, opCode, ShaderOper.Rr, GetShrInst(opCode)); } - private static ShaderIrInst GetShrInst(long OpCode) + private static ShaderIrInst GetShrInst(long opCode) { - bool Signed = OpCode.Read(48); + 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, int Position) + public static void Vmad(ShaderIrBlock block, long opCode, int position) { - ShaderIrNode OperA = OpCode.Gpr8(); + ShaderIrNode operA = opCode.Gpr8(); - ShaderIrNode OperB; + ShaderIrNode operB; - if (OpCode.Read(50)) + if (opCode.Read(50)) { - OperB = OpCode.Gpr20(); + operB = opCode.Gpr20(); } else { - OperB = OpCode.Imm19_20(); + operB = opCode.Imm19_20(); } - ShaderIrOperGpr OperC = OpCode.Gpr39(); + 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 = OpCode.Read(51, 3); + int shr = opCode.Read(51, 3); - if (Shr != 0) + if (shr != 0) { - int Shift = (Shr == 2) ? 15 : 7; + int shift = (shr == 2) ? 15 : 7; - Final = new ShaderIrOp(ShaderIrInst.Lsr, Final, new ShaderIrOperImm(Shift)); + final = new ShaderIrOp(ShaderIrInst.Lsr, final, new ShaderIrOperImm(shift)); } - 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(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Final))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(opCode.Gpr0(), final))); } - public static void Xmad_CR(ShaderIrBlock Block, long OpCode, int Position) + public static void Xmad_CR(ShaderIrBlock block, long opCode, int position) { - EmitXmad(Block, OpCode, ShaderOper.CR); + EmitXmad(block, opCode, ShaderOper.Cr); } - public static void Xmad_I(ShaderIrBlock Block, long OpCode, int Position) + public static void Xmad_I(ShaderIrBlock block, long opCode, int position) { - EmitXmad(Block, OpCode, ShaderOper.Imm); + EmitXmad(block, opCode, ShaderOper.Imm); } - public static void Xmad_RC(ShaderIrBlock Block, long OpCode, int Position) + public static void Xmad_RC(ShaderIrBlock block, long opCode, int position) { - EmitXmad(Block, OpCode, ShaderOper.RC); + EmitXmad(block, opCode, ShaderOper.Rc); } - public static void Xmad_RR(ShaderIrBlock Block, long OpCode, int Position) + public static void Xmad_RR(ShaderIrBlock block, long opCode, int position) { - EmitXmad(Block, OpCode, ShaderOper.RR); + EmitXmad(block, opCode, ShaderOper.Rr); } private static void EmitAluBinary( - ShaderIrBlock Block, - long OpCode, - ShaderOper Oper, - ShaderIrInst Inst) + ShaderIrBlock block, + long opCode, + ShaderOper oper, + ShaderIrInst inst) { - ShaderIrNode OperA = OpCode.Gpr8(), OperB; + ShaderIrNode operA = opCode.Gpr8(), operB; - switch (Oper) + switch (oper) { - case ShaderOper.CR: OperB = OpCode.Cbuf34(); break; - case ShaderOper.Imm: OperB = OpCode.Imm19_20(); break; - case ShaderOper.RR: OperB = OpCode.Gpr20(); break; + case ShaderOper.Cr: operB = opCode.Cbuf34(); break; + case ShaderOper.Imm: operB = opCode.Imm19_20(); 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(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op))); + 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) { //TODO: Handle the case where position + length //is greater than the word size, in this case the sign bit //needs to be replicated to fill the remaining space. - bool NegB = OpCode.Read(48); - bool NegA = OpCode.Read(49); + bool negB = opCode.Read(48); + bool negA = opCode.Read(49); - ShaderIrNode OperA = OpCode.Gpr8(), OperB; + ShaderIrNode operA = opCode.Gpr8(), operB; - switch (Oper) + switch (oper) { - case ShaderOper.CR: OperB = OpCode.Cbuf34(); break; - case ShaderOper.Imm: OperB = OpCode.Imm19_20(); break; - case ShaderOper.RR: OperB = OpCode.Gpr20(); break; + case ShaderOper.Cr: operB = opCode.Cbuf34(); break; + case ShaderOper.Imm: operB = opCode.Imm19_20(); 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.Read(48); //? + bool signed = opCode.Read(48); //? - if (OperB is ShaderIrOperImm PosLen) + if (operB is ShaderIrOperImm posLen) { - int Position = (PosLen.Value >> 0) & 0xff; - int Length = (PosLen.Value >> 8) & 0xff; + int position = (posLen.Value >> 0) & 0xff; + int length = (posLen.Value >> 8) & 0xff; - int LSh = 32 - (Position + Length); + int lSh = 32 - (position + length); - ShaderIrInst RightShift = Signed + ShaderIrInst rightShift = signed ? ShaderIrInst.Asr : ShaderIrInst.Lsr; - Op = new ShaderIrOp(ShaderIrInst.Lsl, OperA, new ShaderIrOperImm(LSh)); - Op = new ShaderIrOp(RightShift, Op, new ShaderIrOperImm(LSh + Position)); + op = new ShaderIrOp(ShaderIrInst.Lsl, operA, new ShaderIrOperImm(lSh)); + op = new ShaderIrOp(rightShift, op, new ShaderIrOperImm(lSh + position)); } else { - ShaderIrOperImm Shift = new ShaderIrOperImm(8); - ShaderIrOperImm Mask = new ShaderIrOperImm(0xff); + ShaderIrOperImm shift = new ShaderIrOperImm(8); + ShaderIrOperImm mask = new ShaderIrOperImm(0xff); - ShaderIrNode OpPos, OpLen; + ShaderIrNode opPos, opLen; - OpPos = new ShaderIrOp(ShaderIrInst.And, OperB, Mask); - OpLen = new ShaderIrOp(ShaderIrInst.Lsr, OperB, Shift); - OpLen = new ShaderIrOp(ShaderIrInst.And, OpLen, Mask); + opPos = new ShaderIrOp(ShaderIrInst.And, operB, mask); + opLen = new ShaderIrOp(ShaderIrInst.Lsr, operB, shift); + opLen = new ShaderIrOp(ShaderIrInst.And, opLen, mask); - Op = new ShaderIrOp(ShaderIrInst.Lsr, OperA, OpPos); + op = new ShaderIrOp(ShaderIrInst.Lsr, operA, opPos); - Op = ExtendTo32(Op, Signed, OpLen); + op = ExtendTo32(op, signed, opLen); } - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op))); + 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.Read(45); - bool AbsA = OpCode.Read(46); - bool NegA = OpCode.Read(48); - bool AbsB = OpCode.Read(49); - bool Sat = OpCode.Read(50); + bool negB = opCode.Read(45); + bool absA = opCode.Read(46); + bool negA = opCode.Read(48); + bool absB = opCode.Read(49); + bool sat = opCode.Read(50); - ShaderIrNode OperA = OpCode.Gpr8(), OperB; + ShaderIrNode operA = opCode.Gpr8(), operB; - OperA = GetAluFabsFneg(OperA, AbsA, NegA); + operA = GetAluFabsFneg(operA, absA, negA); - switch (Oper) + switch (oper) { - case ShaderOper.CR: OperB = OpCode.Cbuf34(); break; - case ShaderOper.Immf: OperB = OpCode.Immf19_20(); break; - case ShaderOper.RR: OperB = OpCode.Gpr20(); break; + case ShaderOper.Cr: operB = opCode.Cbuf34(); break; + case ShaderOper.Immf: operB = opCode.Immf19_20(); break; + case ShaderOper.Rr: operB = opCode.Gpr20(); break; - default: throw new ArgumentException(nameof(Oper)); + default: throw new ArgumentException(nameof(oper)); } - OperB = GetAluFabsFneg(OperB, AbsB, NegB); + operB = GetAluFabsFneg(operB, absB, negB); - ShaderIrNode Op = new ShaderIrOp(ShaderIrInst.Fadd, OperA, OperB); + ShaderIrNode op = new ShaderIrOp(ShaderIrInst.Fadd, operA, operB); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), GetAluFsat(Op, Sat)))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(opCode.Gpr0(), GetAluFsat(op, sat)))); } - private static void EmitFmul(ShaderIrBlock Block, long OpCode, ShaderOper Oper) + private static void EmitFmul(ShaderIrBlock block, long opCode, ShaderOper oper) { - bool NegB = OpCode.Read(48); - bool Sat = OpCode.Read(50); + bool negB = opCode.Read(48); + bool sat = opCode.Read(50); - ShaderIrNode OperA = OpCode.Gpr8(), OperB; + ShaderIrNode operA = opCode.Gpr8(), operB; - switch (Oper) + switch (oper) { - case ShaderOper.CR: OperB = OpCode.Cbuf34(); break; - case ShaderOper.Immf: OperB = OpCode.Immf19_20(); break; - case ShaderOper.RR: OperB = OpCode.Gpr20(); break; + case ShaderOper.Cr: operB = opCode.Cbuf34(); break; + case ShaderOper.Immf: operB = opCode.Immf19_20(); break; + case ShaderOper.Rr: operB = opCode.Gpr20(); break; - default: throw new ArgumentException(nameof(Oper)); + default: throw new ArgumentException(nameof(oper)); } - OperB = GetAluFneg(OperB, NegB); + operB = GetAluFneg(operB, negB); - ShaderIrNode Op = new ShaderIrOp(ShaderIrInst.Fmul, OperA, OperB); + ShaderIrNode op = new ShaderIrOp(ShaderIrInst.Fmul, operA, operB); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), GetAluFsat(Op, Sat)))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(opCode.Gpr0(), GetAluFsat(op, sat)))); } - private static void EmitFfma(ShaderIrBlock Block, long OpCode, ShaderOper Oper) + private static void EmitFfma(ShaderIrBlock block, long opCode, ShaderOper oper) { - bool NegB = OpCode.Read(48); - bool NegC = OpCode.Read(49); - bool Sat = OpCode.Read(50); + bool negB = opCode.Read(48); + bool negC = opCode.Read(49); + bool sat = opCode.Read(50); - ShaderIrNode OperA = OpCode.Gpr8(), OperB, OperC; + ShaderIrNode operA = opCode.Gpr8(), operB, operC; - switch (Oper) + switch (oper) { - case ShaderOper.CR: OperB = OpCode.Cbuf34(); break; - case ShaderOper.Immf: OperB = OpCode.Immf19_20(); break; - case ShaderOper.RC: OperB = OpCode.Gpr39(); break; - case ShaderOper.RR: OperB = OpCode.Gpr20(); break; + case ShaderOper.Cr: operB = opCode.Cbuf34(); break; + case ShaderOper.Immf: operB = opCode.Immf19_20(); break; + case ShaderOper.Rc: operB = opCode.Gpr39(); break; + case ShaderOper.Rr: operB = opCode.Gpr20(); break; - default: throw new ArgumentException(nameof(Oper)); + default: throw new ArgumentException(nameof(oper)); } - OperB = GetAluFneg(OperB, NegB); + operB = GetAluFneg(operB, negB); - if (Oper == ShaderOper.RC) + if (oper == ShaderOper.Rc) { - OperC = GetAluFneg(OpCode.Cbuf34(), NegC); + operC = GetAluFneg(opCode.Cbuf34(), negC); } else { - OperC = GetAluFneg(OpCode.Gpr39(), 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(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), GetAluFsat(Op, Sat)))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(opCode.Gpr0(), GetAluFsat(op, sat)))); } - private static void EmitIadd(ShaderIrBlock Block, long OpCode, ShaderOper Oper) + private static void EmitIadd(ShaderIrBlock block, long opCode, ShaderOper oper) { - ShaderIrNode OperA = OpCode.Gpr8(); - ShaderIrNode OperB; + ShaderIrNode operA = opCode.Gpr8(); + ShaderIrNode operB; - switch (Oper) + switch (oper) { - case ShaderOper.CR: OperB = OpCode.Cbuf34(); break; - case ShaderOper.Imm: OperB = OpCode.Imm19_20(); break; - case ShaderOper.RR: OperB = OpCode.Gpr20(); break; + case ShaderOper.Cr: operB = opCode.Cbuf34(); break; + case ShaderOper.Imm: operB = opCode.Imm19_20(); break; + case ShaderOper.Rr: operB = opCode.Gpr20(); break; - default: throw new ArgumentException(nameof(Oper)); + default: throw new ArgumentException(nameof(oper)); } - bool NegA = OpCode.Read(49); - bool NegB = OpCode.Read(48); + bool negA = opCode.Read(49); + bool negB = opCode.Read(48); - OperA = GetAluIneg(OperA, NegA); - OperB = GetAluIneg(OperB, NegB); + operA = GetAluIneg(operA, negA); + operB = GetAluIneg(operB, negB); - ShaderIrOp Op = new ShaderIrOp(ShaderIrInst.Add, OperA, OperB); + ShaderIrOp op = new ShaderIrOp(ShaderIrInst.Add, operA, operB); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op))); + 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 = OpCode.Read(37, 3); + int mode = opCode.Read(37, 3); - bool Neg1 = OpCode.Read(51); - bool Neg2 = OpCode.Read(50); - bool Neg3 = OpCode.Read(49); + bool neg1 = opCode.Read(51); + bool neg2 = opCode.Read(50); + bool neg3 = opCode.Read(49); - int Height1 = OpCode.Read(35, 3); - int Height2 = OpCode.Read(33, 3); - int Height3 = OpCode.Read(31, 3); + int height1 = opCode.Read(35, 3); + int height2 = opCode.Read(33, 3); + int height3 = opCode.Read(31, 3); - ShaderIrNode OperB; + ShaderIrNode operB; - switch (Oper) + switch (oper) { - case ShaderOper.CR: OperB = OpCode.Cbuf34(); break; - case ShaderOper.Imm: OperB = OpCode.Imm19_20(); break; - case ShaderOper.RR: OperB = OpCode.Gpr20(); break; + case ShaderOper.Cr: operB = opCode.Cbuf34(); break; + case ShaderOper.Imm: operB = opCode.Imm19_20(); break; + case ShaderOper.Rr: operB = opCode.Gpr20(); break; - default: throw new ArgumentException(nameof(Oper)); + default: throw new ArgumentException(nameof(oper)); } - ShaderIrNode ApplyHeight(ShaderIrNode Src, int Height) + ShaderIrNode ApplyHeight(ShaderIrNode src, int height) { - if (Oper != ShaderOper.RR) + if (oper != ShaderOper.Rr) { - return Src; + return src; } - switch (Height) + switch (height) { - case 0: return Src; - case 1: return new ShaderIrOp(ShaderIrInst.And, Src, new ShaderIrOperImm(0xffff)); - case 2: return new ShaderIrOp(ShaderIrInst.Lsr, Src, new ShaderIrOperImm(16)); + case 0: return src; + case 1: return new ShaderIrOp(ShaderIrInst.And, src, new ShaderIrOperImm(0xffff)); + case 2: return new ShaderIrOp(ShaderIrInst.Lsr, src, new ShaderIrOperImm(16)); default: throw new InvalidOperationException(); } } - ShaderIrNode Src1 = GetAluIneg(ApplyHeight(OpCode.Gpr8(), Height1), Neg1); - ShaderIrNode Src2 = GetAluIneg(ApplyHeight(OperB, Height2), Neg2); - ShaderIrNode Src3 = GetAluIneg(ApplyHeight(OpCode.Gpr39(), Height3), Neg3); + ShaderIrNode src1 = GetAluIneg(ApplyHeight(opCode.Gpr8(), height1), neg1); + ShaderIrNode src2 = GetAluIneg(ApplyHeight(operB, height2), neg2); + ShaderIrNode src3 = GetAluIneg(ApplyHeight(opCode.Gpr39(), height3), neg3); - ShaderIrOp Sum = new ShaderIrOp(ShaderIrInst.Add, Src1, Src2); + ShaderIrOp sum = new ShaderIrOp(ShaderIrInst.Add, src1, src2); - if (Oper == ShaderOper.RR) + if (oper == ShaderOper.Rr) { - switch (Mode) + switch (mode) { - case 1: Sum = new ShaderIrOp(ShaderIrInst.Lsr, Sum, new ShaderIrOperImm(16)); break; - case 2: Sum = new ShaderIrOp(ShaderIrInst.Lsl, Sum, new ShaderIrOperImm(16)); break; + case 1: sum = new ShaderIrOp(ShaderIrInst.Lsr, sum, new ShaderIrOperImm(16)); break; + case 2: sum = new ShaderIrOp(ShaderIrInst.Lsl, sum, new ShaderIrOperImm(16)); break; } } //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 - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), new ShaderIrOp(ShaderIrInst.Add, Sum, Src3)))); + 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.Read(48); - bool NegA = OpCode.Read(49); + bool negB = opCode.Read(48); + bool negA = opCode.Read(49); - ShaderIrNode OperA = OpCode.Gpr8(), OperB; + ShaderIrNode operA = opCode.Gpr8(), operB; - ShaderIrOperImm Scale = OpCode.Imm5_39(); + ShaderIrOperImm scale = opCode.Imm5_39(); - switch (Oper) + switch (oper) { - case ShaderOper.CR: OperB = OpCode.Cbuf34(); break; - case ShaderOper.Imm: OperB = OpCode.Imm19_20(); break; - case ShaderOper.RR: OperB = OpCode.Gpr20(); break; + case ShaderOper.Cr: operB = opCode.Cbuf34(); break; + case ShaderOper.Imm: operB = opCode.Imm19_20(); break; + case ShaderOper.Rr: operB = opCode.Gpr20(); break; - default: throw new ArgumentException(nameof(Oper)); + default: throw new ArgumentException(nameof(oper)); } - OperA = GetAluIneg(OperA, NegA); - OperB = GetAluIneg(OperB, NegB); + operA = GetAluIneg(operA, negA); + operB = GetAluIneg(operB, negB); - ShaderIrOp ScaleOp = new ShaderIrOp(ShaderIrInst.Lsl, OperA, Scale); - ShaderIrOp AddOp = new ShaderIrOp(ShaderIrInst.Add, OperB, ScaleOp); + ShaderIrOp scaleOp = new ShaderIrOp(ShaderIrInst.Lsl, operA, scale); + ShaderIrOp addOp = new ShaderIrOp(ShaderIrInst.Add, operB, scaleOp); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), AddOp))); + 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) { - EmitMnmx(Block, OpCode, true, Oper); + EmitMnmx(block, opCode, true, oper); } - private static void EmitImnmx(ShaderIrBlock Block, long OpCode, ShaderOper Oper) + private static void EmitImnmx(ShaderIrBlock block, long opCode, ShaderOper oper) { - EmitMnmx(Block, OpCode, false, Oper); + EmitMnmx(block, opCode, false, oper); } - 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.Read(45); - bool AbsA = OpCode.Read(46); - bool NegA = OpCode.Read(48); - bool AbsB = OpCode.Read(49); + bool negB = opCode.Read(45); + bool absA = opCode.Read(46); + bool negA = opCode.Read(48); + bool absB = opCode.Read(49); - ShaderIrNode OperA = OpCode.Gpr8(), OperB; + ShaderIrNode operA = opCode.Gpr8(), operB; - if (IsFloat) + if (isFloat) { - OperA = GetAluFabsFneg(OperA, AbsA, NegA); + operA = GetAluFabsFneg(operA, absA, negA); } else { - OperA = GetAluIabsIneg(OperA, AbsA, NegA); + operA = GetAluIabsIneg(operA, absA, negA); } - switch (Oper) + switch (oper) { - case ShaderOper.CR: OperB = OpCode.Cbuf34(); break; - case ShaderOper.Imm: OperB = OpCode.Imm19_20(); break; - case ShaderOper.Immf: OperB = OpCode.Immf19_20(); break; - case ShaderOper.RR: OperB = OpCode.Gpr20(); break; + case ShaderOper.Cr: operB = opCode.Cbuf34(); break; + case ShaderOper.Imm: operB = opCode.Imm19_20(); break; + case ShaderOper.Immf: operB = opCode.Immf19_20(); break; + case ShaderOper.Rr: operB = opCode.Gpr20(); break; - default: throw new ArgumentException(nameof(Oper)); + default: throw new ArgumentException(nameof(oper)); } - if (IsFloat) + if (isFloat) { - OperB = GetAluFabsFneg(OperB, AbsB, NegB); + operB = GetAluFabsFneg(operB, absB, negB); } else { - OperB = GetAluIabsIneg(OperB, AbsB, NegB); + operB = GetAluIabsIneg(operB, absB, negB); } - ShaderIrOperPred Pred = OpCode.Pred39(); + ShaderIrOperPred pred = opCode.Pred39(); - ShaderIrOp Op; + ShaderIrOp op; - ShaderIrInst MaxInst = IsFloat ? ShaderIrInst.Fmax : ShaderIrInst.Max; - ShaderIrInst MinInst = IsFloat ? ShaderIrInst.Fmin : ShaderIrInst.Min; + ShaderIrInst maxInst = isFloat ? ShaderIrInst.Fmax : ShaderIrInst.Max; + ShaderIrInst minInst = isFloat ? ShaderIrInst.Fmin : ShaderIrInst.Min; - if (Pred.IsConst) + if (pred.IsConst) { - bool IsMax = OpCode.Read(42); + bool isMax = opCode.Read(42); - Op = new ShaderIrOp(IsMax - ? MaxInst - : MinInst, OperA, OperB); + op = new ShaderIrOp(isMax + ? maxInst + : minInst, operA, operB); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(opCode.Gpr0(), op))); } else { - ShaderIrNode PredN = OpCode.Pred39N(); + ShaderIrNode predN = opCode.Pred39N(); - ShaderIrOp OpMax = new ShaderIrOp(MaxInst, OperA, OperB); - ShaderIrOp OpMin = new ShaderIrOp(MinInst, OperA, OperB); + ShaderIrOp opMax = new ShaderIrOp(maxInst, operA, operB); + ShaderIrOp opMin = new ShaderIrOp(minInst, operA, operB); - ShaderIrAsg AsgMax = new ShaderIrAsg(OpCode.Gpr0(), OpMax); - ShaderIrAsg AsgMin = new ShaderIrAsg(OpCode.Gpr0(), OpMin); + ShaderIrAsg asgMax = new ShaderIrAsg(opCode.Gpr0(), opMax); + ShaderIrAsg asgMin = new ShaderIrAsg(opCode.Gpr0(), opMin); - Block.AddNode(OpCode.PredNode(new ShaderIrCond(PredN, AsgMax, Not: true))); - Block.AddNode(OpCode.PredNode(new ShaderIrCond(PredN, AsgMin, Not: false))); + block.AddNode(opCode.PredNode(new ShaderIrCond(predN, asgMax, not: true))); + block.AddNode(opCode.PredNode(new ShaderIrCond(predN, asgMin, not: false))); } } - private static void EmitRro(ShaderIrBlock Block, long OpCode, ShaderOper Oper) + private static void EmitRro(ShaderIrBlock block, long opCode, ShaderOper oper) { //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. - bool NegA = OpCode.Read(45); - bool AbsA = OpCode.Read(49); + bool negA = opCode.Read(45); + bool absA = opCode.Read(49); - ShaderIrNode OperA; + ShaderIrNode operA; - switch (Oper) + switch (oper) { - case ShaderOper.CR: OperA = OpCode.Cbuf34(); break; - case ShaderOper.Immf: OperA = OpCode.Immf19_20(); break; - case ShaderOper.RR: OperA = OpCode.Gpr20(); break; + case ShaderOper.Cr: operA = opCode.Cbuf34(); break; + case ShaderOper.Immf: operA = opCode.Immf19_20(); break; + case ShaderOper.Rr: operA = opCode.Gpr20(); break; - default: throw new ArgumentException(nameof(Oper)); + default: throw new ArgumentException(nameof(oper)); } - OperA = GetAluFabsFneg(OperA, AbsA, NegA); + operA = GetAluFabsFneg(operA, absA, negA); - Block.AddNode(new ShaderIrCmnt("Stubbed.")); + block.AddNode(new ShaderIrCmnt("Stubbed.")); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), OperA))); + 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) { - EmitSet(Block, OpCode, true, Oper); + EmitSet(block, opCode, true, oper); } - private static void EmitIset(ShaderIrBlock Block, long OpCode, ShaderOper Oper) + private static void EmitIset(ShaderIrBlock block, long opCode, ShaderOper oper) { - EmitSet(Block, OpCode, false, Oper); + EmitSet(block, opCode, false, oper); } - 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.Read(43); - bool AbsB = OpCode.Read(44); - bool NegB = OpCode.Read(53); - bool AbsA = OpCode.Read(54); + bool negA = opCode.Read(43); + bool absB = opCode.Read(44); + bool negB = opCode.Read(53); + bool absA = opCode.Read(54); - bool BoolFloat = OpCode.Read(IsFloat ? 52 : 44); + bool boolFloat = opCode.Read(isFloat ? 52 : 44); - ShaderIrNode OperA = OpCode.Gpr8(), OperB; + ShaderIrNode operA = opCode.Gpr8(), operB; - switch (Oper) + switch (oper) { - case ShaderOper.CR: OperB = OpCode.Cbuf34(); break; - case ShaderOper.Imm: OperB = OpCode.Imm19_20(); break; - case ShaderOper.Immf: OperB = OpCode.Immf19_20(); break; - case ShaderOper.RR: OperB = OpCode.Gpr20(); break; + case ShaderOper.Cr: operB = opCode.Cbuf34(); break; + case ShaderOper.Imm: operB = opCode.Imm19_20(); break; + case ShaderOper.Immf: operB = opCode.Immf19_20(); break; + case ShaderOper.Rr: operB = opCode.Gpr20(); break; - default: throw new ArgumentException(nameof(Oper)); + default: throw new ArgumentException(nameof(oper)); } - ShaderIrInst CmpInst; + ShaderIrInst cmpInst; - if (IsFloat) + if (isFloat) { - OperA = GetAluFabsFneg(OperA, AbsA, NegA); - OperB = GetAluFabsFneg(OperB, AbsB, NegB); + operA = GetAluFabsFneg(operA, absA, negA); + operB = GetAluFabsFneg(operB, absB, negB); - CmpInst = OpCode.CmpF(); + cmpInst = opCode.CmpF(); } else { - CmpInst = OpCode.Cmp(); + cmpInst = opCode.Cmp(); } - ShaderIrOp Op = new ShaderIrOp(CmpInst, OperA, OperB); + ShaderIrOp op = new ShaderIrOp(cmpInst, operA, operB); - ShaderIrInst LopInst = OpCode.BLop45(); + ShaderIrInst lopInst = opCode.BLop45(); - ShaderIrOperPred PNode = OpCode.Pred39(); + ShaderIrOperPred pNode = opCode.Pred39(); - ShaderIrNode Imm0, Imm1; + ShaderIrNode imm0, imm1; - if (BoolFloat) + if (boolFloat) { - Imm0 = new ShaderIrOperImmf(0); - Imm1 = new ShaderIrOperImmf(1); + imm0 = new ShaderIrOperImmf(0); + imm1 = new ShaderIrOperImmf(1); } else { - Imm0 = new ShaderIrOperImm(0); - Imm1 = new ShaderIrOperImm(-1); + imm0 = new ShaderIrOperImm(0); + imm1 = new ShaderIrOperImm(-1); } - ShaderIrNode Asg0 = new ShaderIrAsg(OpCode.Gpr0(), Imm0); - ShaderIrNode Asg1 = new ShaderIrAsg(OpCode.Gpr0(), Imm1); + ShaderIrNode asg0 = new ShaderIrAsg(opCode.Gpr0(), imm0); + ShaderIrNode asg1 = new ShaderIrAsg(opCode.Gpr0(), imm1); - if (LopInst != ShaderIrInst.Band || !PNode.IsConst) + if (lopInst != ShaderIrInst.Band || !pNode.IsConst) { - ShaderIrOp Op2 = new ShaderIrOp(LopInst, Op, PNode); + ShaderIrOp op2 = new ShaderIrOp(lopInst, op, pNode); - Asg0 = new ShaderIrCond(Op2, Asg0, Not: true); - Asg1 = new ShaderIrCond(Op2, Asg1, Not: false); + asg0 = new ShaderIrCond(op2, asg0, not: true); + asg1 = new ShaderIrCond(op2, asg1, not: false); } else { - Asg0 = new ShaderIrCond(Op, Asg0, Not: true); - Asg1 = new ShaderIrCond(Op, Asg1, Not: false); + asg0 = new ShaderIrCond(op, asg0, not: true); + asg1 = new ShaderIrCond(op, asg1, not: false); } - Block.AddNode(OpCode.PredNode(Asg0)); - Block.AddNode(OpCode.PredNode(Asg1)); + block.AddNode(opCode.PredNode(asg0)); + 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) { - EmitSetp(Block, OpCode, true, Oper); + EmitSetp(block, opCode, true, oper); } - private static void EmitIsetp(ShaderIrBlock Block, long OpCode, ShaderOper Oper) + private static void EmitIsetp(ShaderIrBlock block, long opCode, ShaderOper oper) { - EmitSetp(Block, OpCode, false, Oper); + EmitSetp(block, opCode, false, oper); } - 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.Read(7); - bool NegP = OpCode.Read(42); - bool NegA = OpCode.Read(43); - bool AbsB = OpCode.Read(44); + bool absA = opCode.Read(7); + bool negP = opCode.Read(42); + bool negA = opCode.Read(43); + bool absB = opCode.Read(44); - ShaderIrNode OperA = OpCode.Gpr8(), OperB; + ShaderIrNode operA = opCode.Gpr8(), operB; - switch (Oper) + switch (oper) { - case ShaderOper.CR: OperB = OpCode.Cbuf34(); break; - case ShaderOper.Imm: OperB = OpCode.Imm19_20(); break; - case ShaderOper.Immf: OperB = OpCode.Immf19_20(); break; - case ShaderOper.RR: OperB = OpCode.Gpr20(); break; + case ShaderOper.Cr: operB = opCode.Cbuf34(); break; + case ShaderOper.Imm: operB = opCode.Imm19_20(); break; + case ShaderOper.Immf: operB = opCode.Immf19_20(); break; + case ShaderOper.Rr: operB = opCode.Gpr20(); break; - default: throw new ArgumentException(nameof(Oper)); + default: throw new ArgumentException(nameof(oper)); } - ShaderIrInst CmpInst; + ShaderIrInst cmpInst; - if (IsFloat) + if (isFloat) { - OperA = GetAluFabsFneg(OperA, AbsA, NegA); - OperB = GetAluFabs (OperB, AbsB); + operA = GetAluFabsFneg(operA, absA, negA); + operB = GetAluFabs (operB, absB); - CmpInst = OpCode.CmpF(); + cmpInst = opCode.CmpF(); } else { - CmpInst = OpCode.Cmp(); + cmpInst = opCode.Cmp(); } - ShaderIrOp Op = new ShaderIrOp(CmpInst, OperA, OperB); + ShaderIrOp op = new ShaderIrOp(cmpInst, operA, operB); - ShaderIrOperPred P0Node = OpCode.Pred3(); - ShaderIrOperPred P1Node = OpCode.Pred0(); - ShaderIrOperPred P2Node = OpCode.Pred39(); + ShaderIrOperPred p0Node = opCode.Pred3(); + ShaderIrOperPred p1Node = opCode.Pred0(); + ShaderIrOperPred p2Node = opCode.Pred39(); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(P0Node, Op))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(p0Node, op))); - ShaderIrInst LopInst = OpCode.BLop45(); + ShaderIrInst lopInst = opCode.BLop45(); - if (LopInst == ShaderIrInst.Band && P1Node.IsConst && P2Node.IsConst) + if (lopInst == ShaderIrInst.Band && p1Node.IsConst && p2Node.IsConst) { return; } - ShaderIrNode P2NNode = P2Node; + ShaderIrNode p2NNode = p2Node; - if (NegP) + if (negP) { - P2NNode = new ShaderIrOp(ShaderIrInst.Bnot, P2NNode); + p2NNode = new ShaderIrOp(ShaderIrInst.Bnot, p2NNode); } - Op = new ShaderIrOp(ShaderIrInst.Bnot, P0Node); + op = new ShaderIrOp(ShaderIrInst.Bnot, p0Node); - Op = new ShaderIrOp(LopInst, Op, P2NNode); + op = new ShaderIrOp(lopInst, op, p2NNode); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(P1Node, Op))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(p1Node, op))); - Op = new ShaderIrOp(LopInst, P0Node, P2NNode); + op = new ShaderIrOp(lopInst, p0Node, p2NNode); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(P0Node, Op))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(p0Node, op))); } - private static void EmitBinaryHalfOp(ShaderIrBlock Block, long OpCode, ShaderIrInst Inst) + private static void EmitBinaryHalfOp(ShaderIrBlock block, long opCode, ShaderIrInst inst) { - bool AbsB = OpCode.Read(30); - bool NegB = OpCode.Read(31); - bool Sat = OpCode.Read(32); - bool AbsA = OpCode.Read(44); + bool absB = opCode.Read(30); + bool negB = opCode.Read(31); + bool sat = opCode.Read(32); + bool absA = opCode.Read(44); - ShaderIrOperGpr[] VecA = OpCode.GprHalfVec8(); - ShaderIrOperGpr[] VecB = OpCode.GprHalfVec20(); + ShaderIrOperGpr[] vecA = opCode.GprHalfVec8(); + ShaderIrOperGpr[] vecB = opCode.GprHalfVec20(); - HalfOutputType OutputType = (HalfOutputType)OpCode.Read(49, 3); + HalfOutputType outputType = (HalfOutputType)opCode.Read(49, 3); - int Elems = OutputType == HalfOutputType.PackedFp16 ? 2 : 1; - int First = OutputType == HalfOutputType.MergeH1 ? 1 : 0; + int elems = outputType == HalfOutputType.PackedFp16 ? 2 : 1; + int first = outputType == HalfOutputType.MergeH1 ? 1 : 0; - for (int Index = First; Index < Elems; Index++) + for (int index = first; index < elems; index++) { - ShaderIrNode OperA = GetAluFabs (VecA[Index], AbsA); - ShaderIrNode OperB = GetAluFabsFneg(VecB[Index], AbsB, NegB); + ShaderIrNode operA = GetAluFabs (vecA[index], absA); + ShaderIrNode operB = GetAluFabsFneg(vecB[index], absB, negB); - ShaderIrNode Op = new ShaderIrOp(Inst, OperA, OperB); + ShaderIrNode op = new ShaderIrOp(inst, operA, operB); - ShaderIrOperGpr Dst = GetHalfDst(OpCode, OutputType, Index); + ShaderIrOperGpr dst = GetHalfDst(opCode, outputType, index); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(Dst, GetAluFsat(Op, Sat)))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(dst, GetAluFsat(op, sat)))); } } - private static ShaderIrOperGpr GetHalfDst(long OpCode, HalfOutputType OutputType, int Index) + private static ShaderIrOperGpr GetHalfDst(long opCode, HalfOutputType outputType, int index) { - switch (OutputType) + switch (outputType) { - case HalfOutputType.PackedFp16: return OpCode.GprHalf0(Index); - case HalfOutputType.Fp32: return OpCode.Gpr0(); - case HalfOutputType.MergeH0: return OpCode.GprHalf0(0); - case HalfOutputType.MergeH1: return OpCode.GprHalf0(1); + case HalfOutputType.PackedFp16: return opCode.GprHalf0(index); + case HalfOutputType.Fp32: return opCode.Gpr0(); + case HalfOutputType.MergeH0: return opCode.GprHalf0(0); + case HalfOutputType.MergeH1: return opCode.GprHalf0(1); } - throw new ArgumentException(nameof(OutputType)); + throw new ArgumentException(nameof(outputType)); } - private static void EmitLop(ShaderIrBlock Block, long OpCode, ShaderOper Oper) + private static void EmitLop(ShaderIrBlock block, long opCode, ShaderOper oper) { - int SubOp = OpCode.Read(41, 3); + int subOp = opCode.Read(41, 3); - bool InvA = OpCode.Read(39); - bool InvB = OpCode.Read(40); + bool invA = opCode.Read(39); + bool invB = opCode.Read(40); - ShaderIrInst Inst = 0; + ShaderIrInst inst = 0; - switch (SubOp) + switch (subOp) { - case 0: Inst = ShaderIrInst.And; break; - case 1: Inst = ShaderIrInst.Or; break; - case 2: Inst = ShaderIrInst.Xor; break; + case 0: inst = ShaderIrInst.And; break; + case 1: inst = ShaderIrInst.Or; break; + case 2: inst = ShaderIrInst.Xor; break; } - ShaderIrNode OperA = GetAluNot(OpCode.Gpr8(), InvA); - ShaderIrNode OperB; + ShaderIrNode operA = GetAluNot(opCode.Gpr8(), invA); + ShaderIrNode operB; - switch (Oper) + switch (oper) { - case ShaderOper.CR: OperB = OpCode.Cbuf34(); break; - case ShaderOper.Imm: OperB = OpCode.Imm19_20(); break; - case ShaderOper.RR: OperB = OpCode.Gpr20(); break; + case ShaderOper.Cr: operB = opCode.Cbuf34(); break; + case ShaderOper.Imm: operB = opCode.Imm19_20(); break; + case ShaderOper.Rr: operB = opCode.Gpr20(); break; - default: throw new ArgumentException(nameof(Oper)); + default: throw new ArgumentException(nameof(oper)); } - OperB = GetAluNot(OperB, InvB); + operB = GetAluNot(operB, invB); - ShaderIrNode Op; + ShaderIrNode op; - if (SubOp < 3) + if (subOp < 3) { - Op = new ShaderIrOp(Inst, OperA, OperB); + op = new ShaderIrOp(inst, operA, operB); } else { - Op = OperB; + op = operB; } - ShaderIrNode Compare = new ShaderIrOp(ShaderIrInst.Cne, Op, new ShaderIrOperImm(0)); + ShaderIrNode compare = new ShaderIrOp(ShaderIrInst.Cne, op, new ShaderIrOperImm(0)); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Pred48(), Compare))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(opCode.Pred48(), compare))); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(opCode.Gpr0(), op))); } private enum XmadMode @@ -1157,143 +1157,143 @@ namespace Ryujinx.Graphics.Gal.Shader Cbcc = 4 } - private static void EmitXmad(ShaderIrBlock Block, long OpCode, ShaderOper Oper) + private static void EmitXmad(ShaderIrBlock block, long opCode, ShaderOper oper) { - bool SignedA = OpCode.Read(48); - bool SignedB = OpCode.Read(49); - bool HighB = OpCode.Read(52); - bool HighA = OpCode.Read(53); + bool signedA = opCode.Read(48); + bool signedB = opCode.Read(49); + bool highB = opCode.Read(52); + bool highA = opCode.Read(53); - int Mode = OpCode.Read(50, 7); + int mode = opCode.Read(50, 7); - ShaderIrNode OperA = OpCode.Gpr8(), OperB, OperC; + ShaderIrNode operA = opCode.Gpr8(), operB, operC; - switch (Oper) + switch (oper) { - case ShaderOper.CR: OperB = OpCode.Cbuf34(); break; - case ShaderOper.Imm: OperB = OpCode.ImmU16_20(); break; - case ShaderOper.RC: OperB = OpCode.Gpr39(); break; - case ShaderOper.RR: OperB = OpCode.Gpr20(); break; + case ShaderOper.Cr: operB = opCode.Cbuf34(); break; + case ShaderOper.Imm: operB = opCode.ImmU16_20(); break; + case ShaderOper.Rc: operB = opCode.Gpr39(); break; + case ShaderOper.Rr: operB = opCode.Gpr20(); break; - default: throw new ArgumentException(nameof(Oper)); + default: throw new ArgumentException(nameof(oper)); } - ShaderIrNode OperB2 = OperB; + ShaderIrNode operB2 = operB; - if (Oper == ShaderOper.Imm) + if (oper == ShaderOper.Imm) { - int Imm = ((ShaderIrOperImm)OperB2).Value; + int imm = ((ShaderIrOperImm)operB2).Value; - if (!HighB) + if (!highB) { - Imm <<= 16; + imm <<= 16; } - if (SignedB) + if (signedB) { - Imm >>= 16; + imm >>= 16; } else { - Imm = (int)((uint)Imm >> 16); + imm = (int)((uint)imm >> 16); } - OperB2 = new ShaderIrOperImm(Imm); + operB2 = new ShaderIrOperImm(imm); } - ShaderIrOperImm Imm16 = new ShaderIrOperImm(16); + ShaderIrOperImm imm16 = new ShaderIrOperImm(16); //If we are working with the lower 16-bits of the A/B operands, //we need to shift the lower 16-bits to the top 16-bits. Later, //they will be right shifted. For U16 types, this will be a logical //right shift, and for S16 types, a arithmetic right shift. - if (!HighA) + if (!highA) { - OperA = new ShaderIrOp(ShaderIrInst.Lsl, OperA, Imm16); + operA = new ShaderIrOp(ShaderIrInst.Lsl, operA, imm16); } - if (!HighB && Oper != ShaderOper.Imm) + if (!highB && oper != ShaderOper.Imm) { - OperB2 = new ShaderIrOp(ShaderIrInst.Lsl, OperB2, Imm16); + operB2 = new ShaderIrOp(ShaderIrInst.Lsl, operB2, imm16); } - ShaderIrInst ShiftA = SignedA ? ShaderIrInst.Asr : ShaderIrInst.Lsr; - ShaderIrInst ShiftB = SignedB ? ShaderIrInst.Asr : ShaderIrInst.Lsr; + ShaderIrInst shiftA = signedA ? ShaderIrInst.Asr : ShaderIrInst.Lsr; + ShaderIrInst shiftB = signedB ? ShaderIrInst.Asr : ShaderIrInst.Lsr; - OperA = new ShaderIrOp(ShiftA, OperA, Imm16); + operA = new ShaderIrOp(shiftA, operA, imm16); - if (Oper != ShaderOper.Imm) + if (oper != ShaderOper.Imm) { - OperB2 = new ShaderIrOp(ShiftB, OperB2, Imm16); + operB2 = new ShaderIrOp(shiftB, operB2, imm16); } - bool ProductShiftLeft = false; - bool Merge = false; + bool productShiftLeft = false; + bool merge = false; - if (Oper == ShaderOper.RC) + if (oper == ShaderOper.Rc) { - OperC = OpCode.Cbuf34(); + operC = opCode.Cbuf34(); } else { - OperC = OpCode.Gpr39(); + operC = opCode.Gpr39(); - ProductShiftLeft = OpCode.Read(36); - Merge = OpCode.Read(37); + productShiftLeft = opCode.Read(36); + merge = opCode.Read(37); } - ShaderIrOp MulOp = new ShaderIrOp(ShaderIrInst.Mul, OperA, OperB2); + ShaderIrOp mulOp = new ShaderIrOp(ShaderIrInst.Mul, operA, operB2); - if (ProductShiftLeft) + if (productShiftLeft) { - MulOp = new ShaderIrOp(ShaderIrInst.Lsl, MulOp, Imm16); + mulOp = new ShaderIrOp(ShaderIrInst.Lsl, mulOp, imm16); } - switch ((XmadMode)Mode) + switch ((XmadMode)mode) { - case XmadMode.Clo: OperC = ExtendTo32(OperC, Signed: false, Size: 16); break; + case XmadMode.Clo: operC = ExtendTo32(operC, signed: false, size: 16); break; - case XmadMode.Chi: OperC = new ShaderIrOp(ShaderIrInst.Lsr, OperC, Imm16); break; + case XmadMode.Chi: operC = new ShaderIrOp(ShaderIrInst.Lsr, operC, imm16); break; case XmadMode.Cbcc: { - ShaderIrOp OperBLsh16 = new ShaderIrOp(ShaderIrInst.Lsl, OperB, Imm16); + ShaderIrOp operBLsh16 = new ShaderIrOp(ShaderIrInst.Lsl, operB, imm16); - OperC = new ShaderIrOp(ShaderIrInst.Add, OperC, OperBLsh16); + operC = new ShaderIrOp(ShaderIrInst.Add, operC, operBLsh16); break; } case XmadMode.Csfu: { - ShaderIrOperImm Imm31 = new ShaderIrOperImm(31); + ShaderIrOperImm imm31 = new ShaderIrOperImm(31); - ShaderIrOp SignAdjustA = new ShaderIrOp(ShaderIrInst.Lsr, OperA, Imm31); - ShaderIrOp SignAdjustB = new ShaderIrOp(ShaderIrInst.Lsr, OperB2, Imm31); + ShaderIrOp signAdjustA = new ShaderIrOp(ShaderIrInst.Lsr, operA, imm31); + ShaderIrOp signAdjustB = new ShaderIrOp(ShaderIrInst.Lsr, operB2, imm31); - SignAdjustA = new ShaderIrOp(ShaderIrInst.Lsl, SignAdjustA, Imm16); - SignAdjustB = new ShaderIrOp(ShaderIrInst.Lsl, SignAdjustB, Imm16); + signAdjustA = new ShaderIrOp(ShaderIrInst.Lsl, signAdjustA, imm16); + signAdjustB = new ShaderIrOp(ShaderIrInst.Lsl, signAdjustB, imm16); - ShaderIrOp SignAdjust = new ShaderIrOp(ShaderIrInst.Add, SignAdjustA, SignAdjustB); + ShaderIrOp signAdjust = new ShaderIrOp(ShaderIrInst.Add, signAdjustA, signAdjustB); - OperC = new ShaderIrOp(ShaderIrInst.Sub, OperC, SignAdjust); + operC = new ShaderIrOp(ShaderIrInst.Sub, operC, signAdjust); break; } } - ShaderIrOp AddOp = new ShaderIrOp(ShaderIrInst.Add, MulOp, OperC); + ShaderIrOp addOp = new ShaderIrOp(ShaderIrInst.Add, mulOp, operC); - if (Merge) + if (merge) { - ShaderIrOperImm Imm16Mask = new ShaderIrOperImm(0xffff); + ShaderIrOperImm imm16Mask = new ShaderIrOperImm(0xffff); - AddOp = new ShaderIrOp(ShaderIrInst.And, AddOp, Imm16Mask); - OperB = new ShaderIrOp(ShaderIrInst.Lsl, OperB, Imm16); - AddOp = new ShaderIrOp(ShaderIrInst.Or, AddOp, OperB); + addOp = new ShaderIrOp(ShaderIrInst.And, addOp, imm16Mask); + operB = new ShaderIrOp(ShaderIrInst.Lsl, operB, imm16); + addOp = new ShaderIrOp(ShaderIrInst.Or, addOp, operB); } - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), AddOp))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(opCode.Gpr0(), addOp))); } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeFlow.cs b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeFlow.cs index bc2539bd..fc992693 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeFlow.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeFlow.cs @@ -4,54 +4,54 @@ namespace Ryujinx.Graphics.Gal.Shader { static partial class ShaderDecode { - public static void Bra(ShaderIrBlock Block, long OpCode, int Position) + public static void Bra(ShaderIrBlock block, long opCode, int position) { - if ((OpCode & 0x20) != 0) + if ((opCode & 0x20) != 0) { //This reads the target offset from the constant buffer. //Almost impossible to support with GLSL. throw new NotImplementedException(); } - ShaderIrOperImm Imm = new ShaderIrOperImm(Position + OpCode.Branch()); + ShaderIrOperImm imm = new ShaderIrOperImm(position + opCode.Branch()); - Block.AddNode(OpCode.PredNode(new ShaderIrOp(ShaderIrInst.Bra, Imm))); + block.AddNode(opCode.PredNode(new ShaderIrOp(ShaderIrInst.Bra, imm))); } - public static void Exit(ShaderIrBlock Block, long OpCode, int Position) + public static void Exit(ShaderIrBlock block, long opCode, int position) { - int CCode = (int)OpCode & 0x1f; + int cCode = (int)opCode & 0x1f; //TODO: Figure out what the other condition codes mean... - if (CCode == 0xf) + if (cCode == 0xf) { - Block.AddNode(OpCode.PredNode(new ShaderIrOp(ShaderIrInst.Exit))); + block.AddNode(opCode.PredNode(new ShaderIrOp(ShaderIrInst.Exit))); } } - public static void Kil(ShaderIrBlock Block, long OpCode, int Position) + public static void Kil(ShaderIrBlock block, long opCode, int position) { - Block.AddNode(OpCode.PredNode(new ShaderIrOp(ShaderIrInst.Kil))); + block.AddNode(opCode.PredNode(new ShaderIrOp(ShaderIrInst.Kil))); } - public static void Ssy(ShaderIrBlock Block, long OpCode, int Position) + public static void Ssy(ShaderIrBlock block, long opCode, int position) { - if ((OpCode & 0x20) != 0) + if ((opCode & 0x20) != 0) { //This reads the target offset from the constant buffer. //Almost impossible to support with GLSL. throw new NotImplementedException(); } - ShaderIrOperImm Imm = new ShaderIrOperImm(Position + OpCode.Branch()); + ShaderIrOperImm imm = new ShaderIrOperImm(position + opCode.Branch()); - Block.AddNode(new ShaderIrOp(ShaderIrInst.Ssy, Imm)); + block.AddNode(new ShaderIrOp(ShaderIrInst.Ssy, imm)); } - public static void Sync(ShaderIrBlock Block, long OpCode, int Position) + public static void Sync(ShaderIrBlock block, long opCode, int position) { //TODO: Implement Sync condition codes - Block.AddNode(OpCode.PredNode(new ShaderIrOp(ShaderIrInst.Sync))); + block.AddNode(opCode.PredNode(new ShaderIrOp(ShaderIrInst.Sync))); } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeFunc.cs b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeFunc.cs index 73248aa0..cc385aa4 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeFunc.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeFunc.cs @@ -1,4 +1,4 @@ namespace Ryujinx.Graphics.Gal.Shader { - delegate void ShaderDecodeFunc(ShaderIrBlock Block, long OpCode, int Position); + delegate void ShaderDecodeFunc(ShaderIrBlock block, long opCode, int position); }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeHelper.cs b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeHelper.cs index d07bcd91..9a84e612 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeHelper.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeHelper.cs @@ -5,74 +5,74 @@ namespace Ryujinx.Graphics.Gal.Shader private static readonly ShaderIrOperImmf ImmfZero = new ShaderIrOperImmf(0); private static readonly ShaderIrOperImmf ImmfOne = new ShaderIrOperImmf(1); - 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); } - public static ShaderIrNode GetAluFabs(ShaderIrNode Node, bool Abs) + public static ShaderIrNode GetAluFabs(ShaderIrNode node, bool abs) { - return Abs ? new ShaderIrOp(ShaderIrInst.Fabs, Node) : Node; + return abs ? new ShaderIrOp(ShaderIrInst.Fabs, node) : node; } - public static ShaderIrNode GetAluFneg(ShaderIrNode Node, bool Neg) + public static ShaderIrNode GetAluFneg(ShaderIrNode node, bool neg) { - return Neg ? new ShaderIrOp(ShaderIrInst.Fneg, Node) : Node; + return neg ? new ShaderIrOp(ShaderIrInst.Fneg, node) : node; } - public static ShaderIrNode GetAluFsat(ShaderIrNode Node, bool Sat) + public static ShaderIrNode GetAluFsat(ShaderIrNode node, bool sat) { - return Sat ? new ShaderIrOp(ShaderIrInst.Fclamp, Node, ImmfZero, ImmfOne) : Node; + return sat ? new ShaderIrOp(ShaderIrInst.Fclamp, node, ImmfZero, ImmfOne) : node; } - public static ShaderIrNode GetAluIabsIneg(ShaderIrNode Node, bool Abs, bool Neg) + public static ShaderIrNode GetAluIabsIneg(ShaderIrNode node, bool abs, bool neg) { - return GetAluIneg(GetAluIabs(Node, Abs), Neg); + return GetAluIneg(GetAluIabs(node, abs), neg); } - public static ShaderIrNode GetAluIabs(ShaderIrNode Node, bool Abs) + public static ShaderIrNode GetAluIabs(ShaderIrNode node, bool abs) { - return Abs ? new ShaderIrOp(ShaderIrInst.Abs, Node) : Node; + return abs ? new ShaderIrOp(ShaderIrInst.Abs, node) : node; } - public static ShaderIrNode GetAluIneg(ShaderIrNode Node, bool Neg) + public static ShaderIrNode GetAluIneg(ShaderIrNode node, bool neg) { - return Neg ? new ShaderIrOp(ShaderIrInst.Neg, Node) : Node; + return neg ? new ShaderIrOp(ShaderIrInst.Neg, node) : node; } - public static ShaderIrNode GetAluNot(ShaderIrNode Node, bool Not) + public static ShaderIrNode GetAluNot(ShaderIrNode node, bool not) { - return Not ? new ShaderIrOp(ShaderIrInst.Not, Node) : Node; + return not ? new ShaderIrOp(ShaderIrInst.Not, node) : node; } - public static ShaderIrNode ExtendTo32(ShaderIrNode Node, bool Signed, int Size) + public static ShaderIrNode ExtendTo32(ShaderIrNode node, bool signed, int size) { - int Shift = 32 - Size; + int shift = 32 - size; - ShaderIrInst RightShift = Signed + ShaderIrInst rightShift = signed ? ShaderIrInst.Asr : ShaderIrInst.Lsr; - Node = new ShaderIrOp(ShaderIrInst.Lsl, Node, new ShaderIrOperImm(Shift)); - Node = new ShaderIrOp(RightShift, Node, new ShaderIrOperImm(Shift)); + node = new ShaderIrOp(ShaderIrInst.Lsl, node, new ShaderIrOperImm(shift)); + node = new ShaderIrOp(rightShift, node, new ShaderIrOperImm(shift)); - return Node; + return node; } - public static ShaderIrNode ExtendTo32(ShaderIrNode Node, bool Signed, ShaderIrNode Size) + public static ShaderIrNode ExtendTo32(ShaderIrNode node, bool signed, ShaderIrNode size) { - ShaderIrOperImm WordSize = new ShaderIrOperImm(32); + ShaderIrOperImm wordSize = new ShaderIrOperImm(32); - ShaderIrOp Shift = new ShaderIrOp(ShaderIrInst.Sub, WordSize, Size); + ShaderIrOp shift = new ShaderIrOp(ShaderIrInst.Sub, wordSize, size); - ShaderIrInst RightShift = Signed + ShaderIrInst rightShift = signed ? ShaderIrInst.Asr : ShaderIrInst.Lsr; - Node = new ShaderIrOp(ShaderIrInst.Lsl, Node, Shift); - Node = new ShaderIrOp(RightShift, Node, Shift); + node = new ShaderIrOp(ShaderIrInst.Lsl, node, shift); + node = new ShaderIrOp(rightShift, node, shift); - return Node; + return node; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeMem.cs b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeMem.cs index 8b4eacdf..7ce126b0 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeMem.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeMem.cs @@ -7,6 +7,7 @@ namespace Ryujinx.Graphics.Gal.Shader { static partial class ShaderDecode { + // ReSharper disable InconsistentNaming private const int ____ = 0x0; private const int R___ = 0x1; private const int _G__ = 0x2; @@ -21,8 +22,9 @@ namespace Ryujinx.Graphics.Gal.Shader private const int R_BA = 0xd; private const int _GBA = 0xe; private const int RGBA = 0xf; + // ReSharper restore InconsistentNaming - private static int[,] MaskLut = new int[,] + private static int[,] _maskLut = new int[,] { { ____, ____, ____, ____, ____, ____, ____, ____ }, { R___, _G__, __B_, ___A, RG__, R__A, _G_A, __BA }, @@ -30,28 +32,28 @@ namespace Ryujinx.Graphics.Gal.Shader { RGB_, RG_A, R_BA, _GBA, RGBA, ____, ____, ____ } }; - private static GalTextureTarget TexToTextureTarget(int TexType, bool IsArray) + private static GalTextureTarget TexToTextureTarget(int texType, bool isArray) { - switch (TexType) + switch (texType) { case 0: - return IsArray ? GalTextureTarget.OneDArray : GalTextureTarget.OneD; + return isArray ? GalTextureTarget.OneDArray : GalTextureTarget.OneD; case 2: - return IsArray ? GalTextureTarget.TwoDArray : GalTextureTarget.TwoD; + return isArray ? GalTextureTarget.TwoDArray : GalTextureTarget.TwoD; case 4: - if (IsArray) - throw new InvalidOperationException($"ARRAY bit set on a TEX with 3D texture!"); + if (isArray) + throw new InvalidOperationException("ARRAY bit set on a TEX with 3D texture!"); return GalTextureTarget.ThreeD; case 6: - return IsArray ? GalTextureTarget.CubeArray : GalTextureTarget.CubeMap; + return isArray ? GalTextureTarget.CubeArray : GalTextureTarget.CubeMap; default: throw new InvalidOperationException(); } } - private static GalTextureTarget TexsToTextureTarget(int TexType) + private static GalTextureTarget TexsToTextureTarget(int texType) { - switch (TexType) + switch (texType) { case 0: return GalTextureTarget.OneD; @@ -77,9 +79,9 @@ namespace Ryujinx.Graphics.Gal.Shader } } - public static GalTextureTarget TldsToTextureTarget(int TexType) + public static GalTextureTarget TldsToTextureTarget(int texType) { - switch (TexType) + switch (texType) { case 0: case 2: @@ -99,566 +101,566 @@ namespace Ryujinx.Graphics.Gal.Shader } } - public static void Ld_A(ShaderIrBlock Block, long OpCode, int Position) + public static void Ld_A(ShaderIrBlock block, long opCode, int position) { - ShaderIrNode[] Opers = OpCode.Abuf20(); + ShaderIrNode[] opers = opCode.Abuf20(); //Used by GS - ShaderIrOperGpr Vertex = OpCode.Gpr39(); + ShaderIrOperGpr vertex = opCode.Gpr39(); - int Index = 0; + int index = 0; - foreach (ShaderIrNode OperA in Opers) + foreach (ShaderIrNode operA in opers) { - ShaderIrOperGpr OperD = OpCode.Gpr0(); + ShaderIrOperGpr operD = opCode.Gpr0(); - OperD.Index += Index++; + operD.Index += index++; - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OperD, OperA))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(operD, operA))); } } - public static void Ld_C(ShaderIrBlock Block, long OpCode, int Position) + public static void Ld_C(ShaderIrBlock block, long opCode, int position) { - int CbufPos = OpCode.Read(22, 0x3fff); - int CbufIndex = OpCode.Read(36, 0x1f); - int Type = OpCode.Read(48, 7); + int cbufPos = opCode.Read(22, 0x3fff); + int cbufIndex = opCode.Read(36, 0x1f); + int type = opCode.Read(48, 7); - if (Type > 5) + if (type > 5) { throw new InvalidOperationException(); } - ShaderIrOperGpr Temp = ShaderIrOperGpr.MakeTemporary(); + ShaderIrOperGpr temp = ShaderIrOperGpr.MakeTemporary(); - Block.AddNode(new ShaderIrAsg(Temp, OpCode.Gpr8())); + block.AddNode(new ShaderIrAsg(temp, opCode.Gpr8())); - int Count = Type == 5 ? 2 : 1; + int count = type == 5 ? 2 : 1; - for (int Index = 0; Index < Count; Index++) + for (int index = 0; index < count; index++) { - ShaderIrOperCbuf OperA = new ShaderIrOperCbuf(CbufIndex, CbufPos, Temp); + ShaderIrOperCbuf operA = new ShaderIrOperCbuf(cbufIndex, cbufPos, temp); - ShaderIrOperGpr OperD = OpCode.Gpr0(); + ShaderIrOperGpr operD = opCode.Gpr0(); - OperA.Pos += Index; - OperD.Index += Index; + operA.Pos += index; + operD.Index += index; - if (!OperD.IsValidRegister) + if (!operD.IsValidRegister) { break; } - ShaderIrNode Node = OperA; + ShaderIrNode node = operA; - if (Type < 4) + if (type < 4) { //This is a 8 or 16 bits type. - bool Signed = (Type & 1) != 0; + bool signed = (type & 1) != 0; - int Size = 8 << (Type >> 1); + int size = 8 << (type >> 1); - Node = ExtendTo32(Node, Signed, Size); + node = ExtendTo32(node, signed, size); } - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OperD, Node))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(operD, node))); } } - public static void St_A(ShaderIrBlock Block, long OpCode, int Position) + public static void St_A(ShaderIrBlock block, long opCode, int position) { - ShaderIrNode[] Opers = OpCode.Abuf20(); + ShaderIrNode[] opers = opCode.Abuf20(); - int Index = 0; + int index = 0; - foreach (ShaderIrNode OperA in Opers) + foreach (ShaderIrNode operA in opers) { - ShaderIrOperGpr OperD = OpCode.Gpr0(); + ShaderIrOperGpr operD = opCode.Gpr0(); - OperD.Index += Index++; + operD.Index += index++; - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OperA, OperD))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(operA, operD))); } } - public static void Texq(ShaderIrBlock Block, long OpCode, int Position) + public static void Texq(ShaderIrBlock block, long opCode, int position) { - ShaderIrNode OperD = OpCode.Gpr0(); - ShaderIrNode OperA = OpCode.Gpr8(); + ShaderIrNode operD = opCode.Gpr0(); + ShaderIrNode operA = opCode.Gpr8(); - ShaderTexqInfo Info = (ShaderTexqInfo)(OpCode.Read(22, 0x1f)); + ShaderTexqInfo info = (ShaderTexqInfo)(opCode.Read(22, 0x1f)); - ShaderIrMetaTexq Meta0 = new ShaderIrMetaTexq(Info, 0); - ShaderIrMetaTexq Meta1 = new ShaderIrMetaTexq(Info, 1); + ShaderIrMetaTexq meta0 = new ShaderIrMetaTexq(info, 0); + ShaderIrMetaTexq meta1 = new ShaderIrMetaTexq(info, 1); - ShaderIrNode OperC = OpCode.Imm13_36(); + ShaderIrNode operC = opCode.Imm13_36(); - ShaderIrOp Op0 = new ShaderIrOp(ShaderIrInst.Texq, OperA, null, OperC, Meta0); - ShaderIrOp Op1 = new ShaderIrOp(ShaderIrInst.Texq, OperA, null, OperC, Meta1); + ShaderIrOp op0 = new ShaderIrOp(ShaderIrInst.Texq, operA, null, operC, meta0); + ShaderIrOp op1 = new ShaderIrOp(ShaderIrInst.Texq, operA, null, operC, meta1); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OperD, Op0))); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OperA, Op1))); //Is this right? + block.AddNode(opCode.PredNode(new ShaderIrAsg(operD, op0))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(operA, op1))); //Is this right? } - public static void Tex(ShaderIrBlock Block, long OpCode, int Position) + public static void Tex(ShaderIrBlock block, long opCode, int position) { - TextureInstructionSuffix Suffix; + TextureInstructionSuffix suffix; - int RawSuffix = OpCode.Read(0x34, 0x38); + int rawSuffix = opCode.Read(0x34, 0x38); - switch (RawSuffix) + switch (rawSuffix) { case 0: - Suffix = TextureInstructionSuffix.None; + suffix = TextureInstructionSuffix.None; break; case 0x8: - Suffix = TextureInstructionSuffix.LZ; + suffix = TextureInstructionSuffix.Lz; break; case 0x10: - Suffix = TextureInstructionSuffix.LB; + suffix = TextureInstructionSuffix.Lb; break; case 0x18: - Suffix = TextureInstructionSuffix.LL; + suffix = TextureInstructionSuffix.Ll; break; case 0x30: - Suffix = TextureInstructionSuffix.LBA; + suffix = TextureInstructionSuffix.Lba; break; case 0x38: - Suffix = TextureInstructionSuffix.LLA; + suffix = TextureInstructionSuffix.Lla; break; default: - throw new InvalidOperationException($"Invalid Suffix for TEX instruction {RawSuffix}"); + throw new InvalidOperationException($"Invalid Suffix for TEX instruction {rawSuffix}"); } - bool IsOffset = OpCode.Read(0x36); + bool isOffset = opCode.Read(0x36); - if (IsOffset) - Suffix |= TextureInstructionSuffix.AOffI; + if (isOffset) + suffix |= TextureInstructionSuffix.AOffI; - EmitTex(Block, OpCode, Suffix, GprHandle: false); + EmitTex(block, opCode, suffix, gprHandle: false); } - public static void Tex_B(ShaderIrBlock Block, long OpCode, int Position) + public static void Tex_B(ShaderIrBlock block, long opCode, int position) { - TextureInstructionSuffix Suffix; + TextureInstructionSuffix suffix; - int RawSuffix = OpCode.Read(0x24, 0xe); + int rawSuffix = opCode.Read(0x24, 0xe); - switch (RawSuffix) + switch (rawSuffix) { case 0: - Suffix = TextureInstructionSuffix.None; + suffix = TextureInstructionSuffix.None; break; case 0x2: - Suffix = TextureInstructionSuffix.LZ; + suffix = TextureInstructionSuffix.Lz; break; case 0x4: - Suffix = TextureInstructionSuffix.LB; + suffix = TextureInstructionSuffix.Lb; break; case 0x6: - Suffix = TextureInstructionSuffix.LL; + suffix = TextureInstructionSuffix.Ll; break; case 0xc: - Suffix = TextureInstructionSuffix.LBA; + suffix = TextureInstructionSuffix.Lba; break; case 0xe: - Suffix = TextureInstructionSuffix.LLA; + suffix = TextureInstructionSuffix.Lla; break; default: - throw new InvalidOperationException($"Invalid Suffix for TEX.B instruction {RawSuffix}"); + throw new InvalidOperationException($"Invalid Suffix for TEX.B instruction {rawSuffix}"); } - bool IsOffset = OpCode.Read(0x23); + bool isOffset = opCode.Read(0x23); - if (IsOffset) - Suffix |= TextureInstructionSuffix.AOffI; + if (isOffset) + suffix |= TextureInstructionSuffix.AOffI; - EmitTex(Block, OpCode, Suffix, GprHandle: true); + EmitTex(block, opCode, suffix, gprHandle: true); } - private static void EmitTex(ShaderIrBlock Block, long OpCode, TextureInstructionSuffix TextureInstructionSuffix, bool GprHandle) + private static void EmitTex(ShaderIrBlock block, long opCode, TextureInstructionSuffix textureInstructionSuffix, bool gprHandle) { - bool IsArray = OpCode.HasArray(); + bool isArray = opCode.HasArray(); - GalTextureTarget TextureTarget = TexToTextureTarget(OpCode.Read(28, 6), IsArray); + GalTextureTarget textureTarget = TexToTextureTarget(opCode.Read(28, 6), isArray); - bool HasDepthCompare = OpCode.Read(0x32); + bool hasDepthCompare = opCode.Read(0x32); - if (HasDepthCompare) + if (hasDepthCompare) { - TextureInstructionSuffix |= TextureInstructionSuffix.DC; + textureInstructionSuffix |= TextureInstructionSuffix.Dc; } - ShaderIrOperGpr[] Coords = new ShaderIrOperGpr[ImageUtils.GetCoordsCountTextureTarget(TextureTarget)]; + ShaderIrOperGpr[] coords = new ShaderIrOperGpr[ImageUtils.GetCoordsCountTextureTarget(textureTarget)]; - int IndexExtraCoord = 0; + int indexExtraCoord = 0; - if (IsArray) + if (isArray) { - IndexExtraCoord++; + indexExtraCoord++; - Coords[Coords.Length - 1] = OpCode.Gpr8(); + coords[coords.Length - 1] = opCode.Gpr8(); } - for (int Index = 0; Index < Coords.Length - IndexExtraCoord; Index++) + for (int index = 0; index < coords.Length - indexExtraCoord; index++) { - ShaderIrOperGpr CoordReg = OpCode.Gpr8(); + ShaderIrOperGpr coordReg = opCode.Gpr8(); - CoordReg.Index += Index; + coordReg.Index += index; - CoordReg.Index += IndexExtraCoord; + coordReg.Index += indexExtraCoord; - if (!CoordReg.IsValidRegister) + if (!coordReg.IsValidRegister) { - CoordReg.Index = ShaderIrOperGpr.ZRIndex; + coordReg.Index = ShaderIrOperGpr.ZrIndex; } - Coords[Index] = CoordReg; + coords[index] = coordReg; } - int ChMask = OpCode.Read(31, 0xf); + int chMask = opCode.Read(31, 0xf); - ShaderIrOperGpr LevelOfDetail = null; - ShaderIrOperGpr Offset = null; - ShaderIrOperGpr DepthCompare = null; + ShaderIrOperGpr levelOfDetail = null; + ShaderIrOperGpr offset = null; + ShaderIrOperGpr depthCompare = null; // TODO: determine first argument when TEX.B is used - int OperBIndex = GprHandle ? 1 : 0; + int operBIndex = gprHandle ? 1 : 0; - if ((TextureInstructionSuffix & TextureInstructionSuffix.LL) != 0 || - (TextureInstructionSuffix & TextureInstructionSuffix.LB) != 0 || - (TextureInstructionSuffix & TextureInstructionSuffix.LBA) != 0 || - (TextureInstructionSuffix & TextureInstructionSuffix.LLA) != 0) + if ((textureInstructionSuffix & TextureInstructionSuffix.Ll) != 0 || + (textureInstructionSuffix & TextureInstructionSuffix.Lb) != 0 || + (textureInstructionSuffix & TextureInstructionSuffix.Lba) != 0 || + (textureInstructionSuffix & TextureInstructionSuffix.Lla) != 0) { - LevelOfDetail = OpCode.Gpr20(); - LevelOfDetail.Index += OperBIndex; + levelOfDetail = opCode.Gpr20(); + levelOfDetail.Index += operBIndex; - OperBIndex++; + operBIndex++; } - if ((TextureInstructionSuffix & TextureInstructionSuffix.AOffI) != 0) + if ((textureInstructionSuffix & TextureInstructionSuffix.AOffI) != 0) { - Offset = OpCode.Gpr20(); - Offset.Index += OperBIndex; + offset = opCode.Gpr20(); + offset.Index += operBIndex; - OperBIndex++; + operBIndex++; } - if ((TextureInstructionSuffix & TextureInstructionSuffix.DC) != 0) + if ((textureInstructionSuffix & TextureInstructionSuffix.Dc) != 0) { - DepthCompare = OpCode.Gpr20(); - DepthCompare.Index += OperBIndex; + depthCompare = opCode.Gpr20(); + depthCompare.Index += operBIndex; - OperBIndex++; + operBIndex++; } // ??? - ShaderIrNode OperC = GprHandle - ? (ShaderIrNode)OpCode.Gpr20() - : (ShaderIrNode)OpCode.Imm13_36(); + ShaderIrNode operC = gprHandle + ? (ShaderIrNode)opCode.Gpr20() + : (ShaderIrNode)opCode.Imm13_36(); - ShaderIrInst Inst = GprHandle ? ShaderIrInst.Texb : ShaderIrInst.Texs; + ShaderIrInst inst = gprHandle ? ShaderIrInst.Texb : ShaderIrInst.Texs; - Coords = CoordsRegistersToTempRegisters(Block, Coords); + coords = CoordsRegistersToTempRegisters(block, coords); - int RegInc = 0; + int regInc = 0; - for (int Ch = 0; Ch < 4; Ch++) + for (int ch = 0; ch < 4; ch++) { - if (!IsChannelUsed(ChMask, Ch)) + if (!IsChannelUsed(chMask, ch)) { continue; } - ShaderIrOperGpr Dst = OpCode.Gpr0(); + ShaderIrOperGpr dst = opCode.Gpr0(); - Dst.Index += RegInc++; + dst.Index += regInc++; - if (!Dst.IsValidRegister || Dst.IsConst) + if (!dst.IsValidRegister || dst.IsConst) { continue; } - ShaderIrMetaTex Meta = new ShaderIrMetaTex(Ch, TextureTarget, TextureInstructionSuffix, Coords) + ShaderIrMetaTex meta = new ShaderIrMetaTex(ch, textureTarget, textureInstructionSuffix, coords) { - LevelOfDetail = LevelOfDetail, - Offset = Offset, - DepthCompare = DepthCompare + LevelOfDetail = levelOfDetail, + Offset = offset, + DepthCompare = depthCompare }; - ShaderIrOp Op = new ShaderIrOp(Inst, Coords[0], Coords.Length > 1 ? Coords[1] : null, OperC, Meta); + ShaderIrOp op = new ShaderIrOp(inst, coords[0], coords.Length > 1 ? coords[1] : null, operC, meta); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(Dst, Op))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(dst, op))); } } - public static void Texs(ShaderIrBlock Block, long OpCode, int Position) + public static void Texs(ShaderIrBlock block, long opCode, int position) { - TextureInstructionSuffix Suffix; + TextureInstructionSuffix suffix; - int RawSuffix = OpCode.Read(0x34, 0x1e); + int rawSuffix = opCode.Read(0x34, 0x1e); - switch (RawSuffix) + switch (rawSuffix) { case 0: case 0x4: case 0x10: case 0x16: - Suffix = TextureInstructionSuffix.LZ; + suffix = TextureInstructionSuffix.Lz; break; case 0x6: case 0x1a: - Suffix = TextureInstructionSuffix.LL; + suffix = TextureInstructionSuffix.Ll; break; case 0x8: - Suffix = TextureInstructionSuffix.DC; + suffix = TextureInstructionSuffix.Dc; break; case 0x2: case 0xe: case 0x14: case 0x18: - Suffix = TextureInstructionSuffix.None; + suffix = TextureInstructionSuffix.None; break; case 0xa: - Suffix = TextureInstructionSuffix.LL | TextureInstructionSuffix.DC; + suffix = TextureInstructionSuffix.Ll | TextureInstructionSuffix.Dc; break; case 0xc: case 0x12: - Suffix = TextureInstructionSuffix.LZ | TextureInstructionSuffix.DC; + suffix = TextureInstructionSuffix.Lz | TextureInstructionSuffix.Dc; break; default: - throw new InvalidOperationException($"Invalid Suffix for TEXS instruction {RawSuffix}"); + throw new InvalidOperationException($"Invalid Suffix for TEXS instruction {rawSuffix}"); } - GalTextureTarget TextureTarget = TexsToTextureTarget(OpCode.Read(52, 0x1e)); + GalTextureTarget textureTarget = TexsToTextureTarget(opCode.Read(52, 0x1e)); - EmitTexs(Block, OpCode, ShaderIrInst.Texs, TextureTarget, Suffix); + EmitTexs(block, opCode, ShaderIrInst.Texs, textureTarget, suffix); } - public static void Tlds(ShaderIrBlock Block, long OpCode, int Position) + public static void Tlds(ShaderIrBlock block, long opCode, int position) { - TextureInstructionSuffix Suffix; + TextureInstructionSuffix suffix; - int RawSuffix = OpCode.Read(0x34, 0x1e); + int rawSuffix = opCode.Read(0x34, 0x1e); - switch (RawSuffix) + switch (rawSuffix) { case 0: case 0x4: case 0x8: - Suffix = TextureInstructionSuffix.LZ | TextureInstructionSuffix.AOffI; + suffix = TextureInstructionSuffix.Lz | TextureInstructionSuffix.AOffI; break; case 0xc: - Suffix = TextureInstructionSuffix.LZ | TextureInstructionSuffix.MZ; + suffix = TextureInstructionSuffix.Lz | TextureInstructionSuffix.Mz; break; case 0xe: case 0x10: - Suffix = TextureInstructionSuffix.LZ; + suffix = TextureInstructionSuffix.Lz; break; case 0x2: case 0xa: - Suffix = TextureInstructionSuffix.LL; + suffix = TextureInstructionSuffix.Ll; break; case 0x18: - Suffix = TextureInstructionSuffix.LL | TextureInstructionSuffix.AOffI; + suffix = TextureInstructionSuffix.Ll | TextureInstructionSuffix.AOffI; break; default: - throw new InvalidOperationException($"Invalid Suffix for TLDS instruction {RawSuffix}"); + throw new InvalidOperationException($"Invalid Suffix for TLDS instruction {rawSuffix}"); } - GalTextureTarget TextureTarget = TldsToTextureTarget(OpCode.Read(52, 0x1e)); + GalTextureTarget textureTarget = TldsToTextureTarget(opCode.Read(52, 0x1e)); - EmitTexs(Block, OpCode, ShaderIrInst.Txlf, TextureTarget, Suffix); + EmitTexs(block, opCode, ShaderIrInst.Txlf, textureTarget, suffix); } - public static void Tld4(ShaderIrBlock Block, long OpCode, int Position) + public static void Tld4(ShaderIrBlock block, long opCode, int position) { - TextureInstructionSuffix Suffix; + TextureInstructionSuffix suffix; - int RawSuffix = OpCode.Read(0x34, 0xc); + int rawSuffix = opCode.Read(0x34, 0xc); - switch (RawSuffix) + switch (rawSuffix) { case 0: - Suffix = TextureInstructionSuffix.None; + suffix = TextureInstructionSuffix.None; break; case 0x4: - Suffix = TextureInstructionSuffix.AOffI; + suffix = TextureInstructionSuffix.AOffI; break; case 0x8: - Suffix = TextureInstructionSuffix.PTP; + suffix = TextureInstructionSuffix.Ptp; break; default: - throw new InvalidOperationException($"Invalid Suffix for TLD4 instruction {RawSuffix}"); + throw new InvalidOperationException($"Invalid Suffix for TLD4 instruction {rawSuffix}"); } - bool IsShadow = OpCode.Read(0x32); + bool isShadow = opCode.Read(0x32); - bool IsArray = OpCode.HasArray(); - int ChMask = OpCode.Read(31, 0xf); + bool isArray = opCode.HasArray(); + int chMask = opCode.Read(31, 0xf); - GalTextureTarget TextureTarget = TexToTextureTarget(OpCode.Read(28, 6), IsArray); + GalTextureTarget textureTarget = TexToTextureTarget(opCode.Read(28, 6), isArray); - if (IsShadow) + if (isShadow) { - Suffix |= TextureInstructionSuffix.DC; + suffix |= TextureInstructionSuffix.Dc; } - EmitTld4(Block, OpCode, TextureTarget, Suffix, ChMask, OpCode.Read(0x38, 0x3), false); + EmitTld4(block, opCode, textureTarget, suffix, chMask, opCode.Read(0x38, 0x3), false); } - public static void Tld4s(ShaderIrBlock Block, long OpCode, int Position) + public static void Tld4S(ShaderIrBlock block, long opCode, int position) { - TextureInstructionSuffix Suffix = TextureInstructionSuffix.None; + TextureInstructionSuffix suffix = TextureInstructionSuffix.None; - bool IsOffset = OpCode.Read(0x33); - bool IsShadow = OpCode.Read(0x32); + bool isOffset = opCode.Read(0x33); + bool isShadow = opCode.Read(0x32); - if (IsOffset) + if (isOffset) { - Suffix |= TextureInstructionSuffix.AOffI; + suffix |= TextureInstructionSuffix.AOffI; } - if (IsShadow) + if (isShadow) { - Suffix |= TextureInstructionSuffix.DC; + suffix |= TextureInstructionSuffix.Dc; } // TLD4S seems to only support 2D textures with RGBA mask? - EmitTld4(Block, OpCode, GalTextureTarget.TwoD, Suffix, RGBA, OpCode.Read(0x34, 0x3), true); + EmitTld4(block, opCode, GalTextureTarget.TwoD, suffix, RGBA, opCode.Read(0x34, 0x3), true); } - private static void EmitTexs(ShaderIrBlock Block, - long OpCode, - ShaderIrInst Inst, - GalTextureTarget TextureTarget, - TextureInstructionSuffix TextureInstructionSuffix) + private static void EmitTexs(ShaderIrBlock block, + long opCode, + ShaderIrInst inst, + GalTextureTarget textureTarget, + TextureInstructionSuffix textureInstructionSuffix) { - if (Inst == ShaderIrInst.Txlf && TextureTarget == GalTextureTarget.CubeArray) + if (inst == ShaderIrInst.Txlf && textureTarget == GalTextureTarget.CubeArray) { throw new InvalidOperationException("TLDS instructions cannot use CUBE modifier!"); } - bool IsArray = ImageUtils.IsArray(TextureTarget); + bool isArray = ImageUtils.IsArray(textureTarget); - ShaderIrOperGpr[] Coords = new ShaderIrOperGpr[ImageUtils.GetCoordsCountTextureTarget(TextureTarget)]; + ShaderIrOperGpr[] coords = new ShaderIrOperGpr[ImageUtils.GetCoordsCountTextureTarget(textureTarget)]; - ShaderIrOperGpr OperA = OpCode.Gpr8(); - ShaderIrOperGpr OperB = OpCode.Gpr20(); + ShaderIrOperGpr operA = opCode.Gpr8(); + ShaderIrOperGpr operB = opCode.Gpr20(); - ShaderIrOperGpr SuffixExtra = OpCode.Gpr20(); - SuffixExtra.Index += 1; + ShaderIrOperGpr suffixExtra = opCode.Gpr20(); + suffixExtra.Index += 1; - int CoordStartIndex = 0; + int coordStartIndex = 0; - if (IsArray) + if (isArray) { - CoordStartIndex++; - Coords[Coords.Length - 1] = OpCode.Gpr8(); + coordStartIndex++; + coords[coords.Length - 1] = opCode.Gpr8(); } - switch (Coords.Length - CoordStartIndex) + switch (coords.Length - coordStartIndex) { case 1: - Coords[0] = OpCode.Gpr8(); + coords[0] = opCode.Gpr8(); break; case 2: - Coords[0] = OpCode.Gpr8(); - Coords[0].Index += CoordStartIndex; + coords[0] = opCode.Gpr8(); + coords[0].Index += coordStartIndex; break; case 3: - Coords[0] = OpCode.Gpr8(); - Coords[0].Index += CoordStartIndex; + coords[0] = opCode.Gpr8(); + coords[0].Index += coordStartIndex; - Coords[1] = OpCode.Gpr8(); - Coords[1].Index += 1 + CoordStartIndex; + coords[1] = opCode.Gpr8(); + coords[1].Index += 1 + coordStartIndex; break; default: - throw new NotSupportedException($"{Coords.Length - CoordStartIndex} coords textures aren't supported in TEXS"); + throw new NotSupportedException($"{coords.Length - coordStartIndex} coords textures aren't supported in TEXS"); } - int OperBIndex = 0; + int operBIndex = 0; - ShaderIrOperGpr LevelOfDetail = null; - ShaderIrOperGpr Offset = null; - ShaderIrOperGpr DepthCompare = null; + ShaderIrOperGpr levelOfDetail = null; + ShaderIrOperGpr offset = null; + ShaderIrOperGpr depthCompare = null; // OperB is always the last value // Not applicable to 1d textures - if (Coords.Length - CoordStartIndex != 1) + if (coords.Length - coordStartIndex != 1) { - Coords[Coords.Length - CoordStartIndex - 1] = OperB; - OperBIndex++; + coords[coords.Length - coordStartIndex - 1] = operB; + operBIndex++; } // Encoding of TEXS/TLDS is a bit special and change for 2d textures // NOTE: OperA seems to hold at best two args. // On 2D textures, if no suffix need an additional values, Y is stored in OperB, otherwise coords are in OperA and the additional values is in OperB. - if (TextureInstructionSuffix != TextureInstructionSuffix.None && TextureInstructionSuffix != TextureInstructionSuffix.LZ && TextureTarget == GalTextureTarget.TwoD) + if (textureInstructionSuffix != TextureInstructionSuffix.None && textureInstructionSuffix != TextureInstructionSuffix.Lz && textureTarget == GalTextureTarget.TwoD) { - Coords[Coords.Length - CoordStartIndex - 1] = OpCode.Gpr8(); - Coords[Coords.Length - CoordStartIndex - 1].Index += Coords.Length - CoordStartIndex - 1; - OperBIndex--; + coords[coords.Length - coordStartIndex - 1] = opCode.Gpr8(); + coords[coords.Length - coordStartIndex - 1].Index += coords.Length - coordStartIndex - 1; + operBIndex--; } // TODO: Find what MZ does and what changes about the encoding (Maybe Multisample?) - if ((TextureInstructionSuffix & TextureInstructionSuffix.LL) != 0) + if ((textureInstructionSuffix & TextureInstructionSuffix.Ll) != 0) { - LevelOfDetail = OpCode.Gpr20(); - LevelOfDetail.Index += OperBIndex; - OperBIndex++; + levelOfDetail = opCode.Gpr20(); + levelOfDetail.Index += operBIndex; + operBIndex++; } - if ((TextureInstructionSuffix & TextureInstructionSuffix.AOffI) != 0) + if ((textureInstructionSuffix & TextureInstructionSuffix.AOffI) != 0) { - Offset = OpCode.Gpr20(); - Offset.Index += OperBIndex; - OperBIndex++; + offset = opCode.Gpr20(); + offset.Index += operBIndex; + operBIndex++; } - if ((TextureInstructionSuffix & TextureInstructionSuffix.DC) != 0) + if ((textureInstructionSuffix & TextureInstructionSuffix.Dc) != 0) { - DepthCompare = OpCode.Gpr20(); - DepthCompare.Index += OperBIndex; - OperBIndex++; + depthCompare = opCode.Gpr20(); + depthCompare.Index += operBIndex; + operBIndex++; } - int LutIndex; + int lutIndex; - LutIndex = !OpCode.Gpr0().IsConst ? 1 : 0; - LutIndex |= !OpCode.Gpr28().IsConst ? 2 : 0; + lutIndex = !opCode.Gpr0().IsConst ? 1 : 0; + lutIndex |= !opCode.Gpr28().IsConst ? 2 : 0; - if (LutIndex == 0) + if (lutIndex == 0) { //Both destination registers are RZ, do nothing. return; } - bool Fp16 = !OpCode.Read(59); + bool fp16 = !opCode.Read(59); - int DstIncrement = 0; + int dstIncrement = 0; ShaderIrOperGpr GetDst() { - ShaderIrOperGpr Dst; + ShaderIrOperGpr dst; - if (Fp16) + if (fp16) { //FP16 mode, two components are packed on the two //halfs of a 32-bits register, as two half-float values. - int HalfPart = DstIncrement & 1; + int halfPart = dstIncrement & 1; - switch (LutIndex) + switch (lutIndex) { - case 1: Dst = OpCode.GprHalf0(HalfPart); break; - case 2: Dst = OpCode.GprHalf28(HalfPart); break; - case 3: Dst = (DstIncrement >> 1) != 0 - ? OpCode.GprHalf28(HalfPart) - : OpCode.GprHalf0(HalfPart); break; + case 1: dst = opCode.GprHalf0(halfPart); break; + case 2: dst = opCode.GprHalf28(halfPart); break; + case 3: dst = (dstIncrement >> 1) != 0 + ? opCode.GprHalf28(halfPart) + : opCode.GprHalf0(halfPart); break; default: throw new InvalidOperationException(); } @@ -667,210 +669,210 @@ namespace Ryujinx.Graphics.Gal.Shader { //32-bits mode, each component uses one register. //Two components uses two consecutive registers. - switch (LutIndex) + switch (lutIndex) { - case 1: Dst = OpCode.Gpr0(); break; - case 2: Dst = OpCode.Gpr28(); break; - case 3: Dst = (DstIncrement >> 1) != 0 - ? OpCode.Gpr28() - : OpCode.Gpr0(); break; + case 1: dst = opCode.Gpr0(); break; + case 2: dst = opCode.Gpr28(); break; + case 3: dst = (dstIncrement >> 1) != 0 + ? opCode.Gpr28() + : opCode.Gpr0(); break; default: throw new InvalidOperationException(); } - Dst.Index += DstIncrement & 1; + dst.Index += dstIncrement & 1; } - DstIncrement++; + dstIncrement++; - return Dst; + return dst; } - int ChMask = MaskLut[LutIndex, OpCode.Read(50, 7)]; + int chMask = _maskLut[lutIndex, opCode.Read(50, 7)]; - if (ChMask == 0) + if (chMask == 0) { //All channels are disabled, do nothing. return; } - ShaderIrNode OperC = OpCode.Imm13_36(); - Coords = CoordsRegistersToTempRegisters(Block, Coords); + ShaderIrNode operC = opCode.Imm13_36(); + coords = CoordsRegistersToTempRegisters(block, coords); - for (int Ch = 0; Ch < 4; Ch++) + for (int ch = 0; ch < 4; ch++) { - if (!IsChannelUsed(ChMask, Ch)) + if (!IsChannelUsed(chMask, ch)) { continue; } - ShaderIrMetaTex Meta = new ShaderIrMetaTex(Ch, TextureTarget, TextureInstructionSuffix, Coords) + ShaderIrMetaTex meta = new ShaderIrMetaTex(ch, textureTarget, textureInstructionSuffix, coords) { - LevelOfDetail = LevelOfDetail, - Offset = Offset, - DepthCompare = DepthCompare + LevelOfDetail = levelOfDetail, + Offset = offset, + DepthCompare = depthCompare }; - ShaderIrOp Op = new ShaderIrOp(Inst, OperA, OperB, OperC, Meta); + ShaderIrOp op = new ShaderIrOp(inst, operA, operB, operC, meta); - ShaderIrOperGpr Dst = GetDst(); + ShaderIrOperGpr dst = GetDst(); - if (Dst.IsValidRegister && !Dst.IsConst) + if (dst.IsValidRegister && !dst.IsConst) { - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(Dst, Op))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(dst, op))); } } } - private static void EmitTld4(ShaderIrBlock Block, long OpCode, GalTextureTarget TextureType, TextureInstructionSuffix TextureInstructionSuffix, int ChMask, int Component, bool Scalar) + private static void EmitTld4(ShaderIrBlock block, long opCode, GalTextureTarget textureType, TextureInstructionSuffix textureInstructionSuffix, int chMask, int component, bool scalar) { - ShaderIrOperGpr OperA = OpCode.Gpr8(); - ShaderIrOperGpr OperB = OpCode.Gpr20(); - ShaderIrOperImm OperC = OpCode.Imm13_36(); + ShaderIrOperGpr operA = opCode.Gpr8(); + ShaderIrOperGpr operB = opCode.Gpr20(); + ShaderIrOperImm operC = opCode.Imm13_36(); - ShaderIrOperGpr[] Coords = new ShaderIrOperGpr[ImageUtils.GetCoordsCountTextureTarget(TextureType)]; + ShaderIrOperGpr[] coords = new ShaderIrOperGpr[ImageUtils.GetCoordsCountTextureTarget(textureType)]; - ShaderIrOperGpr Offset = null; - ShaderIrOperGpr DepthCompare = null; + ShaderIrOperGpr offset = null; + ShaderIrOperGpr depthCompare = null; - bool IsArray = ImageUtils.IsArray(TextureType); + bool isArray = ImageUtils.IsArray(textureType); - int OperBIndex = 0; + int operBIndex = 0; - if (Scalar) + if (scalar) { - int CoordStartIndex = 0; + int coordStartIndex = 0; - if (IsArray) + if (isArray) { - CoordStartIndex++; - Coords[Coords.Length - 1] = OperB; + coordStartIndex++; + coords[coords.Length - 1] = operB; } - switch (Coords.Length - CoordStartIndex) + switch (coords.Length - coordStartIndex) { case 1: - Coords[0] = OpCode.Gpr8(); + coords[0] = opCode.Gpr8(); break; case 2: - Coords[0] = OpCode.Gpr8(); - Coords[0].Index += CoordStartIndex; + coords[0] = opCode.Gpr8(); + coords[0].Index += coordStartIndex; break; case 3: - Coords[0] = OpCode.Gpr8(); - Coords[0].Index += CoordStartIndex; + coords[0] = opCode.Gpr8(); + coords[0].Index += coordStartIndex; - Coords[1] = OpCode.Gpr8(); - Coords[1].Index += 1 + CoordStartIndex; + coords[1] = opCode.Gpr8(); + coords[1].Index += 1 + coordStartIndex; break; default: - throw new NotSupportedException($"{Coords.Length - CoordStartIndex} coords textures aren't supported in TLD4S"); + throw new NotSupportedException($"{coords.Length - coordStartIndex} coords textures aren't supported in TLD4S"); } - if (Coords.Length - CoordStartIndex != 1) + if (coords.Length - coordStartIndex != 1) { - Coords[Coords.Length - CoordStartIndex - 1] = OperB; - OperBIndex++; + coords[coords.Length - coordStartIndex - 1] = operB; + operBIndex++; } - if (TextureInstructionSuffix != TextureInstructionSuffix.None && TextureType == GalTextureTarget.TwoD) + if (textureInstructionSuffix != TextureInstructionSuffix.None && textureType == GalTextureTarget.TwoD) { - Coords[Coords.Length - CoordStartIndex - 1] = OpCode.Gpr8(); - Coords[Coords.Length - CoordStartIndex - 1].Index += Coords.Length - CoordStartIndex - 1; - OperBIndex--; + coords[coords.Length - coordStartIndex - 1] = opCode.Gpr8(); + coords[coords.Length - coordStartIndex - 1].Index += coords.Length - coordStartIndex - 1; + operBIndex--; } } else { - int IndexExtraCoord = 0; + int indexExtraCoord = 0; - if (IsArray) + if (isArray) { - IndexExtraCoord++; + indexExtraCoord++; - Coords[Coords.Length - 1] = OpCode.Gpr8(); + coords[coords.Length - 1] = opCode.Gpr8(); } - for (int Index = 0; Index < Coords.Length - IndexExtraCoord; Index++) + for (int index = 0; index < coords.Length - indexExtraCoord; index++) { - Coords[Index] = OpCode.Gpr8(); + coords[index] = opCode.Gpr8(); - Coords[Index].Index += Index; + coords[index].Index += index; - Coords[Index].Index += IndexExtraCoord; + coords[index].Index += indexExtraCoord; - if (Coords[Index].Index > ShaderIrOperGpr.ZRIndex) + if (coords[index].Index > ShaderIrOperGpr.ZrIndex) { - Coords[Index].Index = ShaderIrOperGpr.ZRIndex; + coords[index].Index = ShaderIrOperGpr.ZrIndex; } } } - if ((TextureInstructionSuffix & TextureInstructionSuffix.AOffI) != 0) + if ((textureInstructionSuffix & TextureInstructionSuffix.AOffI) != 0) { - Offset = OpCode.Gpr20(); - Offset.Index += OperBIndex; - OperBIndex++; + offset = opCode.Gpr20(); + offset.Index += operBIndex; + operBIndex++; } - if ((TextureInstructionSuffix & TextureInstructionSuffix.DC) != 0) + if ((textureInstructionSuffix & TextureInstructionSuffix.Dc) != 0) { - DepthCompare = OpCode.Gpr20(); - DepthCompare.Index += OperBIndex; - OperBIndex++; + depthCompare = opCode.Gpr20(); + depthCompare.Index += operBIndex; + operBIndex++; } - Coords = CoordsRegistersToTempRegisters(Block, Coords); + coords = CoordsRegistersToTempRegisters(block, coords); - int RegInc = 0; + int regInc = 0; - for (int Ch = 0; Ch < 4; Ch++) + for (int ch = 0; ch < 4; ch++) { - if (!IsChannelUsed(ChMask, Ch)) + if (!IsChannelUsed(chMask, ch)) { continue; } - ShaderIrOperGpr Dst = OpCode.Gpr0(); + ShaderIrOperGpr dst = opCode.Gpr0(); - Dst.Index += RegInc++; + dst.Index += regInc++; - if (!Dst.IsValidRegister || Dst.IsConst) + if (!dst.IsValidRegister || dst.IsConst) { continue; } - ShaderIrMetaTex Meta = new ShaderIrMetaTex(Ch, TextureType, TextureInstructionSuffix, Coords) + ShaderIrMetaTex meta = new ShaderIrMetaTex(ch, textureType, textureInstructionSuffix, coords) { - Component = Component, - Offset = Offset, - DepthCompare = DepthCompare + Component = component, + Offset = offset, + DepthCompare = depthCompare }; - ShaderIrOp Op = new ShaderIrOp(ShaderIrInst.Tld4, OperA, OperB, OperC, Meta); + ShaderIrOp op = new ShaderIrOp(ShaderIrInst.Tld4, operA, operB, operC, meta); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(Dst, Op))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(dst, op))); } } - private static bool IsChannelUsed(int ChMask, int Ch) + private static bool IsChannelUsed(int chMask, int ch) { - return (ChMask & (1 << Ch)) != 0; + return (chMask & (1 << ch)) != 0; } - private static ShaderIrOperGpr[] CoordsRegistersToTempRegisters(ShaderIrBlock Block, params ShaderIrOperGpr[] Registers) + private static ShaderIrOperGpr[] CoordsRegistersToTempRegisters(ShaderIrBlock block, params ShaderIrOperGpr[] registers) { - ShaderIrOperGpr[] Res = new ShaderIrOperGpr[Registers.Length]; + ShaderIrOperGpr[] res = new ShaderIrOperGpr[registers.Length]; - for (int Index = 0; Index < Res.Length; Index++) + for (int index = 0; index < res.Length; index++) { - Res[Index] = ShaderIrOperGpr.MakeTemporary(Index); - Block.AddNode(new ShaderIrAsg(Res[Index], Registers[Index])); + res[index] = ShaderIrOperGpr.MakeTemporary(index); + block.AddNode(new ShaderIrAsg(res[index], registers[index])); } - return Res; + return res; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeMove.cs b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeMove.cs index cd602db7..0a2b4232 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeMove.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeMove.cs @@ -25,400 +25,400 @@ namespace Ryujinx.Graphics.Gal.Shader F64 = 3 } - public static void F2f_C(ShaderIrBlock Block, long OpCode, int Position) + public static void F2f_C(ShaderIrBlock block, long opCode, int position) { - EmitF2f(Block, OpCode, ShaderOper.CR); + EmitF2F(block, opCode, ShaderOper.Cr); } - public static void F2f_I(ShaderIrBlock Block, long OpCode, int Position) + public static void F2f_I(ShaderIrBlock block, long opCode, int position) { - EmitF2f(Block, OpCode, ShaderOper.Immf); + EmitF2F(block, opCode, ShaderOper.Immf); } - public static void F2f_R(ShaderIrBlock Block, long OpCode, int Position) + public static void F2f_R(ShaderIrBlock block, long opCode, int position) { - EmitF2f(Block, OpCode, ShaderOper.RR); + EmitF2F(block, opCode, ShaderOper.Rr); } - public static void F2i_C(ShaderIrBlock Block, long OpCode, int Position) + public static void F2i_C(ShaderIrBlock block, long opCode, int position) { - EmitF2i(Block, OpCode, ShaderOper.CR); + EmitF2I(block, opCode, ShaderOper.Cr); } - public static void F2i_I(ShaderIrBlock Block, long OpCode, int Position) + public static void F2i_I(ShaderIrBlock block, long opCode, int position) { - EmitF2i(Block, OpCode, ShaderOper.Immf); + EmitF2I(block, opCode, ShaderOper.Immf); } - public static void F2i_R(ShaderIrBlock Block, long OpCode, int Position) + public static void F2i_R(ShaderIrBlock block, long opCode, int position) { - EmitF2i(Block, OpCode, ShaderOper.RR); + EmitF2I(block, opCode, ShaderOper.Rr); } - public static void I2f_C(ShaderIrBlock Block, long OpCode, int Position) + public static void I2f_C(ShaderIrBlock block, long opCode, int position) { - EmitI2f(Block, OpCode, ShaderOper.CR); + EmitI2F(block, opCode, ShaderOper.Cr); } - public static void I2f_I(ShaderIrBlock Block, long OpCode, int Position) + public static void I2f_I(ShaderIrBlock block, long opCode, int position) { - EmitI2f(Block, OpCode, ShaderOper.Imm); + EmitI2F(block, opCode, ShaderOper.Imm); } - public static void I2f_R(ShaderIrBlock Block, long OpCode, int Position) + public static void I2f_R(ShaderIrBlock block, long opCode, int position) { - EmitI2f(Block, OpCode, ShaderOper.RR); + EmitI2F(block, opCode, ShaderOper.Rr); } - public static void I2i_C(ShaderIrBlock Block, long OpCode, int Position) + public static void I2i_C(ShaderIrBlock block, long opCode, int position) { - EmitI2i(Block, OpCode, ShaderOper.CR); + EmitI2I(block, opCode, ShaderOper.Cr); } - public static void I2i_I(ShaderIrBlock Block, long OpCode, int Position) + public static void I2i_I(ShaderIrBlock block, long opCode, int position) { - EmitI2i(Block, OpCode, ShaderOper.Imm); + EmitI2I(block, opCode, ShaderOper.Imm); } - public static void I2i_R(ShaderIrBlock Block, long OpCode, int Position) + public static void I2i_R(ShaderIrBlock block, long opCode, int position) { - EmitI2i(Block, OpCode, ShaderOper.RR); + EmitI2I(block, opCode, ShaderOper.Rr); } - public static void Isberd(ShaderIrBlock Block, long OpCode, int Position) + public static void Isberd(ShaderIrBlock block, long opCode, int position) { //This instruction seems to be used to translate from an address to a vertex index in a GS //Stub it as such - Block.AddNode(new ShaderIrCmnt("Stubbed.")); + block.AddNode(new ShaderIrCmnt("Stubbed.")); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), OpCode.Gpr8()))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(opCode.Gpr0(), opCode.Gpr8()))); } - public static void Mov_C(ShaderIrBlock Block, long OpCode, int Position) + public static void Mov_C(ShaderIrBlock block, long opCode, int position) { - ShaderIrOperCbuf Cbuf = OpCode.Cbuf34(); + ShaderIrOperCbuf cbuf = opCode.Cbuf34(); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Cbuf))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(opCode.Gpr0(), cbuf))); } - public static void Mov_I(ShaderIrBlock Block, long OpCode, int Position) + public static void Mov_I(ShaderIrBlock block, long opCode, int position) { - ShaderIrOperImm Imm = OpCode.Imm19_20(); + ShaderIrOperImm imm = opCode.Imm19_20(); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Imm))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(opCode.Gpr0(), imm))); } - public static void Mov_I32(ShaderIrBlock Block, long OpCode, int Position) + public static void Mov_I32(ShaderIrBlock block, long opCode, int position) { - ShaderIrOperImm Imm = OpCode.Imm32_20(); + ShaderIrOperImm imm = opCode.Imm32_20(); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Imm))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(opCode.Gpr0(), imm))); } - public static void Mov_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Mov_R(ShaderIrBlock block, long opCode, int position) { - ShaderIrOperGpr Gpr = OpCode.Gpr20(); + ShaderIrOperGpr gpr = opCode.Gpr20(); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Gpr))); + block.AddNode(opCode.PredNode(new ShaderIrAsg(opCode.Gpr0(), gpr))); } - public static void Sel_C(ShaderIrBlock Block, long OpCode, int Position) + public static void Sel_C(ShaderIrBlock block, long opCode, int position) { - EmitSel(Block, OpCode, ShaderOper.CR); + EmitSel(block, opCode, ShaderOper.Cr); } - public static void Sel_I(ShaderIrBlock Block, long OpCode, int Position) + public static void Sel_I(ShaderIrBlock block, long opCode, int position) { - EmitSel(Block, OpCode, ShaderOper.Imm); + EmitSel(block, opCode, ShaderOper.Imm); } - public static void Sel_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Sel_R(ShaderIrBlock block, long opCode, int position) { - EmitSel(Block, OpCode, ShaderOper.RR); + EmitSel(block, opCode, ShaderOper.Rr); } - public static void Mov_S(ShaderIrBlock Block, long OpCode, int Position) + public static void Mov_S(ShaderIrBlock block, long opCode, int position) { - Block.AddNode(new ShaderIrCmnt("Stubbed.")); + block.AddNode(new ShaderIrCmnt("Stubbed.")); //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(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Source))); + 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.Read(45); - bool AbsA = OpCode.Read(49); + bool negA = opCode.Read(45); + bool absA = opCode.Read(49); - ShaderIrNode OperA; + ShaderIrNode operA; - switch (Oper) + switch (oper) { - case ShaderOper.CR: OperA = OpCode.Cbuf34(); break; - case ShaderOper.Immf: OperA = OpCode.Immf19_20(); break; - case ShaderOper.RR: OperA = OpCode.Gpr20(); break; + case ShaderOper.Cr: operA = opCode.Cbuf34(); break; + case ShaderOper.Immf: operA = opCode.Immf19_20(); break; + case ShaderOper.Rr: operA = opCode.Gpr20(); break; - default: throw new ArgumentException(nameof(Oper)); + default: throw new ArgumentException(nameof(oper)); } - OperA = GetAluFabsFneg(OperA, AbsA, NegA); + operA = GetAluFabsFneg(operA, absA, negA); - ShaderIrInst RoundInst = GetRoundInst(OpCode); + ShaderIrInst roundInst = GetRoundInst(opCode); - if (RoundInst != ShaderIrInst.Invalid) + if (roundInst != ShaderIrInst.Invalid) { - OperA = new ShaderIrOp(RoundInst, OperA); + operA = new ShaderIrOp(roundInst, operA); } - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), OperA))); + 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) { - IntType Type = GetIntType(OpCode); + IntType type = GetIntType(opCode); - if (Type == IntType.U64 || - Type == IntType.S64) + if (type == IntType.U64 || + type == IntType.S64) { //TODO: 64-bits support. //Note: GLSL doesn't support 64-bits integers. throw new NotImplementedException(); } - bool NegA = OpCode.Read(45); - bool AbsA = OpCode.Read(49); + bool negA = opCode.Read(45); + bool absA = opCode.Read(49); - ShaderIrNode OperA; + ShaderIrNode operA; - switch (Oper) + switch (oper) { - case ShaderOper.CR: OperA = OpCode.Cbuf34(); break; - case ShaderOper.Immf: OperA = OpCode.Immf19_20(); break; - case ShaderOper.RR: OperA = OpCode.Gpr20(); break; + case ShaderOper.Cr: operA = opCode.Cbuf34(); break; + case ShaderOper.Immf: operA = opCode.Immf19_20(); break; + case ShaderOper.Rr: operA = opCode.Gpr20(); break; - default: throw new ArgumentException(nameof(Oper)); + default: throw new ArgumentException(nameof(oper)); } - OperA = GetAluFabsFneg(OperA, AbsA, NegA); + operA = GetAluFabsFneg(operA, absA, negA); - ShaderIrInst RoundInst = GetRoundInst(OpCode); + ShaderIrInst roundInst = GetRoundInst(opCode); - if (RoundInst != ShaderIrInst.Invalid) + if (roundInst != ShaderIrInst.Invalid) { - OperA = new ShaderIrOp(RoundInst, OperA); + operA = new ShaderIrOp(roundInst, operA); } - bool Signed = Type >= IntType.S8; + bool signed = type >= IntType.S8; - int Size = 8 << ((int)Type & 3); + int size = 8 << ((int)type & 3); - if (Size < 32) + if (size < 32) { - uint Mask = uint.MaxValue >> (32 - Size); + uint mask = uint.MaxValue >> (32 - size); - float CMin = 0; - float CMax = Mask; + float cMin = 0; + float cMax = mask; - if (Signed) + if (signed) { - uint HalfMask = Mask >> 1; + uint halfMask = mask >> 1; - CMin -= HalfMask + 1; - CMax = HalfMask; + cMin -= halfMask + 1; + cMax = halfMask; } - ShaderIrOperImmf IMin = new ShaderIrOperImmf(CMin); - ShaderIrOperImmf IMax = new ShaderIrOperImmf(CMax); + ShaderIrOperImmf min = new ShaderIrOperImmf(cMin); + ShaderIrOperImmf max = new ShaderIrOperImmf(cMax); - OperA = new ShaderIrOp(ShaderIrInst.Fclamp, OperA, IMin, IMax); + operA = new ShaderIrOp(ShaderIrInst.Fclamp, operA, min, max); } - ShaderIrInst Inst = Signed + ShaderIrInst inst = signed ? ShaderIrInst.Ftos : ShaderIrInst.Ftou; - ShaderIrNode Op = new ShaderIrOp(Inst, OperA); + ShaderIrNode op = new ShaderIrOp(inst, operA); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op))); + 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) { - IntType Type = GetIntType(OpCode); + IntType type = GetIntType(opCode); - if (Type == IntType.U64 || - Type == IntType.S64) + if (type == IntType.U64 || + type == IntType.S64) { //TODO: 64-bits support. //Note: GLSL doesn't support 64-bits integers. throw new NotImplementedException(); } - int Sel = OpCode.Read(41, 3); + int sel = opCode.Read(41, 3); - bool NegA = OpCode.Read(45); - bool AbsA = OpCode.Read(49); + bool negA = opCode.Read(45); + bool absA = opCode.Read(49); - ShaderIrNode OperA; + ShaderIrNode operA; - switch (Oper) + switch (oper) { - case ShaderOper.CR: OperA = OpCode.Cbuf34(); break; - case ShaderOper.Imm: OperA = OpCode.Imm19_20(); break; - case ShaderOper.RR: OperA = OpCode.Gpr20(); break; + case ShaderOper.Cr: operA = opCode.Cbuf34(); break; + case ShaderOper.Imm: operA = opCode.Imm19_20(); break; + case ShaderOper.Rr: operA = opCode.Gpr20(); break; - default: throw new ArgumentException(nameof(Oper)); + default: throw new ArgumentException(nameof(oper)); } - OperA = GetAluIabsIneg(OperA, AbsA, NegA); + operA = GetAluIabsIneg(operA, absA, negA); - bool Signed = Type >= IntType.S8; + bool signed = type >= IntType.S8; - int Shift = Sel * 8; + int shift = sel * 8; - int Size = 8 << ((int)Type & 3); + int size = 8 << ((int)type & 3); - if (Shift != 0) + if (shift != 0) { - OperA = new ShaderIrOp(ShaderIrInst.Asr, OperA, new ShaderIrOperImm(Shift)); + operA = new ShaderIrOp(ShaderIrInst.Asr, operA, new ShaderIrOperImm(shift)); } - if (Size < 32) + if (size < 32) { - OperA = ExtendTo32(OperA, Signed, Size); + operA = ExtendTo32(operA, signed, size); } - ShaderIrInst Inst = Signed + ShaderIrInst inst = signed ? ShaderIrInst.Stof : ShaderIrInst.Utof; - ShaderIrNode Op = new ShaderIrOp(Inst, OperA); + ShaderIrNode op = new ShaderIrOp(inst, operA); - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), Op))); + 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) { - IntType Type = GetIntType(OpCode); + IntType type = GetIntType(opCode); - if (Type == IntType.U64 || - Type == IntType.S64) + if (type == IntType.U64 || + type == IntType.S64) { //TODO: 64-bits support. //Note: GLSL doesn't support 64-bits integers. throw new NotImplementedException(); } - int Sel = OpCode.Read(41, 3); + int sel = opCode.Read(41, 3); - bool NegA = OpCode.Read(45); - bool AbsA = OpCode.Read(49); - bool SatA = OpCode.Read(50); + bool negA = opCode.Read(45); + bool absA = opCode.Read(49); + bool satA = opCode.Read(50); - ShaderIrNode OperA; + ShaderIrNode operA; - switch (Oper) + switch (oper) { - case ShaderOper.CR: OperA = OpCode.Cbuf34(); break; - case ShaderOper.Immf: OperA = OpCode.Immf19_20(); break; - case ShaderOper.RR: OperA = OpCode.Gpr20(); break; + case ShaderOper.Cr: operA = opCode.Cbuf34(); break; + case ShaderOper.Immf: operA = opCode.Immf19_20(); break; + case ShaderOper.Rr: operA = opCode.Gpr20(); break; - default: throw new ArgumentException(nameof(Oper)); + default: throw new ArgumentException(nameof(oper)); } - OperA = GetAluIabsIneg(OperA, AbsA, NegA); + operA = GetAluIabsIneg(operA, absA, negA); - bool Signed = Type >= IntType.S8; + bool signed = type >= IntType.S8; - int Shift = Sel * 8; + int shift = sel * 8; - int Size = 8 << ((int)Type & 3); + int size = 8 << ((int)type & 3); - if (Shift != 0) + if (shift != 0) { - OperA = new ShaderIrOp(ShaderIrInst.Asr, OperA, new ShaderIrOperImm(Shift)); + operA = new ShaderIrOp(ShaderIrInst.Asr, operA, new ShaderIrOperImm(shift)); } - if (Size < 32) + if (size < 32) { - uint Mask = uint.MaxValue >> (32 - Size); + uint mask = uint.MaxValue >> (32 - size); - if (SatA) + if (satA) { - uint CMin = 0; - uint CMax = Mask; + uint cMin = 0; + uint cMax = mask; - if (Signed) + if (signed) { - uint HalfMask = Mask >> 1; + uint halfMask = mask >> 1; - CMin -= HalfMask + 1; - CMax = HalfMask; + cMin -= halfMask + 1; + cMax = halfMask; } - ShaderIrOperImm IMin = new ShaderIrOperImm((int)CMin); - ShaderIrOperImm IMax = new ShaderIrOperImm((int)CMax); + ShaderIrOperImm min = new ShaderIrOperImm((int)cMin); + ShaderIrOperImm max = new ShaderIrOperImm((int)cMax); - OperA = new ShaderIrOp(Signed + operA = new ShaderIrOp(signed ? ShaderIrInst.Clamps - : ShaderIrInst.Clampu, OperA, IMin, IMax); + : ShaderIrInst.Clampu, operA, min, max); } else { - OperA = ExtendTo32(OperA, Signed, Size); + operA = ExtendTo32(operA, signed, size); } } - Block.AddNode(OpCode.PredNode(new ShaderIrAsg(OpCode.Gpr0(), OperA))); + 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 = OpCode.Gpr0(); - ShaderIrNode Pred = OpCode.Pred39N(); + ShaderIrOperGpr dst = opCode.Gpr0(); + ShaderIrNode pred = opCode.Pred39N(); - ShaderIrNode ResultA = OpCode.Gpr8(); - ShaderIrNode ResultB; + ShaderIrNode resultA = opCode.Gpr8(); + ShaderIrNode resultB; - switch (Oper) + switch (oper) { - case ShaderOper.CR: ResultB = OpCode.Cbuf34(); break; - case ShaderOper.Imm: ResultB = OpCode.Imm19_20(); break; - case ShaderOper.RR: ResultB = OpCode.Gpr20(); break; + case ShaderOper.Cr: resultB = opCode.Cbuf34(); break; + case ShaderOper.Imm: resultB = opCode.Imm19_20(); break; + case ShaderOper.Rr: resultB = opCode.Gpr20(); break; - default: throw new ArgumentException(nameof(Oper)); + default: throw new ArgumentException(nameof(oper)); } - Block.AddNode(OpCode.PredNode(new ShaderIrCond(Pred, new ShaderIrAsg(Dst, ResultA), false))); + block.AddNode(opCode.PredNode(new ShaderIrCond(pred, new ShaderIrAsg(dst, resultA), false))); - Block.AddNode(OpCode.PredNode(new ShaderIrCond(Pred, new ShaderIrAsg(Dst, ResultB), true))); + 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.Read(13); + bool signed = opCode.Read(13); - IntType Type = (IntType)(OpCode.Read(10, 3)); + IntType type = (IntType)(opCode.Read(10, 3)); - if (Signed) + if (signed) { - Type += (int)IntType.S8; + type += (int)IntType.S8; } - return Type; + return type; } - private static FloatType GetFloatType(long OpCode) + private static FloatType GetFloatType(long opCode) { - return (FloatType)(OpCode.Read(8, 3)); + return (FloatType)(opCode.Read(8, 3)); } - private static ShaderIrInst GetRoundInst(long OpCode) + private static ShaderIrInst GetRoundInst(long opCode) { - switch (OpCode.Read(39, 3)) + switch (opCode.Read(39, 3)) { case 1: return ShaderIrInst.Floor; case 2: return ShaderIrInst.Ceil; diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeOpCode.cs b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeOpCode.cs index e241e1ca..4b1e4046 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeOpCode.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeOpCode.cs @@ -4,227 +4,227 @@ namespace Ryujinx.Graphics.Gal.Shader { static partial class ShaderDecode { - private static int Read(this long OpCode, int Position, int Mask) + private static int Read(this long opCode, int position, int mask) { - return (int)(OpCode >> Position) & Mask; + return (int)(opCode >> position) & mask; } - private static bool Read(this long OpCode, int Position) + private static bool Read(this long opCode, int position) { - return ((OpCode >> Position) & 1) != 0; + return ((opCode >> position) & 1) != 0; } - private static int Branch(this long OpCode) + private static int Branch(this long opCode) { - return ((int)(OpCode >> 20) << 8) >> 8; + return ((int)(opCode >> 20) << 8) >> 8; } - private static bool HasArray(this long OpCode) + private static bool HasArray(this long opCode) { - return OpCode.Read(0x1c); + return opCode.Read(0x1c); } - private static ShaderIrOperAbuf[] Abuf20(this long OpCode) + private static ShaderIrOperAbuf[] Abuf20(this long opCode) { - int Abuf = OpCode.Read(20, 0x3ff); - int Size = OpCode.Read(47, 3); + int abuf = opCode.Read(20, 0x3ff); + int size = opCode.Read(47, 3); - ShaderIrOperGpr Vertex = OpCode.Gpr39(); + ShaderIrOperGpr vertex = opCode.Gpr39(); - ShaderIrOperAbuf[] Opers = new ShaderIrOperAbuf[Size + 1]; + ShaderIrOperAbuf[] opers = new ShaderIrOperAbuf[size + 1]; - for (int Index = 0; Index <= Size; Index++) + for (int index = 0; index <= size; index++) { - Opers[Index] = new ShaderIrOperAbuf(Abuf + Index * 4, Vertex); + opers[index] = new ShaderIrOperAbuf(abuf + index * 4, vertex); } - return Opers; + return opers; } - private static ShaderIrOperAbuf Abuf28(this long OpCode) + private static ShaderIrOperAbuf Abuf28(this long opCode) { - int Abuf = OpCode.Read(28, 0x3ff); + int abuf = opCode.Read(28, 0x3ff); - return new ShaderIrOperAbuf(Abuf, OpCode.Gpr39()); + return new ShaderIrOperAbuf(abuf, opCode.Gpr39()); } - private static ShaderIrOperCbuf Cbuf34(this long OpCode) + private static ShaderIrOperCbuf Cbuf34(this long opCode) { return new ShaderIrOperCbuf( - OpCode.Read(34, 0x1f), - OpCode.Read(20, 0x3fff)); + opCode.Read(34, 0x1f), + opCode.Read(20, 0x3fff)); } - private static ShaderIrOperGpr Gpr8(this long OpCode) + private static ShaderIrOperGpr Gpr8(this long opCode) { - return new ShaderIrOperGpr(OpCode.Read(8, 0xff)); + return new ShaderIrOperGpr(opCode.Read(8, 0xff)); } - private static ShaderIrOperGpr Gpr20(this long OpCode) + private static ShaderIrOperGpr Gpr20(this long opCode) { - return new ShaderIrOperGpr(OpCode.Read(20, 0xff)); + return new ShaderIrOperGpr(opCode.Read(20, 0xff)); } - private static ShaderIrOperGpr Gpr39(this long OpCode) + private static ShaderIrOperGpr Gpr39(this long opCode) { - return new ShaderIrOperGpr(OpCode.Read(39, 0xff)); + return new ShaderIrOperGpr(opCode.Read(39, 0xff)); } - private static ShaderIrOperGpr Gpr0(this long OpCode) + private static ShaderIrOperGpr Gpr0(this long opCode) { - return new ShaderIrOperGpr(OpCode.Read(0, 0xff)); + return new ShaderIrOperGpr(opCode.Read(0, 0xff)); } - private static ShaderIrOperGpr Gpr28(this long OpCode) + private static ShaderIrOperGpr Gpr28(this long opCode) { - return new ShaderIrOperGpr(OpCode.Read(28, 0xff)); + return new ShaderIrOperGpr(opCode.Read(28, 0xff)); } - private static ShaderIrOperGpr[] GprHalfVec8(this long OpCode) + private static ShaderIrOperGpr[] GprHalfVec8(this long opCode) { - return GetGprHalfVec2(OpCode.Read(8, 0xff), OpCode.Read(47, 3)); + return GetGprHalfVec2(opCode.Read(8, 0xff), opCode.Read(47, 3)); } - private static ShaderIrOperGpr[] GprHalfVec20(this long OpCode) + private static ShaderIrOperGpr[] GprHalfVec20(this long opCode) { - return GetGprHalfVec2(OpCode.Read(20, 0xff), OpCode.Read(28, 3)); + return GetGprHalfVec2(opCode.Read(20, 0xff), opCode.Read(28, 3)); } - private static ShaderIrOperGpr[] GetGprHalfVec2(int Gpr, int Mask) + private static ShaderIrOperGpr[] GetGprHalfVec2(int gpr, int mask) { - if (Mask == 1) + if (mask == 1) { //This value is used for FP32, the whole 32-bits register //is used as each element on the vector. return new ShaderIrOperGpr[] { - new ShaderIrOperGpr(Gpr), - new ShaderIrOperGpr(Gpr) + new ShaderIrOperGpr(gpr), + new ShaderIrOperGpr(gpr) }; } - ShaderIrOperGpr Low = new ShaderIrOperGpr(Gpr, 0); - ShaderIrOperGpr High = new ShaderIrOperGpr(Gpr, 1); + ShaderIrOperGpr low = new ShaderIrOperGpr(gpr, 0); + ShaderIrOperGpr high = new ShaderIrOperGpr(gpr, 1); return new ShaderIrOperGpr[] { - (Mask & 1) != 0 ? High : Low, - (Mask & 2) != 0 ? High : Low + (mask & 1) != 0 ? high : low, + (mask & 2) != 0 ? high : low }; } - private static ShaderIrOperGpr GprHalf0(this long OpCode, int HalfPart) + private static ShaderIrOperGpr GprHalf0(this long opCode, int halfPart) { - return new ShaderIrOperGpr(OpCode.Read(0, 0xff), HalfPart); + return new ShaderIrOperGpr(opCode.Read(0, 0xff), halfPart); } - private static ShaderIrOperGpr GprHalf28(this long OpCode, int HalfPart) + private static ShaderIrOperGpr GprHalf28(this long opCode, int halfPart) { - return new ShaderIrOperGpr(OpCode.Read(28, 0xff), HalfPart); + return new ShaderIrOperGpr(opCode.Read(28, 0xff), halfPart); } - private static ShaderIrOperImm Imm5_39(this long OpCode) + private static ShaderIrOperImm Imm5_39(this long opCode) { - return new ShaderIrOperImm(OpCode.Read(39, 0x1f)); + return new ShaderIrOperImm(opCode.Read(39, 0x1f)); } - private static ShaderIrOperImm Imm13_36(this long OpCode) + private static ShaderIrOperImm Imm13_36(this long opCode) { - return new ShaderIrOperImm(OpCode.Read(36, 0x1fff)); + return new ShaderIrOperImm(opCode.Read(36, 0x1fff)); } - private static ShaderIrOperImm Imm32_20(this long OpCode) + private static ShaderIrOperImm Imm32_20(this long opCode) { - return new ShaderIrOperImm((int)(OpCode >> 20)); + return new ShaderIrOperImm((int)(opCode >> 20)); } - private static ShaderIrOperImmf Immf32_20(this long OpCode) + private static ShaderIrOperImmf Immf32_20(this long opCode) { - return new ShaderIrOperImmf(BitConverter.Int32BitsToSingle((int)(OpCode >> 20))); + return new ShaderIrOperImmf(BitConverter.Int32BitsToSingle((int)(opCode >> 20))); } - private static ShaderIrOperImm ImmU16_20(this long OpCode) + private static ShaderIrOperImm ImmU16_20(this long opCode) { - return new ShaderIrOperImm(OpCode.Read(20, 0xffff)); + return new ShaderIrOperImm(opCode.Read(20, 0xffff)); } - private static ShaderIrOperImm Imm19_20(this long OpCode) + private static ShaderIrOperImm Imm19_20(this long opCode) { - int Value = OpCode.Read(20, 0x7ffff); + int value = opCode.Read(20, 0x7ffff); - bool Neg = OpCode.Read(56); + bool neg = opCode.Read(56); - if (Neg) + if (neg) { - Value = -Value; + value = -value; } - return new ShaderIrOperImm(Value); + return new ShaderIrOperImm(value); } - private static ShaderIrOperImmf Immf19_20(this long OpCode) + private static ShaderIrOperImmf Immf19_20(this long opCode) { - uint Imm = (uint)(OpCode >> 20) & 0x7ffff; + uint imm = (uint)(opCode >> 20) & 0x7ffff; - bool Neg = OpCode.Read(56); + bool neg = opCode.Read(56); - Imm <<= 12; + imm <<= 12; - if (Neg) + if (neg) { - Imm |= 0x80000000; + imm |= 0x80000000; } - float Value = BitConverter.Int32BitsToSingle((int)Imm); + float value = BitConverter.Int32BitsToSingle((int)imm); - return new ShaderIrOperImmf(Value); + return new ShaderIrOperImmf(value); } - private static ShaderIrOperPred Pred0(this long OpCode) + private static ShaderIrOperPred Pred0(this long opCode) { - return new ShaderIrOperPred(OpCode.Read(0, 7)); + return new ShaderIrOperPred(opCode.Read(0, 7)); } - private static ShaderIrOperPred Pred3(this long OpCode) + private static ShaderIrOperPred Pred3(this long opCode) { - return new ShaderIrOperPred(OpCode.Read(3, 7)); + return new ShaderIrOperPred(opCode.Read(3, 7)); } - private static ShaderIrOperPred Pred12(this long OpCode) + private static ShaderIrOperPred Pred12(this long opCode) { - return new ShaderIrOperPred(OpCode.Read(12, 7)); + return new ShaderIrOperPred(opCode.Read(12, 7)); } - private static ShaderIrOperPred Pred29(this long OpCode) + private static ShaderIrOperPred Pred29(this long opCode) { - return new ShaderIrOperPred(OpCode.Read(29, 7)); + return new ShaderIrOperPred(opCode.Read(29, 7)); } - private static ShaderIrNode Pred39N(this long OpCode) + private static ShaderIrNode Pred39N(this long opCode) { - ShaderIrNode Node = OpCode.Pred39(); + ShaderIrNode node = opCode.Pred39(); - if (OpCode.Read(42)) + if (opCode.Read(42)) { - Node = new ShaderIrOp(ShaderIrInst.Bnot, Node); + node = new ShaderIrOp(ShaderIrInst.Bnot, node); } - return Node; + return node; } - private static ShaderIrOperPred Pred39(this long OpCode) + private static ShaderIrOperPred Pred39(this long opCode) { - return new ShaderIrOperPred(OpCode.Read(39, 7)); + return new ShaderIrOperPred(opCode.Read(39, 7)); } - private static ShaderIrOperPred Pred48(this long OpCode) + private static ShaderIrOperPred Pred48(this long opCode) { - return new ShaderIrOperPred(OpCode.Read(48, 7)); + return new ShaderIrOperPred(opCode.Read(48, 7)); } - private static ShaderIrInst Cmp(this long OpCode) + private static ShaderIrInst Cmp(this long opCode) { - switch (OpCode.Read(49, 7)) + switch (opCode.Read(49, 7)) { case 1: return ShaderIrInst.Clt; case 2: return ShaderIrInst.Ceq; @@ -234,12 +234,12 @@ namespace Ryujinx.Graphics.Gal.Shader case 6: return ShaderIrInst.Cge; } - throw new ArgumentException(nameof(OpCode)); + throw new ArgumentException(nameof(opCode)); } - private static ShaderIrInst CmpF(this long OpCode) + private static ShaderIrInst CmpF(this long opCode) { - switch (OpCode.Read(48, 0xf)) + switch (opCode.Read(48, 0xf)) { case 0x1: return ShaderIrInst.Fclt; case 0x2: return ShaderIrInst.Fceq; @@ -257,57 +257,57 @@ namespace Ryujinx.Graphics.Gal.Shader case 0xe: return ShaderIrInst.Fcgeu; } - throw new ArgumentException(nameof(OpCode)); + throw new ArgumentException(nameof(opCode)); } - private static ShaderIrInst BLop45(this long OpCode) + private static ShaderIrInst BLop45(this long opCode) { - switch (OpCode.Read(45, 3)) + 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)); + throw new ArgumentException(nameof(opCode)); } - private static ShaderIrInst BLop24(this long OpCode) + private static ShaderIrInst BLop24(this long opCode) { - switch (OpCode.Read(24, 3)) + 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)); + throw new ArgumentException(nameof(opCode)); } - private static ShaderIrNode PredNode(this long OpCode, ShaderIrNode Node) + private static ShaderIrNode PredNode(this long opCode, ShaderIrNode node) { - ShaderIrOperPred Pred = OpCode.PredNode(); + ShaderIrOperPred pred = opCode.PredNode(); - if (Pred.Index != ShaderIrOperPred.UnusedIndex) + if (pred.Index != ShaderIrOperPred.UnusedIndex) { - bool Inv = OpCode.Read(19); + bool inv = opCode.Read(19); - Node = new ShaderIrCond(Pred, Node, Inv); + node = new ShaderIrCond(pred, node, inv); } - return Node; + return node; } - private static ShaderIrOperPred PredNode(this long OpCode) + private static ShaderIrOperPred PredNode(this long opCode) { - int Pred = OpCode.Read(16, 0xf); + int pred = opCode.Read(16, 0xf); - if (Pred != 0xf) + if (pred != 0xf) { - Pred &= 7; + pred &= 7; } - return new ShaderIrOperPred(Pred); + return new ShaderIrOperPred(pred); } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeSpecial.cs b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeSpecial.cs index 35abdb76..9098ca5e 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeSpecial.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeSpecial.cs @@ -2,23 +2,23 @@ { static partial class ShaderDecode { - public static void Out_R(ShaderIrBlock Block, long OpCode, int Position) + public static void Out_R(ShaderIrBlock block, long opCode, int position) { //TODO: Those registers have to be used for something - ShaderIrOperGpr Gpr0 = OpCode.Gpr0(); - ShaderIrOperGpr Gpr8 = OpCode.Gpr8(); - ShaderIrOperGpr Gpr20 = OpCode.Gpr20(); + ShaderIrOperGpr gpr0 = opCode.Gpr0(); + ShaderIrOperGpr gpr8 = opCode.Gpr8(); + ShaderIrOperGpr gpr20 = opCode.Gpr20(); - int Type = OpCode.Read(39, 3); + int type = opCode.Read(39, 3); - if ((Type & 1) != 0) + if ((type & 1) != 0) { - Block.AddNode(OpCode.PredNode(new ShaderIrOp(ShaderIrInst.Emit))); + block.AddNode(opCode.PredNode(new ShaderIrOp(ShaderIrInst.Emit))); } - if ((Type & 2) != 0) + if ((type & 2) != 0) { - Block.AddNode(OpCode.PredNode(new ShaderIrOp(ShaderIrInst.Cut))); + block.AddNode(opCode.PredNode(new ShaderIrOp(ShaderIrInst.Cut))); } } } diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderDecoder.cs b/Ryujinx.Graphics/Gal/Shader/ShaderDecoder.cs index f8c07f31..4b23f8d0 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderDecoder.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderDecoder.cs @@ -8,74 +8,74 @@ namespace Ryujinx.Graphics.Gal.Shader private const bool AddDbgComments = true; - public static ShaderIrBlock[] Decode(IGalMemory Memory, long Start) + public static ShaderIrBlock[] Decode(IGalMemory memory, long start) { - Dictionary<int, ShaderIrBlock> Visited = new Dictionary<int, ShaderIrBlock>(); - Dictionary<int, ShaderIrBlock> VisitedEnd = new Dictionary<int, ShaderIrBlock>(); + Dictionary<int, ShaderIrBlock> visited = new Dictionary<int, ShaderIrBlock>(); + Dictionary<int, ShaderIrBlock> visitedEnd = new Dictionary<int, ShaderIrBlock>(); - Queue<ShaderIrBlock> Blocks = new Queue<ShaderIrBlock>(); + Queue<ShaderIrBlock> blocks = new Queue<ShaderIrBlock>(); - long Beginning = Start + HeaderSize; + long beginning = start + HeaderSize; - ShaderIrBlock Enqueue(int Position, ShaderIrBlock Source = null) + ShaderIrBlock Enqueue(int position, ShaderIrBlock source = null) { - if (!Visited.TryGetValue(Position, out ShaderIrBlock Output)) + if (!visited.TryGetValue(position, out ShaderIrBlock output)) { - Output = new ShaderIrBlock(Position); + output = new ShaderIrBlock(position); - Blocks.Enqueue(Output); + blocks.Enqueue(output); - Visited.Add(Position, Output); + visited.Add(position, output); } - if (Source != null) + if (source != null) { - Output.Sources.Add(Source); + output.Sources.Add(source); } - return Output; + return output; } - ShaderIrBlock Entry = Enqueue(0); + ShaderIrBlock entry = Enqueue(0); - while (Blocks.Count > 0) + while (blocks.Count > 0) { - ShaderIrBlock Current = Blocks.Dequeue(); + ShaderIrBlock current = blocks.Dequeue(); - FillBlock(Memory, Current, Beginning); + FillBlock(memory, current, beginning); //Set child blocks. "Branch" is the block the branch instruction //points to (when taken), "Next" is the block at the next address, //executed when the branch is not taken. For Unconditional Branches //or end of shader, Next is null. - if (Current.Nodes.Count > 0) + if (current.Nodes.Count > 0) { - ShaderIrNode LastNode = Current.GetLastNode(); + ShaderIrNode lastNode = current.GetLastNode(); - ShaderIrOp InnerOp = GetInnermostOp(LastNode); + ShaderIrOp innerOp = GetInnermostOp(lastNode); - if (InnerOp?.Inst == ShaderIrInst.Bra) + if (innerOp?.Inst == ShaderIrInst.Bra) { - int Target = ((ShaderIrOperImm)InnerOp.OperandA).Value; + int target = ((ShaderIrOperImm)innerOp.OperandA).Value; - Current.Branch = Enqueue(Target, Current); + current.Branch = Enqueue(target, current); } - foreach (ShaderIrNode Node in Current.Nodes) + foreach (ShaderIrNode node in current.Nodes) { - InnerOp = GetInnermostOp(Node); + innerOp = GetInnermostOp(node); - if (InnerOp is ShaderIrOp CurrOp && CurrOp.Inst == ShaderIrInst.Ssy) + if (innerOp is ShaderIrOp currOp && currOp.Inst == ShaderIrInst.Ssy) { - int Target = ((ShaderIrOperImm)CurrOp.OperandA).Value; + int target = ((ShaderIrOperImm)currOp.OperandA).Value; - Enqueue(Target, Current); + Enqueue(target, current); } } - if (NodeHasNext(LastNode)) + if (NodeHasNext(lastNode)) { - Current.Next = Enqueue(Current.EndPosition); + current.Next = Enqueue(current.EndPosition); } } @@ -83,136 +83,136 @@ namespace Ryujinx.Graphics.Gal.Shader //then we need to split the bigger block and have two small blocks, //the end position of the bigger "Current" block should then be == to //the position of the "Smaller" block. - while (VisitedEnd.TryGetValue(Current.EndPosition, out ShaderIrBlock Smaller)) + while (visitedEnd.TryGetValue(current.EndPosition, out ShaderIrBlock smaller)) { - if (Current.Position > Smaller.Position) + if (current.Position > smaller.Position) { - ShaderIrBlock Temp = Smaller; + ShaderIrBlock temp = smaller; - Smaller = Current; - Current = Temp; + smaller = current; + current = temp; } - Current.EndPosition = Smaller.Position; - Current.Next = Smaller; - Current.Branch = null; + current.EndPosition = smaller.Position; + current.Next = smaller; + current.Branch = null; - Current.Nodes.RemoveRange( - Current.Nodes.Count - Smaller.Nodes.Count, - Smaller.Nodes.Count); + current.Nodes.RemoveRange( + current.Nodes.Count - smaller.Nodes.Count, + smaller.Nodes.Count); - VisitedEnd[Smaller.EndPosition] = Smaller; + visitedEnd[smaller.EndPosition] = smaller; } - VisitedEnd.Add(Current.EndPosition, Current); + visitedEnd.Add(current.EndPosition, current); } //Make and sort Graph blocks array by position. - ShaderIrBlock[] Graph = new ShaderIrBlock[Visited.Count]; + ShaderIrBlock[] graph = new ShaderIrBlock[visited.Count]; - while (Visited.Count > 0) + while (visited.Count > 0) { - uint FirstPos = uint.MaxValue; + uint firstPos = uint.MaxValue; - foreach (ShaderIrBlock Block in Visited.Values) + foreach (ShaderIrBlock block in visited.Values) { - if (FirstPos > (uint)Block.Position) - FirstPos = (uint)Block.Position; + if (firstPos > (uint)block.Position) + firstPos = (uint)block.Position; } - ShaderIrBlock Current = Visited[(int)FirstPos]; + ShaderIrBlock current = visited[(int)firstPos]; do { - Graph[Graph.Length - Visited.Count] = Current; + graph[graph.Length - visited.Count] = current; - Visited.Remove(Current.Position); + visited.Remove(current.Position); - Current = Current.Next; + current = current.Next; } - while (Current != null); + while (current != null); } - return Graph; + return graph; } - private static void FillBlock(IGalMemory Memory, ShaderIrBlock Block, long Beginning) + private static void FillBlock(IGalMemory memory, ShaderIrBlock block, long beginning) { - int Position = Block.Position; + int position = block.Position; do { //Ignore scheduling instructions, which are written every 32 bytes. - if ((Position & 0x1f) == 0) + if ((position & 0x1f) == 0) { - Position += 8; + position += 8; continue; } - uint Word0 = (uint)Memory.ReadInt32(Position + Beginning + 0); - uint Word1 = (uint)Memory.ReadInt32(Position + Beginning + 4); + uint word0 = (uint)memory.ReadInt32(position + beginning + 0); + uint word1 = (uint)memory.ReadInt32(position + beginning + 4); - Position += 8; + position += 8; - long OpCode = Word0 | (long)Word1 << 32; + long opCode = word0 | (long)word1 << 32; - ShaderDecodeFunc Decode = ShaderOpCodeTable.GetDecoder(OpCode); + ShaderDecodeFunc decode = ShaderOpCodeTable.GetDecoder(opCode); if (AddDbgComments) { - string DbgOpCode = $"0x{(Position - 8):x16}: 0x{OpCode:x16} "; + string dbgOpCode = $"0x{(position - 8):x16}: 0x{opCode:x16} "; - DbgOpCode += (Decode?.Method.Name ?? "???"); + dbgOpCode += (decode?.Method.Name ?? "???"); - if (Decode == ShaderDecode.Bra || Decode == ShaderDecode.Ssy) + if (decode == ShaderDecode.Bra || decode == ShaderDecode.Ssy) { - int Offset = ((int)(OpCode >> 20) << 8) >> 8; + int offset = ((int)(opCode >> 20) << 8) >> 8; - long Target = Position + Offset; + long target = position + offset; - DbgOpCode += " (0x" + Target.ToString("x16") + ")"; + dbgOpCode += " (0x" + target.ToString("x16") + ")"; } - Block.AddNode(new ShaderIrCmnt(DbgOpCode)); + block.AddNode(new ShaderIrCmnt(dbgOpCode)); } - if (Decode == null) + if (decode == null) { continue; } - Decode(Block, OpCode, Position); + decode(block, opCode, position); } - while (!IsFlowChange(Block.GetLastNode())); + while (!IsFlowChange(block.GetLastNode())); - Block.EndPosition = Position; + block.EndPosition = position; } - private static bool IsFlowChange(ShaderIrNode Node) + private static bool IsFlowChange(ShaderIrNode node) { - return !NodeHasNext(GetInnermostOp(Node)); + return !NodeHasNext(GetInnermostOp(node)); } - private static ShaderIrOp GetInnermostOp(ShaderIrNode Node) + private static ShaderIrOp GetInnermostOp(ShaderIrNode node) { - if (Node is ShaderIrCond Cond) + if (node is ShaderIrCond cond) { - Node = Cond.Child; + node = cond.Child; } - return Node is ShaderIrOp Op ? Op : null; + return node is ShaderIrOp op ? op : null; } - private static bool NodeHasNext(ShaderIrNode Node) + private static bool NodeHasNext(ShaderIrNode node) { - if (!(Node is ShaderIrOp Op)) + if (!(node is ShaderIrOp op)) { return true; } - return Op.Inst != ShaderIrInst.Exit && - Op.Inst != ShaderIrInst.Bra; + return op.Inst != ShaderIrInst.Exit && + op.Inst != ShaderIrInst.Bra; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderHeader.cs b/Ryujinx.Graphics/Gal/Shader/ShaderHeader.cs index eca90fc3..2f9326e1 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderHeader.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderHeader.cs @@ -11,9 +11,9 @@ namespace Ryujinx.Graphics.Gal.Shader public bool Enabled => Red || Green || Blue || Alpha; - public bool ComponentEnabled(int Component) + public bool ComponentEnabled(int component) { - switch (Component) + switch (component) { case 0: return Red; case 1: return Green; @@ -21,7 +21,7 @@ namespace Ryujinx.Graphics.Gal.Shader case 3: return Alpha; } - throw new ArgumentException(nameof(Component)); + throw new ArgumentException(nameof(component)); } } @@ -59,88 +59,88 @@ namespace Ryujinx.Graphics.Gal.Shader public bool OmapSampleMask { get; private set; } public bool OmapDepth { get; private set; } - public ShaderHeader(IGalMemory Memory, long Position) + public ShaderHeader(IGalMemory memory, long position) { - uint CommonWord0 = (uint)Memory.ReadInt32(Position + 0); - uint CommonWord1 = (uint)Memory.ReadInt32(Position + 4); - uint CommonWord2 = (uint)Memory.ReadInt32(Position + 8); - uint CommonWord3 = (uint)Memory.ReadInt32(Position + 12); - uint CommonWord4 = (uint)Memory.ReadInt32(Position + 16); - - SphType = ReadBits(CommonWord0, 0, 5); - Version = ReadBits(CommonWord0, 5, 5); - ShaderType = ReadBits(CommonWord0, 10, 4); - MrtEnable = ReadBits(CommonWord0, 14, 1) != 0; - KillsPixels = ReadBits(CommonWord0, 15, 1) != 0; - DoesGlobalStore = ReadBits(CommonWord0, 16, 1) != 0; - SassVersion = ReadBits(CommonWord0, 17, 4); - DoesLoadOrStore = ReadBits(CommonWord0, 26, 1) != 0; - DoesFp64 = ReadBits(CommonWord0, 27, 1) != 0; - StreamOutMask = ReadBits(CommonWord0, 28, 4); - - ShaderLocalMemoryLowSize = ReadBits(CommonWord1, 0, 24); - PerPatchAttributeCount = ReadBits(CommonWord1, 24, 8); - - ShaderLocalMemoryHighSize = ReadBits(CommonWord2, 0, 24); - ThreadsPerInputPrimitive = ReadBits(CommonWord2, 24, 8); - - ShaderLocalMemoryCrsSize = ReadBits(CommonWord3, 0, 24); - OutputTopology = ReadBits(CommonWord3, 24, 4); - - MaxOutputVertexCount = ReadBits(CommonWord4, 0, 12); - StoreReqStart = ReadBits(CommonWord4, 12, 8); - StoreReqEnd = ReadBits(CommonWord4, 24, 8); + uint commonWord0 = (uint)memory.ReadInt32(position + 0); + uint commonWord1 = (uint)memory.ReadInt32(position + 4); + uint commonWord2 = (uint)memory.ReadInt32(position + 8); + uint commonWord3 = (uint)memory.ReadInt32(position + 12); + uint commonWord4 = (uint)memory.ReadInt32(position + 16); + + SphType = ReadBits(commonWord0, 0, 5); + Version = ReadBits(commonWord0, 5, 5); + ShaderType = ReadBits(commonWord0, 10, 4); + MrtEnable = ReadBits(commonWord0, 14, 1) != 0; + KillsPixels = ReadBits(commonWord0, 15, 1) != 0; + DoesGlobalStore = ReadBits(commonWord0, 16, 1) != 0; + SassVersion = ReadBits(commonWord0, 17, 4); + DoesLoadOrStore = ReadBits(commonWord0, 26, 1) != 0; + DoesFp64 = ReadBits(commonWord0, 27, 1) != 0; + StreamOutMask = ReadBits(commonWord0, 28, 4); + + ShaderLocalMemoryLowSize = ReadBits(commonWord1, 0, 24); + PerPatchAttributeCount = ReadBits(commonWord1, 24, 8); + + ShaderLocalMemoryHighSize = ReadBits(commonWord2, 0, 24); + ThreadsPerInputPrimitive = ReadBits(commonWord2, 24, 8); + + ShaderLocalMemoryCrsSize = ReadBits(commonWord3, 0, 24); + OutputTopology = ReadBits(commonWord3, 24, 4); + + MaxOutputVertexCount = ReadBits(commonWord4, 0, 12); + StoreReqStart = ReadBits(commonWord4, 12, 8); + StoreReqEnd = ReadBits(commonWord4, 24, 8); //Type 2 (fragment?) reading - uint Type2OmapTarget = (uint)Memory.ReadInt32(Position + 72); - uint Type2Omap = (uint)Memory.ReadInt32(Position + 76); + uint type2OmapTarget = (uint)memory.ReadInt32(position + 72); + uint type2Omap = (uint)memory.ReadInt32(position + 76); OmapTargets = new OmapTarget[8]; for (int i = 0; i < OmapTargets.Length; i++) { - int Offset = i * 4; + int offset = i * 4; OmapTargets[i] = new OmapTarget { - Red = ReadBits(Type2OmapTarget, Offset + 0, 1) != 0, - Green = ReadBits(Type2OmapTarget, Offset + 1, 1) != 0, - Blue = ReadBits(Type2OmapTarget, Offset + 2, 1) != 0, - Alpha = ReadBits(Type2OmapTarget, Offset + 3, 1) != 0 + Red = ReadBits(type2OmapTarget, offset + 0, 1) != 0, + Green = ReadBits(type2OmapTarget, offset + 1, 1) != 0, + Blue = ReadBits(type2OmapTarget, offset + 2, 1) != 0, + Alpha = ReadBits(type2OmapTarget, offset + 3, 1) != 0 }; } - OmapSampleMask = ReadBits(Type2Omap, 0, 1) != 0; - OmapDepth = ReadBits(Type2Omap, 1, 1) != 0; + OmapSampleMask = ReadBits(type2Omap, 0, 1) != 0; + OmapDepth = ReadBits(type2Omap, 1, 1) != 0; } public int DepthRegister { get { - int Count = 0; + int count = 0; - for (int Index = 0; Index < OmapTargets.Length; Index++) + for (int index = 0; index < OmapTargets.Length; index++) { - for (int Component = 0; Component < 4; Component++) + for (int component = 0; component < 4; component++) { - if (OmapTargets[Index].ComponentEnabled(Component)) + if (OmapTargets[index].ComponentEnabled(component)) { - Count++; + count++; } } } // Depth register is always two registers after the last color output - return Count + 1; + return count + 1; } } - private static int ReadBits(uint Word, int Offset, int BitWidth) + private static int ReadBits(uint word, int offset, int bitWidth) { - uint Mask = (1u << BitWidth) - 1u; + uint mask = (1u << bitWidth) - 1u; - return (int)((Word >> Offset) & Mask); + return (int)((word >> offset) & mask); } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderIrAsg.cs b/Ryujinx.Graphics/Gal/Shader/ShaderIrAsg.cs index 00f8f6a5..53871a14 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderIrAsg.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderIrAsg.cs @@ -5,10 +5,10 @@ namespace Ryujinx.Graphics.Gal.Shader public ShaderIrNode Dst { get; set; } public ShaderIrNode Src { get; set; } - public ShaderIrAsg(ShaderIrNode Dst, ShaderIrNode Src) + public ShaderIrAsg(ShaderIrNode dst, ShaderIrNode src) { - this.Dst = Dst; - this.Src = Src; + Dst = dst; + Src = src; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderIrBlock.cs b/Ryujinx.Graphics/Gal/Shader/ShaderIrBlock.cs index 782f9626..49257d28 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderIrBlock.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderIrBlock.cs @@ -14,18 +14,18 @@ namespace Ryujinx.Graphics.Gal.Shader public List<ShaderIrNode> Nodes { get; private set; } - public ShaderIrBlock(int Position) + public ShaderIrBlock(int position) { - this.Position = Position; + Position = position; Sources = new List<ShaderIrBlock>(); Nodes = new List<ShaderIrNode>(); } - public void AddNode(ShaderIrNode Node) + public void AddNode(ShaderIrNode node) { - Nodes.Add(Node); + Nodes.Add(node); } public ShaderIrNode[] GetNodes() diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderIrCmnt.cs b/Ryujinx.Graphics/Gal/Shader/ShaderIrCmnt.cs index 03031ec5..5da04e5e 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderIrCmnt.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderIrCmnt.cs @@ -4,9 +4,9 @@ namespace Ryujinx.Graphics.Gal.Shader { public string Comment { get; private set; } - public ShaderIrCmnt(string Comment) + public ShaderIrCmnt(string comment) { - this.Comment = Comment; + Comment = comment; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderIrCond.cs b/Ryujinx.Graphics/Gal/Shader/ShaderIrCond.cs index 8fb01660..34acf90d 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderIrCond.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderIrCond.cs @@ -7,11 +7,11 @@ namespace Ryujinx.Graphics.Gal.Shader public bool Not { get; private set; } - public ShaderIrCond(ShaderIrNode Pred, ShaderIrNode Child, bool Not) + public ShaderIrCond(ShaderIrNode pred, ShaderIrNode child, bool not) { - this.Pred = Pred; - this.Child = Child; - this.Not = Not; + Pred = pred; + Child = child; + Not = not; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderIrMetaIpa.cs b/Ryujinx.Graphics/Gal/Shader/ShaderIrMetaIpa.cs index 3b884621..07db6467 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderIrMetaIpa.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderIrMetaIpa.cs @@ -4,9 +4,9 @@ { public ShaderIpaMode Mode { get; private set; } - public ShaderIrMetaIpa(ShaderIpaMode Mode) + public ShaderIrMetaIpa(ShaderIpaMode mode) { - this.Mode = Mode; + Mode = mode; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderIrMetaTex.cs b/Ryujinx.Graphics/Gal/Shader/ShaderIrMetaTex.cs index 72ea221a..e0265138 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderIrMetaTex.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderIrMetaTex.cs @@ -13,12 +13,12 @@ namespace Ryujinx.Graphics.Gal.Shader public ShaderIrOperGpr DepthCompare; public int Component; // for TLD4(S) - public ShaderIrMetaTex(int Elem, GalTextureTarget TextureTarget, TextureInstructionSuffix TextureInstructionSuffix, params ShaderIrNode[] Coordinates) + public ShaderIrMetaTex(int elem, GalTextureTarget textureTarget, TextureInstructionSuffix textureInstructionSuffix, params ShaderIrNode[] coordinates) { - this.Elem = Elem; - this.TextureTarget = TextureTarget; - this.TextureInstructionSuffix = TextureInstructionSuffix; - this.Coordinates = Coordinates; + Elem = elem; + TextureTarget = textureTarget; + TextureInstructionSuffix = textureInstructionSuffix; + Coordinates = coordinates; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderIrMetaTexq.cs b/Ryujinx.Graphics/Gal/Shader/ShaderIrMetaTexq.cs index 92871137..c925ea4e 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderIrMetaTexq.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderIrMetaTexq.cs @@ -6,10 +6,10 @@ namespace Ryujinx.Graphics.Gal.Shader public int Elem { get; private set; } - public ShaderIrMetaTexq(ShaderTexqInfo Info, int Elem) + public ShaderIrMetaTexq(ShaderTexqInfo info, int elem) { - this.Info = Info; - this.Elem = Elem; + Info = info; + Elem = elem; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderIrOp.cs b/Ryujinx.Graphics/Gal/Shader/ShaderIrOp.cs index 12a6123c..c91c3926 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderIrOp.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderIrOp.cs @@ -9,17 +9,17 @@ namespace Ryujinx.Graphics.Gal.Shader public ShaderIrMeta MetaData { get; set; } public ShaderIrOp( - ShaderIrInst Inst, - ShaderIrNode OperandA = null, - ShaderIrNode OperandB = null, - ShaderIrNode OperandC = null, - ShaderIrMeta MetaData = null) + ShaderIrInst inst, + ShaderIrNode operandA = null, + ShaderIrNode operandB = null, + ShaderIrNode operandC = null, + ShaderIrMeta metaData = null) { - this.Inst = Inst; - this.OperandA = OperandA; - this.OperandB = OperandB; - this.OperandC = OperandC; - this.MetaData = MetaData; + Inst = inst; + OperandA = operandA; + OperandB = operandB; + OperandC = operandC; + MetaData = metaData; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderIrOperAbuf.cs b/Ryujinx.Graphics/Gal/Shader/ShaderIrOperAbuf.cs index f17d9c0e..1f339e80 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderIrOperAbuf.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderIrOperAbuf.cs @@ -6,10 +6,10 @@ namespace Ryujinx.Graphics.Gal.Shader public ShaderIrNode Vertex { get; private set; } - public ShaderIrOperAbuf(int Offs, ShaderIrNode Vertex) + public ShaderIrOperAbuf(int offs, ShaderIrNode vertex) { - this.Offs = Offs; - this.Vertex = Vertex; + Offs = offs; + Vertex = vertex; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderIrOperCbuf.cs b/Ryujinx.Graphics/Gal/Shader/ShaderIrOperCbuf.cs index b040c5c6..9f419bbb 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderIrOperCbuf.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderIrOperCbuf.cs @@ -7,11 +7,11 @@ namespace Ryujinx.Graphics.Gal.Shader public ShaderIrNode Offs { get; private set; } - public ShaderIrOperCbuf(int Index, int Pos, ShaderIrNode Offs = null) + public ShaderIrOperCbuf(int index, int pos, ShaderIrNode offs = null) { - this.Index = Index; - this.Pos = Pos; - this.Offs = Offs; + Index = index; + Pos = pos; + Offs = offs; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderIrOperGpr.cs b/Ryujinx.Graphics/Gal/Shader/ShaderIrOperGpr.cs index b4a5cab4..0d102d89 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderIrOperGpr.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderIrOperGpr.cs @@ -2,35 +2,35 @@ namespace Ryujinx.Graphics.Gal.Shader { class ShaderIrOperGpr : ShaderIrNode { - public const int ZRIndex = 0xff; + public const int ZrIndex = 0xff; - public bool IsConst => Index == ZRIndex; + public bool IsConst => Index == ZrIndex; - public bool IsValidRegister => (uint)Index <= ZRIndex; + public bool IsValidRegister => (uint)Index <= ZrIndex; public int Index { get; set; } public int HalfPart { get; set; } public ShaderRegisterSize RegisterSize { get; private set; } - public ShaderIrOperGpr(int Index) + public ShaderIrOperGpr(int index) { - this.Index = Index; + Index = index; RegisterSize = ShaderRegisterSize.Single; } - public ShaderIrOperGpr(int Index, int HalfPart) + public ShaderIrOperGpr(int index, int halfPart) { - this.Index = Index; - this.HalfPart = HalfPart; + Index = index; + HalfPart = halfPart; RegisterSize = ShaderRegisterSize.Half; } - public static ShaderIrOperGpr MakeTemporary(int Index = 0) + public static ShaderIrOperGpr MakeTemporary(int index = 0) { - return new ShaderIrOperGpr(0x100 + Index); + return new ShaderIrOperGpr(0x100 + index); } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderIrOperImm.cs b/Ryujinx.Graphics/Gal/Shader/ShaderIrOperImm.cs index ba2c2c9b..6b23b365 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderIrOperImm.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderIrOperImm.cs @@ -4,9 +4,9 @@ namespace Ryujinx.Graphics.Gal.Shader { public int Value { get; private set; } - public ShaderIrOperImm(int Value) + public ShaderIrOperImm(int value) { - this.Value = Value; + Value = value; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderIrOperImmf.cs b/Ryujinx.Graphics/Gal/Shader/ShaderIrOperImmf.cs index 3c27e483..5b08c5b1 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderIrOperImmf.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderIrOperImmf.cs @@ -4,9 +4,9 @@ namespace Ryujinx.Graphics.Gal.Shader { public float Value { get; private set; } - public ShaderIrOperImmf(float Value) + public ShaderIrOperImmf(float value) { - this.Value = Value; + Value = value; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderIrOperPred.cs b/Ryujinx.Graphics/Gal/Shader/ShaderIrOperPred.cs index 74cca0ef..6c16a145 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderIrOperPred.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderIrOperPred.cs @@ -9,9 +9,9 @@ namespace Ryujinx.Graphics.Gal.Shader public int Index { get; set; } - public ShaderIrOperPred(int Index) + public ShaderIrOperPred(int index) { - this.Index = Index; + Index = index; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderOpCodeTable.cs b/Ryujinx.Graphics/Gal/Shader/ShaderOpCodeTable.cs index d2bbd38c..1edf91a0 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderOpCodeTable.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderOpCodeTable.cs @@ -12,18 +12,18 @@ namespace Ryujinx.Graphics.Gal.Shader public int XBits; - public ShaderDecodeEntry(ShaderDecodeFunc Func, int XBits) + public ShaderDecodeEntry(ShaderDecodeFunc func, int xBits) { - this.Func = Func; - this.XBits = XBits; + Func = func; + XBits = xBits; } } - private static ShaderDecodeEntry[] OpCodes; + private static ShaderDecodeEntry[] _opCodes; static ShaderOpCodeTable() { - OpCodes = new ShaderDecodeEntry[1 << EncodingBits]; + _opCodes = new ShaderDecodeEntry[1 << EncodingBits]; #region Instructions Set("0100110000000x", ShaderDecode.Bfe_C); @@ -123,7 +123,7 @@ namespace Ryujinx.Graphics.Gal.Shader Set("1101x00xxxxxxx", ShaderDecode.Texs); Set("1101101xxxxxxx", ShaderDecode.Tlds); Set("110010xxxx111x", ShaderDecode.Tld4); - Set("1101111100xxxx", ShaderDecode.Tld4s); + Set("1101111100xxxx", ShaderDecode.Tld4S); Set("01011111xxxxxx", ShaderDecode.Vmad); Set("0100111xxxxxxx", ShaderDecode.Xmad_CR); Set("0011011x00xxxx", ShaderDecode.Xmad_I); @@ -132,59 +132,59 @@ namespace Ryujinx.Graphics.Gal.Shader #endregion } - private static void Set(string Encoding, ShaderDecodeFunc Func) + private static void Set(string encoding, ShaderDecodeFunc func) { - if (Encoding.Length != EncodingBits) + if (encoding.Length != EncodingBits) { - throw new ArgumentException(nameof(Encoding)); + throw new ArgumentException(nameof(encoding)); } - int Bit = Encoding.Length - 1; - int Value = 0; - int XMask = 0; - int XBits = 0; + int bit = encoding.Length - 1; + int value = 0; + int xMask = 0; + int xBits = 0; - int[] XPos = new int[Encoding.Length]; + int[] xPos = new int[encoding.Length]; - for (int Index = 0; Index < Encoding.Length; Index++, Bit--) + for (int index = 0; index < encoding.Length; index++, bit--) { - char Chr = Encoding[Index]; + char chr = encoding[index]; - if (Chr == '1') + if (chr == '1') { - Value |= 1 << Bit; + value |= 1 << bit; } - else if (Chr == 'x') + else if (chr == 'x') { - XMask |= 1 << Bit; + xMask |= 1 << bit; - XPos[XBits++] = Bit; + xPos[xBits++] = bit; } } - XMask = ~XMask; + xMask = ~xMask; - ShaderDecodeEntry Entry = new ShaderDecodeEntry(Func, XBits); + ShaderDecodeEntry entry = new ShaderDecodeEntry(func, xBits); - for (int Index = 0; Index < (1 << XBits); Index++) + for (int index = 0; index < (1 << xBits); index++) { - Value &= XMask; + value &= xMask; - for (int X = 0; X < XBits; X++) + for (int x = 0; x < xBits; x++) { - Value |= ((Index >> X) & 1) << XPos[X]; + value |= ((index >> x) & 1) << xPos[x]; } - if (OpCodes[Value] == null || OpCodes[Value].XBits > XBits) + if (_opCodes[value] == null || _opCodes[value].XBits > xBits) { - OpCodes[Value] = Entry; + _opCodes[value] = entry; } } } - public static ShaderDecodeFunc GetDecoder(long OpCode) + public static ShaderDecodeFunc GetDecoder(long opCode) { - return OpCodes[(ulong)OpCode >> (64 - EncodingBits)]?.Func; + return _opCodes[(ulong)opCode >> (64 - EncodingBits)]?.Func; } } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderOper.cs b/Ryujinx.Graphics/Gal/Shader/ShaderOper.cs index aa485482..22a2ab85 100644 --- a/Ryujinx.Graphics/Gal/Shader/ShaderOper.cs +++ b/Ryujinx.Graphics/Gal/Shader/ShaderOper.cs @@ -2,10 +2,10 @@ namespace Ryujinx.Graphics.Gal.Shader { enum ShaderOper { - CR, + Cr, Imm, Immf, - RC, - RR + Rc, + Rr } }
\ No newline at end of file diff --git a/Ryujinx.Graphics/Gal/ShaderDeclInfo.cs b/Ryujinx.Graphics/Gal/ShaderDeclInfo.cs index ed1955cd..f1f4650c 100644 --- a/Ryujinx.Graphics/Gal/ShaderDeclInfo.cs +++ b/Ryujinx.Graphics/Gal/ShaderDeclInfo.cs @@ -16,29 +16,29 @@ namespace Ryujinx.Graphics.Gal public TextureInstructionSuffix TextureSuffix { get; private set; } public ShaderDeclInfo( - string Name, - int Index, - bool IsCb = false, - int Cbuf = 0, - int Size = 1, - GalTextureTarget TextureTarget = GalTextureTarget.TwoD, - TextureInstructionSuffix TextureSuffix = TextureInstructionSuffix.None) + string name, + int index, + bool isCb = false, + int cbuf = 0, + int size = 1, + GalTextureTarget textureTarget = GalTextureTarget.TwoD, + TextureInstructionSuffix textureSuffix = TextureInstructionSuffix.None) { - this.Name = Name; - this.Index = Index; - this.IsCb = IsCb; - this.Cbuf = Cbuf; - this.Size = Size; + Name = name; + Index = index; + IsCb = isCb; + Cbuf = cbuf; + Size = size; - this.TextureTarget = TextureTarget; - this.TextureSuffix = TextureSuffix; + TextureTarget = textureTarget; + TextureSuffix = textureSuffix; } - internal void Enlarge(int NewSize) + internal void Enlarge(int newSize) { - if (Size < NewSize) + if (Size < newSize) { - Size = NewSize; + Size = newSize; } } } diff --git a/Ryujinx.Graphics/Gal/ShaderDumper.cs b/Ryujinx.Graphics/Gal/ShaderDumper.cs index 21e92491..726447e4 100644 --- a/Ryujinx.Graphics/Gal/ShaderDumper.cs +++ b/Ryujinx.Graphics/Gal/ShaderDumper.cs @@ -5,67 +5,67 @@ namespace Ryujinx.Graphics.Gal { static class ShaderDumper { - private static string RuntimeDir; + private static string _runtimeDir; public static int DumpIndex { get; private set; } = 1; - public static void Dump(IGalMemory Memory, long Position, GalShaderType Type, string ExtSuffix = "") + public static void Dump(IGalMemory memory, long position, GalShaderType type, string extSuffix = "") { if (!IsDumpEnabled()) { return; } - string FileName = "Shader" + DumpIndex.ToString("d4") + "." + ShaderExtension(Type) + ExtSuffix + ".bin"; + string fileName = "Shader" + DumpIndex.ToString("d4") + "." + ShaderExtension(type) + extSuffix + ".bin"; - string FullPath = Path.Combine(FullDir(), FileName); - string CodePath = Path.Combine(CodeDir(), FileName); + string fullPath = Path.Combine(FullDir(), fileName); + string codePath = Path.Combine(CodeDir(), fileName); DumpIndex++; - using (FileStream FullFile = File.Create(FullPath)) - using (FileStream CodeFile = File.Create(CodePath)) + using (FileStream fullFile = File.Create(fullPath)) + using (FileStream codeFile = File.Create(codePath)) { - BinaryWriter FullWriter = new BinaryWriter(FullFile); - BinaryWriter CodeWriter = new BinaryWriter(CodeFile); + BinaryWriter fullWriter = new BinaryWriter(fullFile); + BinaryWriter codeWriter = new BinaryWriter(codeFile); for (long i = 0; i < 0x50; i += 4) { - FullWriter.Write(Memory.ReadInt32(Position + i)); + fullWriter.Write(memory.ReadInt32(position + i)); } - long Offset = 0; + long offset = 0; - ulong Instruction = 0; + ulong instruction = 0; //Dump until a NOP instruction is found - while ((Instruction >> 48 & 0xfff8) != 0x50b0) + while ((instruction >> 48 & 0xfff8) != 0x50b0) { - uint Word0 = (uint)Memory.ReadInt32(Position + 0x50 + Offset + 0); - uint Word1 = (uint)Memory.ReadInt32(Position + 0x50 + Offset + 4); + uint word0 = (uint)memory.ReadInt32(position + 0x50 + offset + 0); + uint word1 = (uint)memory.ReadInt32(position + 0x50 + offset + 4); - Instruction = Word0 | (ulong)Word1 << 32; + instruction = word0 | (ulong)word1 << 32; //Zero instructions (other kind of NOP) stop immediatly, //this is to avoid two rows of zeroes - if (Instruction == 0) + if (instruction == 0) { break; } - FullWriter.Write(Instruction); - CodeWriter.Write(Instruction); + fullWriter.Write(instruction); + codeWriter.Write(instruction); - Offset += 8; + offset += 8; } //Align to meet nvdisasm requeriments - while (Offset % 0x20 != 0) + while (offset % 0x20 != 0) { - FullWriter.Write(0); - CodeWriter.Write(0); + fullWriter.Write(0); + codeWriter.Write(0); - Offset += 4; + offset += 4; } } } @@ -87,37 +87,37 @@ namespace Ryujinx.Graphics.Gal private static string DumpDir() { - if (string.IsNullOrEmpty(RuntimeDir)) + if (string.IsNullOrEmpty(_runtimeDir)) { - int Index = 1; + int index = 1; do { - RuntimeDir = Path.Combine(GraphicsConfig.ShadersDumpPath, "Dumps" + Index.ToString("d2")); + _runtimeDir = Path.Combine(GraphicsConfig.ShadersDumpPath, "Dumps" + index.ToString("d2")); - Index++; + index++; } - while (Directory.Exists(RuntimeDir)); + while (Directory.Exists(_runtimeDir)); - Directory.CreateDirectory(RuntimeDir); + Directory.CreateDirectory(_runtimeDir); } - return RuntimeDir; + return _runtimeDir; } - private static string CreateAndReturn(string Dir) + private static string CreateAndReturn(string dir) { - if (!Directory.Exists(Dir)) + if (!Directory.Exists(dir)) { - Directory.CreateDirectory(Dir); + Directory.CreateDirectory(dir); } - return Dir; + return dir; } - private static string ShaderExtension(GalShaderType Type) + private static string ShaderExtension(GalShaderType type) { - switch (Type) + switch (type) { case GalShaderType.Vertex: return "vert"; case GalShaderType.TessControl: return "tesc"; @@ -125,7 +125,7 @@ namespace Ryujinx.Graphics.Gal case GalShaderType.Geometry: return "geom"; case GalShaderType.Fragment: return "frag"; - default: throw new ArgumentException(nameof(Type)); + default: throw new ArgumentException(nameof(type)); } } } diff --git a/Ryujinx.Graphics/Gal/ShaderException.cs b/Ryujinx.Graphics/Gal/ShaderException.cs index 9bc87ff3..b0aff42b 100644 --- a/Ryujinx.Graphics/Gal/ShaderException.cs +++ b/Ryujinx.Graphics/Gal/ShaderException.cs @@ -6,6 +6,6 @@ namespace Ryujinx.Graphics.Gal { public ShaderException() : base() { } - public ShaderException(string Message) : base(Message) { } + public ShaderException(string message) : base(message) { } } }
\ No newline at end of file |