From 3e6f75772fa39b9cb197a4990b450fd6d8f2a03f Mon Sep 17 00:00:00 2001 From: Thog Date: Tue, 4 Dec 2018 21:23:33 +0100 Subject: [PATCH] updates comments --- Ryujinx.Graphics/Gal/Shader/GlslDecl.cs | 2 +- Ryujinx.Graphics/Gal/Shader/GlslDecompiler.cs | 9 +++------ Ryujinx.Graphics/Graphics3d/NvGpuEngine2d.cs | 1 - Ryujinx.Graphics/Graphics3d/NvGpuEngine3d.cs | 2 +- Ryujinx.Graphics/Graphics3d/Texture/ASTCDecoder.cs | 2 +- Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs | 4 +--- 6 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Ryujinx.Graphics/Gal/Shader/GlslDecl.cs b/Ryujinx.Graphics/Gal/Shader/GlslDecl.cs index fe3c18ecba..4e09c23899 100644 --- a/Ryujinx.Graphics/Gal/Shader/GlslDecl.cs +++ b/Ryujinx.Graphics/Gal/Shader/GlslDecl.cs @@ -239,7 +239,7 @@ namespace Ryujinx.Graphics.Gal.Shader TextureInstructionSuffix TextureInstructionSuffix; - // TODO: non 2d texture type for TEXQ? + // TODO: Non 2D texture type for TEXQ? if (Op.Inst == ShaderIrInst.Texq) { TextureType = TextureType.TwoD; diff --git a/Ryujinx.Graphics/Gal/Shader/GlslDecompiler.cs b/Ryujinx.Graphics/Gal/Shader/GlslDecompiler.cs index 5e950d39db..7c4032356f 100644 --- a/Ryujinx.Graphics/Gal/Shader/GlslDecompiler.cs +++ b/Ryujinx.Graphics/Gal/Shader/GlslDecompiler.cs @@ -1236,7 +1236,7 @@ namespace Ryujinx.Graphics.Gal.Shader private string GetTxlfExpr(ShaderIrOp Op) { - // TODO: DC AND MZ + // TODO: Support all suffixes ShaderIrMetaTex Meta = (ShaderIrMetaTex)Op.MetaData; TextureInstructionSuffix Suffix = Meta.TextureInstructionSuffix; @@ -1405,7 +1405,6 @@ namespace Ryujinx.Graphics.Gal.Shader if (ImageUtils.IsArray(Meta.TextureType)) Coords -= 1; - // FIXME: DC not supported switch (Coords) { case 1: @@ -1436,7 +1435,7 @@ namespace Ryujinx.Graphics.Gal.Shader Comp = GetOperExpr(Op, Meta.DepthCompare); } - // TODO + // TODO: Support AOFFI if ((Suffix & TextureInstructionSuffix.AOFFI) != 0) { throw new NotSupportedException(); @@ -1457,7 +1456,7 @@ namespace Ryujinx.Graphics.Gal.Shader ChString = ""; } - // TODO: support LBA and LLA and DC + // TODO: Support LBA and LLA if ((Suffix & TextureInstructionSuffix.LZ) != 0) { if ((Suffix & TextureInstructionSuffix.AOFFI) != 0) @@ -1499,8 +1498,6 @@ namespace Ryujinx.Graphics.Gal.Shader } else { - // FIXME: implement DC - // Load Standard return "texture(" + Sampler + ", " + Coords + ")" + ChString; } throw new NotImplementedException($"Texture Suffix {Meta.TextureInstructionSuffix} is not implemented"); diff --git a/Ryujinx.Graphics/Graphics3d/NvGpuEngine2d.cs b/Ryujinx.Graphics/Graphics3d/NvGpuEngine2d.cs index 34ec16a274..5811395fc0 100644 --- a/Ryujinx.Graphics/Graphics3d/NvGpuEngine2d.cs +++ b/Ryujinx.Graphics/Graphics3d/NvGpuEngine2d.cs @@ -38,7 +38,6 @@ namespace Ryujinx.Graphics.Graphics3d } } - // FIXME: SUPPORT NON 2D private void TextureCopy(NvGpuVmm Vmm) { CopyOperation Operation = (CopyOperation)ReadRegister(NvGpuEngine2dReg.CopyOperation); diff --git a/Ryujinx.Graphics/Graphics3d/NvGpuEngine3d.cs b/Ryujinx.Graphics/Graphics3d/NvGpuEngine3d.cs index 7d335ea740..e697e0b406 100644 --- a/Ryujinx.Graphics/Graphics3d/NvGpuEngine3d.cs +++ b/Ryujinx.Graphics/Graphics3d/NvGpuEngine3d.cs @@ -262,7 +262,7 @@ namespace Ryujinx.Graphics.Graphics3d GalImageFormat Format = ImageUtils.ConvertZeta((GalZetaFormat)ZetaFormat); - // TODO: all texture types + // TODO: Support non 2D? GalImage Image = new GalImage(Width, Height, 1, 1, GobBlockHeight, Layout, Format, TextureType.TwoD); Gpu.ResourceManager.SendZetaBuffer(Vmm, Key, Image); diff --git a/Ryujinx.Graphics/Graphics3d/Texture/ASTCDecoder.cs b/Ryujinx.Graphics/Graphics3d/Texture/ASTCDecoder.cs index 39a3473cf3..00158dc103 100644 --- a/Ryujinx.Graphics/Graphics3d/Texture/ASTCDecoder.cs +++ b/Ryujinx.Graphics/Graphics3d/Texture/ASTCDecoder.cs @@ -72,7 +72,7 @@ namespace Ryujinx.Graphics.Texture if (BlockZ != 1 || Z != 1) { - // TODO: support 3D textures? + // TODO: Support 3D textures? throw new ASTCDecoderException("3D compressed textures unsupported!"); } diff --git a/Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs b/Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs index 97e6701d4c..92af2ed1f3 100644 --- a/Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs +++ b/Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs @@ -96,7 +96,6 @@ namespace Ryujinx.Graphics.Texture private static readonly Dictionary s_ImageTable = new Dictionary() { - // TODO: check if everything is alright here { GalImageFormat.RGBA32, new ImageDescriptor(16, 1, 1, 1, TargetBuffer.Color) }, { GalImageFormat.RGBA16, new ImageDescriptor(8, 1, 1, 1, TargetBuffer.Color) }, { GalImageFormat.RG32, new ImageDescriptor(8, 1, 1, 1, TargetBuffer.Color) }, @@ -299,7 +298,7 @@ namespace Ryujinx.Graphics.Texture } } - // TODO: SUPPORT NON 2D + // TODO: Support non 2D public static bool CopyTexture( NvGpuVmm Vmm, GalImage SrcImage, @@ -339,7 +338,6 @@ namespace Ryujinx.Graphics.Texture return true; } - // FIXME: Check if that does the trick public static int GetSize(GalImage Image) { ImageDescriptor Desc = GetImageDescriptor(Image.Format);