From 18814d44b2e19f7a93ed48ef4799ced585d071e9 Mon Sep 17 00:00:00 2001 From: gdkchan Date: Sun, 5 Jan 2020 22:04:37 -0300 Subject: [PATCH] Address PR feedback Add TODO comment for GL_EXT_polygon_offset_clamp --- Ryujinx.Common/Utilities/EmbeddedResources.cs | 2 + .../VertexAttribDescriptor.cs | 4 +- Ryujinx.Graphics.Gpu/Shader/CachedShader.cs | 4 +- .../State/PrimitiveTopology.cs | 30 ++--- Ryujinx.Graphics.Gpu/State/RtFormat.cs | 110 +++++++++--------- Ryujinx.Graphics.Nvdec/VDec/VideoDecoder.cs | 16 +-- .../Vic/VideoImageComposer.cs | 6 +- Ryujinx.Graphics.OpenGL/HwCapabilities.cs | 4 +- Ryujinx.Graphics.OpenGL/Pipeline.cs | 1 + Ryujinx.Graphics.Shader/Decoders/Block.cs | 2 +- .../Instructions/InstEmitConversion.cs | 4 +- .../Instructions/InstEmitHelper.cs | 4 +- .../Instructions/InstEmitMemory.cs | 2 +- .../Translation/GlobalMemory.cs | 2 +- .../Translation/Translator.cs | 2 - .../NvHostChannel/NvHostChannelDeviceFile.cs | 12 +- 16 files changed, 104 insertions(+), 101 deletions(-) diff --git a/Ryujinx.Common/Utilities/EmbeddedResources.cs b/Ryujinx.Common/Utilities/EmbeddedResources.cs index 93ff70ea0..caa171873 100644 --- a/Ryujinx.Common/Utilities/EmbeddedResources.cs +++ b/Ryujinx.Common/Utilities/EmbeddedResources.cs @@ -38,6 +38,7 @@ namespace Ryujinx.Common using (var mem = new MemoryStream()) { stream.CopyTo(mem); + return mem.ToArray(); } } @@ -53,6 +54,7 @@ namespace Ryujinx.Common using (var mem = new MemoryStream()) { await stream.CopyToAsync(mem); + return mem.ToArray(); } } diff --git a/Ryujinx.Graphics.GAL/VertexAttribDescriptor.cs b/Ryujinx.Graphics.GAL/VertexAttribDescriptor.cs index 18774aae8..34daff57b 100644 --- a/Ryujinx.Graphics.GAL/VertexAttribDescriptor.cs +++ b/Ryujinx.Graphics.GAL/VertexAttribDescriptor.cs @@ -2,8 +2,8 @@ namespace Ryujinx.Graphics.GAL { public struct VertexAttribDescriptor { - public int BufferIndex { get; } - public int Offset { get; } + public int BufferIndex { get; } + public int Offset { get; } public Format Format { get; } diff --git a/Ryujinx.Graphics.Gpu/Shader/CachedShader.cs b/Ryujinx.Graphics.Gpu/Shader/CachedShader.cs index 418a4f402..f84940456 100644 --- a/Ryujinx.Graphics.Gpu/Shader/CachedShader.cs +++ b/Ryujinx.Graphics.Gpu/Shader/CachedShader.cs @@ -30,8 +30,8 @@ namespace Ryujinx.Graphics.Gpu.Shader /// Maxwell binary shader code public CachedShader(ShaderProgram program, int[] code) { - Program = program; - Code = code; + Program = program; + Code = code; } } } \ No newline at end of file diff --git a/Ryujinx.Graphics.Gpu/State/PrimitiveTopology.cs b/Ryujinx.Graphics.Gpu/State/PrimitiveTopology.cs index bb9eb5a7e..340991c2e 100644 --- a/Ryujinx.Graphics.Gpu/State/PrimitiveTopology.cs +++ b/Ryujinx.Graphics.Gpu/State/PrimitiveTopology.cs @@ -35,22 +35,22 @@ namespace Ryujinx.Graphics.Gpu.State { return type switch { - PrimitiveType.Points => PrimitiveTopology.Points, - PrimitiveType.Lines => PrimitiveTopology.Lines, - PrimitiveType.LineLoop => PrimitiveTopology.LineLoop, - PrimitiveType.LineStrip => PrimitiveTopology.LineStrip, - PrimitiveType.Triangles => PrimitiveTopology.Triangles, - PrimitiveType.TriangleStrip => PrimitiveTopology.TriangleStrip, - PrimitiveType.TriangleFan => PrimitiveTopology.TriangleFan, - PrimitiveType.Quads => PrimitiveTopology.Quads, - PrimitiveType.QuadStrip => PrimitiveTopology.QuadStrip, - PrimitiveType.Polygon => PrimitiveTopology.Polygon, - PrimitiveType.LinesAdjacency => PrimitiveTopology.LinesAdjacency, - PrimitiveType.LineStripAdjacency => PrimitiveTopology.LineStripAdjacency, - PrimitiveType.TrianglesAdjacency => PrimitiveTopology.TrianglesAdjacency, + PrimitiveType.Points => PrimitiveTopology.Points, + PrimitiveType.Lines => PrimitiveTopology.Lines, + PrimitiveType.LineLoop => PrimitiveTopology.LineLoop, + PrimitiveType.LineStrip => PrimitiveTopology.LineStrip, + PrimitiveType.Triangles => PrimitiveTopology.Triangles, + PrimitiveType.TriangleStrip => PrimitiveTopology.TriangleStrip, + PrimitiveType.TriangleFan => PrimitiveTopology.TriangleFan, + PrimitiveType.Quads => PrimitiveTopology.Quads, + PrimitiveType.QuadStrip => PrimitiveTopology.QuadStrip, + PrimitiveType.Polygon => PrimitiveTopology.Polygon, + PrimitiveType.LinesAdjacency => PrimitiveTopology.LinesAdjacency, + PrimitiveType.LineStripAdjacency => PrimitiveTopology.LineStripAdjacency, + PrimitiveType.TrianglesAdjacency => PrimitiveTopology.TrianglesAdjacency, PrimitiveType.TriangleStripAdjacency => PrimitiveTopology.TriangleStripAdjacency, - PrimitiveType.Patches => PrimitiveTopology.Patches, - _ => PrimitiveTopology.Triangles + PrimitiveType.Patches => PrimitiveTopology.Patches, + _ => PrimitiveTopology.Triangles }; } } diff --git a/Ryujinx.Graphics.Gpu/State/RtFormat.cs b/Ryujinx.Graphics.Gpu/State/RtFormat.cs index e64903364..003da9ed5 100644 --- a/Ryujinx.Graphics.Gpu/State/RtFormat.cs +++ b/Ryujinx.Graphics.Gpu/State/RtFormat.cs @@ -81,67 +81,67 @@ namespace Ryujinx.Graphics.Gpu.State { return format switch { - RtFormat.D32Float => new FormatInfo(Format.D32Float, 1, 1, 4), - RtFormat.D16Unorm => new FormatInfo(Format.D16Unorm, 1, 1, 2), - RtFormat.D24UnormS8Uint => new FormatInfo(Format.D24UnormS8Uint, 1, 1, 4), - RtFormat.D24Unorm => new FormatInfo(Format.D24UnormS8Uint, 1, 1, 4), - RtFormat.S8UintD24Unorm => new FormatInfo(Format.D24UnormS8Uint, 1, 1, 4), - RtFormat.S8Uint => new FormatInfo(Format.S8Uint, 1, 1, 1), - RtFormat.D32FloatS8Uint => new FormatInfo(Format.D32FloatS8Uint, 1, 1, 8), + RtFormat.D32Float => new FormatInfo(Format.D32Float, 1, 1, 4), + RtFormat.D16Unorm => new FormatInfo(Format.D16Unorm, 1, 1, 2), + RtFormat.D24UnormS8Uint => new FormatInfo(Format.D24UnormS8Uint, 1, 1, 4), + RtFormat.D24Unorm => new FormatInfo(Format.D24UnormS8Uint, 1, 1, 4), + RtFormat.S8UintD24Unorm => new FormatInfo(Format.D24UnormS8Uint, 1, 1, 4), + RtFormat.S8Uint => new FormatInfo(Format.S8Uint, 1, 1, 1), + RtFormat.D32FloatS8Uint => new FormatInfo(Format.D32FloatS8Uint, 1, 1, 8), RtFormat.R32G32B32A32Float => new FormatInfo(Format.R32G32B32A32Float, 1, 1, 16), - RtFormat.R32G32B32A32Sint => new FormatInfo(Format.R32G32B32A32Sint, 1, 1, 16), - RtFormat.R32G32B32A32Uint => new FormatInfo(Format.R32G32B32A32Uint, 1, 1, 16), + RtFormat.R32G32B32A32Sint => new FormatInfo(Format.R32G32B32A32Sint, 1, 1, 16), + RtFormat.R32G32B32A32Uint => new FormatInfo(Format.R32G32B32A32Uint, 1, 1, 16), RtFormat.R32G32B32X32Float => new FormatInfo(Format.R32G32B32A32Float, 1, 1, 16), - RtFormat.R32G32B32X32Sint => new FormatInfo(Format.R32G32B32A32Sint, 1, 1, 16), - RtFormat.R32G32B32X32Uint => new FormatInfo(Format.R32G32B32A32Uint, 1, 1, 16), + RtFormat.R32G32B32X32Sint => new FormatInfo(Format.R32G32B32A32Sint, 1, 1, 16), + RtFormat.R32G32B32X32Uint => new FormatInfo(Format.R32G32B32A32Uint, 1, 1, 16), RtFormat.R16G16B16X16Unorm => new FormatInfo(Format.R16G16B16A16Unorm, 1, 1, 8), RtFormat.R16G16B16X16Snorm => new FormatInfo(Format.R16G16B16A16Snorm, 1, 1, 8), - RtFormat.R16G16B16X16Sint => new FormatInfo(Format.R16G16B16A16Sint, 1, 1, 8), - RtFormat.R16G16B16X16Uint => new FormatInfo(Format.R16G16B16A16Uint, 1, 1, 8), + RtFormat.R16G16B16X16Sint => new FormatInfo(Format.R16G16B16A16Sint, 1, 1, 8), + RtFormat.R16G16B16X16Uint => new FormatInfo(Format.R16G16B16A16Uint, 1, 1, 8), RtFormat.R16G16B16A16Float => new FormatInfo(Format.R16G16B16A16Float, 1, 1, 8), - RtFormat.R32G32Float => new FormatInfo(Format.R32G32Float, 1, 1, 8), - RtFormat.R32G32Sint => new FormatInfo(Format.R32G32Sint, 1, 1, 8), - RtFormat.R32G32Uint => new FormatInfo(Format.R32G32Uint, 1, 1, 8), + RtFormat.R32G32Float => new FormatInfo(Format.R32G32Float, 1, 1, 8), + RtFormat.R32G32Sint => new FormatInfo(Format.R32G32Sint, 1, 1, 8), + RtFormat.R32G32Uint => new FormatInfo(Format.R32G32Uint, 1, 1, 8), RtFormat.R16G16B16X16Float => new FormatInfo(Format.R16G16B16A16Float, 1, 1, 8), - RtFormat.B8G8R8A8Unorm => new FormatInfo(Format.B8G8R8A8Unorm, 1, 1, 4), - RtFormat.B8G8R8A8Srgb => new FormatInfo(Format.B8G8R8A8Srgb, 1, 1, 4), - RtFormat.R10G10B10A2Unorm => new FormatInfo(Format.R10G10B10A2Unorm, 1, 1, 4), - RtFormat.R10G10B10A2Uint => new FormatInfo(Format.R10G10B10A2Uint, 1, 1, 4), - RtFormat.R8G8B8A8Unorm => new FormatInfo(Format.R8G8B8A8Unorm, 1, 1, 4), - RtFormat.R8G8B8A8Srgb => new FormatInfo(Format.R8G8B8A8Srgb, 1, 1, 4), - RtFormat.R8G8B8X8Snorm => new FormatInfo(Format.R8G8B8A8Snorm, 1, 1, 4), - RtFormat.R8G8B8X8Sint => new FormatInfo(Format.R8G8B8A8Sint, 1, 1, 4), - RtFormat.R8G8B8X8Uint => new FormatInfo(Format.R8G8B8A8Uint, 1, 1, 4), - RtFormat.R16G16Unorm => new FormatInfo(Format.R16G16Unorm, 1, 1, 4), - RtFormat.R16G16Snorm => new FormatInfo(Format.R16G16Snorm, 1, 1, 4), - RtFormat.R16G16Sint => new FormatInfo(Format.R16G16Sint, 1, 1, 4), - RtFormat.R16G16Uint => new FormatInfo(Format.R16G16Uint, 1, 1, 4), - RtFormat.R16G16Float => new FormatInfo(Format.R16G16Float, 1, 1, 4), - RtFormat.R11G11B10Float => new FormatInfo(Format.R11G11B10Float, 1, 1, 4), - RtFormat.R32Sint => new FormatInfo(Format.R32Sint, 1, 1, 4), - RtFormat.R32Uint => new FormatInfo(Format.R32Uint, 1, 1, 4), - RtFormat.R32Float => new FormatInfo(Format.R32Float, 1, 1, 4), - RtFormat.B8G8R8X8Unorm => new FormatInfo(Format.B8G8R8A8Unorm, 1, 1, 4), - RtFormat.B8G8R8X8Srgb => new FormatInfo(Format.B8G8R8A8Srgb, 1, 1, 4), - RtFormat.B5G6R5Unorm => new FormatInfo(Format.B5G6R5Unorm, 1, 1, 2), - RtFormat.B5G5R5A1Unorm => new FormatInfo(Format.B5G5R5A1Unorm, 1, 1, 2), - RtFormat.R8G8Unorm => new FormatInfo(Format.R8G8Unorm, 1, 1, 2), - RtFormat.R8G8Snorm => new FormatInfo(Format.R8G8Snorm, 1, 1, 2), - RtFormat.R8G8Sint => new FormatInfo(Format.R8G8Sint, 1, 1, 2), - RtFormat.R8G8Uint => new FormatInfo(Format.R8G8Uint, 1, 1, 2), - RtFormat.R16Unorm => new FormatInfo(Format.R16Unorm, 1, 1, 2), - RtFormat.R16Snorm => new FormatInfo(Format.R16Snorm, 1, 1, 2), - RtFormat.R16Sint => new FormatInfo(Format.R16Sint, 1, 1, 2), - RtFormat.R16Uint => new FormatInfo(Format.R16Uint, 1, 1, 2), - RtFormat.R16Float => new FormatInfo(Format.R16Float, 1, 1, 2), - RtFormat.R8Unorm => new FormatInfo(Format.R8Unorm, 1, 1, 1), - RtFormat.R8Snorm => new FormatInfo(Format.R8Snorm, 1, 1, 1), - RtFormat.R8Sint => new FormatInfo(Format.R8Sint, 1, 1, 1), - RtFormat.R8Uint => new FormatInfo(Format.R8Uint, 1, 1, 1), - RtFormat.B5G5R5X1Unorm => new FormatInfo(Format.B5G5R5X1Unorm, 1, 1, 2), - RtFormat.R8G8B8X8Unorm => new FormatInfo(Format.R8G8B8A8Unorm, 1, 1, 4), - RtFormat.R8G8B8X8Srgb => new FormatInfo(Format.R8G8B8A8Srgb, 1, 1, 4), - _ => FormatInfo.Default + RtFormat.B8G8R8A8Unorm => new FormatInfo(Format.B8G8R8A8Unorm, 1, 1, 4), + RtFormat.B8G8R8A8Srgb => new FormatInfo(Format.B8G8R8A8Srgb, 1, 1, 4), + RtFormat.R10G10B10A2Unorm => new FormatInfo(Format.R10G10B10A2Unorm, 1, 1, 4), + RtFormat.R10G10B10A2Uint => new FormatInfo(Format.R10G10B10A2Uint, 1, 1, 4), + RtFormat.R8G8B8A8Unorm => new FormatInfo(Format.R8G8B8A8Unorm, 1, 1, 4), + RtFormat.R8G8B8A8Srgb => new FormatInfo(Format.R8G8B8A8Srgb, 1, 1, 4), + RtFormat.R8G8B8X8Snorm => new FormatInfo(Format.R8G8B8A8Snorm, 1, 1, 4), + RtFormat.R8G8B8X8Sint => new FormatInfo(Format.R8G8B8A8Sint, 1, 1, 4), + RtFormat.R8G8B8X8Uint => new FormatInfo(Format.R8G8B8A8Uint, 1, 1, 4), + RtFormat.R16G16Unorm => new FormatInfo(Format.R16G16Unorm, 1, 1, 4), + RtFormat.R16G16Snorm => new FormatInfo(Format.R16G16Snorm, 1, 1, 4), + RtFormat.R16G16Sint => new FormatInfo(Format.R16G16Sint, 1, 1, 4), + RtFormat.R16G16Uint => new FormatInfo(Format.R16G16Uint, 1, 1, 4), + RtFormat.R16G16Float => new FormatInfo(Format.R16G16Float, 1, 1, 4), + RtFormat.R11G11B10Float => new FormatInfo(Format.R11G11B10Float, 1, 1, 4), + RtFormat.R32Sint => new FormatInfo(Format.R32Sint, 1, 1, 4), + RtFormat.R32Uint => new FormatInfo(Format.R32Uint, 1, 1, 4), + RtFormat.R32Float => new FormatInfo(Format.R32Float, 1, 1, 4), + RtFormat.B8G8R8X8Unorm => new FormatInfo(Format.B8G8R8A8Unorm, 1, 1, 4), + RtFormat.B8G8R8X8Srgb => new FormatInfo(Format.B8G8R8A8Srgb, 1, 1, 4), + RtFormat.B5G6R5Unorm => new FormatInfo(Format.B5G6R5Unorm, 1, 1, 2), + RtFormat.B5G5R5A1Unorm => new FormatInfo(Format.B5G5R5A1Unorm, 1, 1, 2), + RtFormat.R8G8Unorm => new FormatInfo(Format.R8G8Unorm, 1, 1, 2), + RtFormat.R8G8Snorm => new FormatInfo(Format.R8G8Snorm, 1, 1, 2), + RtFormat.R8G8Sint => new FormatInfo(Format.R8G8Sint, 1, 1, 2), + RtFormat.R8G8Uint => new FormatInfo(Format.R8G8Uint, 1, 1, 2), + RtFormat.R16Unorm => new FormatInfo(Format.R16Unorm, 1, 1, 2), + RtFormat.R16Snorm => new FormatInfo(Format.R16Snorm, 1, 1, 2), + RtFormat.R16Sint => new FormatInfo(Format.R16Sint, 1, 1, 2), + RtFormat.R16Uint => new FormatInfo(Format.R16Uint, 1, 1, 2), + RtFormat.R16Float => new FormatInfo(Format.R16Float, 1, 1, 2), + RtFormat.R8Unorm => new FormatInfo(Format.R8Unorm, 1, 1, 1), + RtFormat.R8Snorm => new FormatInfo(Format.R8Snorm, 1, 1, 1), + RtFormat.R8Sint => new FormatInfo(Format.R8Sint, 1, 1, 1), + RtFormat.R8Uint => new FormatInfo(Format.R8Uint, 1, 1, 1), + RtFormat.B5G5R5X1Unorm => new FormatInfo(Format.B5G5R5X1Unorm, 1, 1, 2), + RtFormat.R8G8B8X8Unorm => new FormatInfo(Format.R8G8B8A8Unorm, 1, 1, 4), + RtFormat.R8G8B8X8Srgb => new FormatInfo(Format.R8G8B8A8Srgb, 1, 1, 4), + _ => FormatInfo.Default }; } } diff --git a/Ryujinx.Graphics.Nvdec/VDec/VideoDecoder.cs b/Ryujinx.Graphics.Nvdec/VDec/VideoDecoder.cs index 131bb3cce..b4a89d8f3 100644 --- a/Ryujinx.Graphics.Nvdec/VDec/VideoDecoder.cs +++ b/Ryujinx.Graphics.Nvdec/VDec/VideoDecoder.cs @@ -35,14 +35,14 @@ namespace Ryujinx.Graphics.VDec switch (method) { - case VideoDecoderMeth.SetVideoCodec: SetVideoCodec(arguments); break; - case VideoDecoderMeth.Execute: Execute(gpu); break; - case VideoDecoderMeth.SetDecoderCtxAddr: SetDecoderCtxAddr(arguments); break; - case VideoDecoderMeth.SetFrameDataAddr: SetFrameDataAddr(arguments); break; - case VideoDecoderMeth.SetVpxCurrLumaAddr: SetVpxCurrLumaAddr(arguments); break; - case VideoDecoderMeth.SetVpxRef0LumaAddr: SetVpxRef0LumaAddr(arguments); break; - case VideoDecoderMeth.SetVpxRef1LumaAddr: SetVpxRef1LumaAddr(arguments); break; - case VideoDecoderMeth.SetVpxRef2LumaAddr: SetVpxRef2LumaAddr(arguments); break; + case VideoDecoderMeth.SetVideoCodec: SetVideoCodec(arguments); break; + case VideoDecoderMeth.Execute: Execute(gpu); break; + case VideoDecoderMeth.SetDecoderCtxAddr: SetDecoderCtxAddr(arguments); break; + case VideoDecoderMeth.SetFrameDataAddr: SetFrameDataAddr(arguments); break; + case VideoDecoderMeth.SetVpxCurrLumaAddr: SetVpxCurrLumaAddr(arguments); break; + case VideoDecoderMeth.SetVpxRef0LumaAddr: SetVpxRef0LumaAddr(arguments); break; + case VideoDecoderMeth.SetVpxRef1LumaAddr: SetVpxRef1LumaAddr(arguments); break; + case VideoDecoderMeth.SetVpxRef2LumaAddr: SetVpxRef2LumaAddr(arguments); break; case VideoDecoderMeth.SetVpxCurrChromaAddr: SetVpxCurrChromaAddr(arguments); break; case VideoDecoderMeth.SetVpxRef0ChromaAddr: SetVpxRef0ChromaAddr(arguments); break; case VideoDecoderMeth.SetVpxRef1ChromaAddr: SetVpxRef1ChromaAddr(arguments); break; diff --git a/Ryujinx.Graphics.Nvdec/Vic/VideoImageComposer.cs b/Ryujinx.Graphics.Nvdec/Vic/VideoImageComposer.cs index e16a25233..39e18fa69 100644 --- a/Ryujinx.Graphics.Nvdec/Vic/VideoImageComposer.cs +++ b/Ryujinx.Graphics.Nvdec/Vic/VideoImageComposer.cs @@ -23,9 +23,9 @@ namespace Ryujinx.Graphics.Vic switch (method) { - case VideoImageComposerMeth.Execute: Execute(gpu); break; - case VideoImageComposerMeth.SetConfigStructOffset: SetConfigStructOffset(arguments); break; - case VideoImageComposerMeth.SetOutputSurfaceLumaOffset: SetOutputSurfaceLumaOffset(arguments); break; + case VideoImageComposerMeth.Execute: Execute(gpu); break; + case VideoImageComposerMeth.SetConfigStructOffset: SetConfigStructOffset(arguments); break; + case VideoImageComposerMeth.SetOutputSurfaceLumaOffset: SetOutputSurfaceLumaOffset(arguments); break; case VideoImageComposerMeth.SetOutputSurfaceChromaUOffset: SetOutputSurfaceChromaUOffset(arguments); break; case VideoImageComposerMeth.SetOutputSurfaceChromaVOffset: SetOutputSurfaceChromaVOffset(arguments); break; } diff --git a/Ryujinx.Graphics.OpenGL/HwCapabilities.cs b/Ryujinx.Graphics.OpenGL/HwCapabilities.cs index bb8e8339b..f97bd2ea4 100644 --- a/Ryujinx.Graphics.OpenGL/HwCapabilities.cs +++ b/Ryujinx.Graphics.OpenGL/HwCapabilities.cs @@ -15,8 +15,8 @@ namespace Ryujinx.Graphics.OpenGL public static bool SupportsAstcCompression => _supportsAstcCompression.Value; public static bool SupportsNonConstantTextureOffset => _isNvidiaDriver.Value; - public static int MaximumComputeSharedMemorySize => _maximumComputeSharedMemorySize.Value; - public static int StorageBufferOffsetAlignment => _storageBufferOffsetAlignment.Value; + public static int MaximumComputeSharedMemorySize => _maximumComputeSharedMemorySize.Value; + public static int StorageBufferOffsetAlignment => _storageBufferOffsetAlignment.Value; private static bool HasExtension(string name) { diff --git a/Ryujinx.Graphics.OpenGL/Pipeline.cs b/Ryujinx.Graphics.OpenGL/Pipeline.cs index 0ef21d7db..669cfe3e9 100644 --- a/Ryujinx.Graphics.OpenGL/Pipeline.cs +++ b/Ryujinx.Graphics.OpenGL/Pipeline.cs @@ -471,6 +471,7 @@ namespace Ryujinx.Graphics.OpenGL } GL.PolygonOffset(factor, units); + // TODO: Enable when GL_EXT_polygon_offset_clamp is supported. // GL.PolygonOffsetClamp(factor, units, clamp); } diff --git a/Ryujinx.Graphics.Shader/Decoders/Block.cs b/Ryujinx.Graphics.Shader/Decoders/Block.cs index 238b0bd6e..e14702373 100644 --- a/Ryujinx.Graphics.Shader/Decoders/Block.cs +++ b/Ryujinx.Graphics.Shader/Decoders/Block.cs @@ -13,7 +13,7 @@ namespace Ryujinx.Graphics.Shader.Decoders public OpCodeBranchIndir BrIndir { get; set; } - public List OpCodes { get; } + public List OpCodes { get; } public List PushOpCodes { get; } public Block(ulong address) diff --git a/Ryujinx.Graphics.Shader/Instructions/InstEmitConversion.cs b/Ryujinx.Graphics.Shader/Instructions/InstEmitConversion.cs index 8c06a24be..afec77616 100644 --- a/Ryujinx.Graphics.Shader/Instructions/InstEmitConversion.cs +++ b/Ryujinx.Graphics.Shader/Instructions/InstEmitConversion.cs @@ -60,7 +60,7 @@ namespace Ryujinx.Graphics.Shader.Instructions if (intType == IntegerType.U64) { - // TODO: Warning. This instruction supports 64-bits integers, but it is not implemented. + context.Config.PrintLog("Unimplemented 64-bits F2I."); return; } @@ -172,7 +172,7 @@ namespace Ryujinx.Graphics.Shader.Instructions if (srcType == IntegerType.U64 || dstType == IntegerType.U64) { - // TODO: Warning. This instruction doesn't support 64-bits integers. + context.Config.PrintLog("Invalid I2I encoding."); return; } diff --git a/Ryujinx.Graphics.Shader/Instructions/InstEmitHelper.cs b/Ryujinx.Graphics.Shader/Instructions/InstEmitHelper.cs index 22e2a1400..130354271 100644 --- a/Ryujinx.Graphics.Shader/Instructions/InstEmitHelper.cs +++ b/Ryujinx.Graphics.Shader/Instructions/InstEmitHelper.cs @@ -53,10 +53,10 @@ namespace Ryujinx.Graphics.Shader.Instructions } else if (floatType == FPType.FP64) { - // TODO. + // TODO: Double floating-point type support. } - // TODO: Warn about invalid floating point type. + context.Config.PrintLog($"Invalid floating point type: {floatType}."); return ConstF(0); } diff --git a/Ryujinx.Graphics.Shader/Instructions/InstEmitMemory.cs b/Ryujinx.Graphics.Shader/Instructions/InstEmitMemory.cs index 2145920ef..25bf25925 100644 --- a/Ryujinx.Graphics.Shader/Instructions/InstEmitMemory.cs +++ b/Ryujinx.Graphics.Shader/Instructions/InstEmitMemory.cs @@ -198,7 +198,7 @@ namespace Ryujinx.Graphics.Shader.Instructions if (!(emit || cut)) { - // TODO: Warning. + context.Config.PrintLog("Invalid OUT encoding."); } if (emit) diff --git a/Ryujinx.Graphics.Shader/Translation/GlobalMemory.cs b/Ryujinx.Graphics.Shader/Translation/GlobalMemory.cs index 4b5dbccb1..a442357dd 100644 --- a/Ryujinx.Graphics.Shader/Translation/GlobalMemory.cs +++ b/Ryujinx.Graphics.Shader/Translation/GlobalMemory.cs @@ -9,7 +9,7 @@ namespace Ryujinx.Graphics.Shader.Translation public const int StorageDescSize = 4; // In words. public const int StorageMaxCount = 16; - public const int StorageDescsSize = StorageDescSize * StorageMaxCount; + public const int StorageDescsSize = StorageDescSize * StorageMaxCount; public static bool UsesGlobalMemory(Instruction inst) { diff --git a/Ryujinx.Graphics.Shader/Translation/Translator.cs b/Ryujinx.Graphics.Shader/Translation/Translator.cs index bdc6a094f..760d616f6 100644 --- a/Ryujinx.Graphics.Shader/Translation/Translator.cs +++ b/Ryujinx.Graphics.Shader/Translation/Translator.cs @@ -22,8 +22,6 @@ namespace Ryujinx.Graphics.Shader.Translation if (cfg == null) { - // TODO: Error. - return code; } diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostChannel/NvHostChannelDeviceFile.cs b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostChannel/NvHostChannelDeviceFile.cs index 72235427e..212d69e09 100644 --- a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostChannel/NvHostChannelDeviceFile.cs +++ b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostChannel/NvHostChannelDeviceFile.cs @@ -12,11 +12,13 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostChannel { class NvHostChannelDeviceFile : NvDeviceFile { - private uint _timeout; - private uint _submitTimeout; - private uint _timeslice; - private GpuContext _gpu; - private ARMeilleure.Memory.MemoryManager _memory; + private uint _timeout; + private uint _submitTimeout; + private uint _timeslice; + + private GpuContext _gpu; + + private ARMeilleure.Memory.MemoryManager _memory; public NvHostChannelDeviceFile(ServiceCtx context) : base(context) {