Change default Vsync toggle hotkey to F1 instead of Tab (#3995)

Bumps [Microsoft.CodeAnalysis.CSharp](https://github.com/dotnet/roslyn) from 4.2.0 to 4.4.0.
- [Release notes](https://github.com/dotnet/roslyn/releases)
- [Changelog](https://github.com/dotnet/roslyn/blob/main/docs/Breaking%20API%20Changes.md)
- [Commits](https://github.com/dotnet/roslyn/compare/v4.2.0...Visual-Studio-2019-Version-16.0-Preview-4.4)

---
updated-dependencies:
- dependency-name: Microsoft.CodeAnalysis.CSharp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Ryujinx.Ava/Ui/Models/FileSizeSortComparer.cs

@@ -1,45 +0,0 @@
-using Ryujinx.Ui.App.Common;
-using System.Collections;
-
-namespace Ryujinx.Ava.Ui.Models
-{
-    internal class FileSizeSortComparer : IComparer
-    {
-        public int Compare(object x, object y)
-        {
-            string aValue = (x as ApplicationData).TimePlayed;
-            string bValue = (y as ApplicationData).TimePlayed;
-
-            if (aValue[^3..] == "GiB")
-            {
-                aValue = (float.Parse(aValue[0..^3]) * 1024).ToString();
-            }
-            else
-            {
-                aValue = aValue[0..^3];
-            }
-
-            if (bValue[^3..] == "GiB")
-            {
-                bValue = (float.Parse(bValue[0..^3]) * 1024).ToString();
-            }
-            else
-            {
-                bValue = bValue[0..^3];
-            }
-
-            if (float.Parse(aValue) > float.Parse(bValue))
-            {
-                return -1;
-            }
-            else if (float.Parse(bValue) > float.Parse(aValue))
-            {
-                return 1;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-    }
-}

Ryujinx.Ava/Ui/Models/Generic/FileSizeSortComparer.cs

@@ -1,50 +0,0 @@
-using Ryujinx.Ui.App.Common;
-using System.Collections.Generic;
-
-namespace Ryujinx.Ava.Ui.Models.Generic
-{
-    internal class FileSizeSortComparer : IComparer<ApplicationData>
-    {
-        public FileSizeSortComparer() { }
-        public FileSizeSortComparer(bool isAscending) { _order = isAscending ? 1 : -1; }
-
-        private int _order;
-
-        public int Compare(ApplicationData x, ApplicationData y)
-        {
-            string aValue = x.FileSize;
-            string bValue = y.FileSize;
-
-            if (aValue[^3..] == "GiB")
-            {
-                aValue = (float.Parse(aValue[0..^3]) * 1024).ToString();
-            }
-            else
-            {
-                aValue = aValue[0..^3];
-            }
-
-            if (bValue[^3..] == "GiB")
-            {
-                bValue = (float.Parse(bValue[0..^3]) * 1024).ToString();
-            }
-            else
-            {
-                bValue = bValue[0..^3];
-            }
-
-            if (float.Parse(aValue) > float.Parse(bValue))
-            {
-                return -1 * _order;
-            }
-            else if (float.Parse(bValue) > float.Parse(aValue))
-            {
-                return 1 * _order;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-    }
-}

Ryujinx.Ava/Ui/Models/Generic/TimePlayedSortComparer.cs

@@ -1,66 +0,0 @@
-using Ryujinx.Ui.App.Common;
-using System.Collections.Generic;
-
-namespace Ryujinx.Ava.Ui.Models.Generic
-{
-    internal class TimePlayedSortComparer : IComparer<ApplicationData>
-    {
-        public TimePlayedSortComparer() { }
-        public TimePlayedSortComparer(bool isAscending) { _order = isAscending ? 1 : -1; }
-
-        private int _order;
-
-        public int Compare(ApplicationData x, ApplicationData y)
-        {
-            string aValue = x.TimePlayed;
-            string bValue = y.TimePlayed;
-
-            if (aValue.Length > 4 && aValue[^4..] == "mins")
-            {
-                aValue = (float.Parse(aValue[0..^5]) * 60).ToString();
-            }
-            else if (aValue.Length > 3 && aValue[^3..] == "hrs")
-            {
-                aValue = (float.Parse(aValue[0..^4]) * 3600).ToString();
-            }
-            else if (aValue.Length > 4 && aValue[^4..] == "days")
-            {
-                aValue = (float.Parse(aValue[0..^5]) * 86400).ToString();
-            }
-            else
-            {
-                aValue = aValue[0..^1];
-            }
-
-            if (bValue.Length > 4 && bValue[^4..] == "mins")
-            {
-                bValue = (float.Parse(bValue[0..^5]) * 60).ToString();
-            }
-            else if (bValue.Length > 3 && bValue[^3..] == "hrs")
-            {
-                bValue = (float.Parse(bValue[0..^4]) * 3600).ToString();
-            }
-            else if (bValue.Length > 4 && bValue[^4..] == "days")
-            {
-                bValue = (float.Parse(bValue[0..^5]) * 86400).ToString();
-            }
-            else
-            {
-                bValue = bValue[0..^1];
-            }
-
-            if (float.Parse(aValue) > float.Parse(bValue))
-            {
-                return -1 * _order;
-            }
-            else if (float.Parse(bValue) > float.Parse(aValue))
-            {
-                return 1 * _order;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-    }
-}

Ryujinx.Ava/Ui/Models/LastPlayedSortComparer.cs

@@ -1,27 +0,0 @@
-using Ryujinx.Ui.App.Common;
-using System;
-using System.Collections;
-
-namespace Ryujinx.Ava.Ui.Models
-{
-    internal class LastPlayedSortComparer : IComparer
-    {
-        public int Compare(object x, object y)
-        {
-            string aValue = (x as ApplicationData).LastPlayed;
-            string bValue = (y as ApplicationData).LastPlayed;
-
-            if (aValue == "Never")
-            {
-                aValue = DateTime.UnixEpoch.ToString();
-            }
-
-            if (bValue == "Never")
-            {
-                bValue = DateTime.UnixEpoch.ToString();
-            }
-
-            return DateTime.Compare(DateTime.Parse(bValue), DateTime.Parse(aValue));
-        }
-    }
-}

Ryujinx.Ava/Ui/Models/TimePlayedSortComparer.cs

@@ -1,61 +0,0 @@
-using Ryujinx.Ui.App.Common;
-using System.Collections;
-
-namespace Ryujinx.Ava.Ui.Models
-{
-    internal class TimePlayedSortComparer : IComparer
-    {
-        public int Compare(object x, object y)
-        {
-            string aValue = (x as ApplicationData).TimePlayed;
-            string bValue = (y as ApplicationData).TimePlayed;
-
-            if (aValue.Length > 4 && aValue[^4..] == "mins")
-            {
-                aValue = (float.Parse(aValue[0..^5]) * 60).ToString();
-            }
-            else if (aValue.Length > 3 && aValue[^3..] == "hrs")
-            {
-                aValue = (float.Parse(aValue[0..^4]) * 3600).ToString();
-            }
-            else if (aValue.Length > 4 && aValue[^4..] == "days")
-            {
-                aValue = (float.Parse(aValue[0..^5]) * 86400).ToString();
-            }
-            else
-            {
-                aValue = aValue[0..^1];
-            }
-
-            if (bValue.Length > 4 && bValue[^4..] == "mins")
-            {
-                bValue = (float.Parse(bValue[0..^5]) * 60).ToString();
-            }
-            else if (bValue.Length > 3 && bValue[^3..] == "hrs")
-            {
-                bValue = (float.Parse(bValue[0..^4]) * 3600).ToString();
-            }
-            else if (bValue.Length > 4 && bValue[^4..] == "days")
-            {
-                bValue = (float.Parse(bValue[0..^5]) * 86400).ToString();
-            }
-            else
-            {
-                bValue = bValue[0..^1];
-            }
-
-            if (float.Parse(aValue) > float.Parse(bValue))
-            {
-                return -1;
-            }
-            else if (float.Parse(bValue) > float.Parse(aValue))
-            {
-                return 1;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-    }
-}

Ryujinx.Ava/Ui/ViewModels/MainWindowViewModel.cs

@@ -502,8 +502,10 @@ namespace Ryujinx.Ava.Ui.ViewModels
             return SortMode switch
             {
                 ApplicationSort.LastPlayed      => new Models.Generic.LastPlayedSortComparer(IsAscending),
-                ApplicationSort.FileSize        => new Models.Generic.FileSizeSortComparer(IsAscending),
-                ApplicationSort.TotalTimePlayed => new Models.Generic.TimePlayedSortComparer(IsAscending),
+                ApplicationSort.FileSize        => IsAscending  ? SortExpressionComparer<ApplicationData>.Ascending(app  => app.FileSizeBytes)
+                                                                : SortExpressionComparer<ApplicationData>.Descending(app => app.FileSizeBytes),
+                ApplicationSort.TotalTimePlayed => IsAscending  ? SortExpressionComparer<ApplicationData>.Ascending(app  => app.TimePlayedNum)
+                                                                : SortExpressionComparer<ApplicationData>.Descending(app => app.TimePlayedNum),
                 ApplicationSort.Title           => IsAscending  ? SortExpressionComparer<ApplicationData>.Ascending(app  => app.TitleName)
                                                                 : SortExpressionComparer<ApplicationData>.Descending(app => app.TitleName),
                 ApplicationSort.Favorite        => !IsAscending ? SortExpressionComparer<ApplicationData>.Ascending(app  => app.Favorite)

Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs

@@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
         private const ushort FileFormatVersionMajor = 1;
         private const ushort FileFormatVersionMinor = 2;
         private const uint FileFormatVersionPacked = ((uint)FileFormatVersionMajor << 16) | FileFormatVersionMinor;
-        private const uint CodeGenVersion = 4011;
+        private const uint CodeGenVersion = 4029;
 
         private const string SharedTocFileName = "shared.toc";
         private const string SharedDataFileName = "shared.data";

Ryujinx.Graphics.Shader/Translation/Rewriter.cs

@@ -21,10 +21,11 @@ namespace Ryujinx.Graphics.Shader.Translation
             {
                 BasicBlock block = blocks[blkIndex];
 
-                for (LinkedListNode<INode> node = block.Operations.First; node != null; node = node.Next)
+                for (LinkedListNode<INode> node = block.Operations.First; node != null;)
                 {
                     if (node.Value is not Operation operation)
                     {
+                        node = node.Next;
                         continue;
                     }
 
@@ -43,10 +44,7 @@ namespace Ryujinx.Graphics.Shader.Translation
                         }
                     }
 
-                    if (UsesGlobalMemory(operation.Inst))
-                    {
-                        node = RewriteGlobalAccess(node, config);
-                    }
+                    LinkedListNode<INode> nextNode = node.Next;
 
                     if (operation is TextureOperation texOp)
                     {
@@ -59,7 +57,15 @@ namespace Ryujinx.Graphics.Shader.Translation
                                 node = InsertSnormNormalization(node, config);
                             }
                         }
+
+                        nextNode = node.Next;
                     }
+                    else if (UsesGlobalMemory(operation.Inst))
+                    {
+                        nextNode = RewriteGlobalAccess(node, config)?.Next ?? nextNode;
+                    }
+
+                    node = nextNode;
                 }
             }
         }
@@ -72,7 +78,7 @@ namespace Ryujinx.Graphics.Shader.Translation
             bool isStg16Or8 = operation.Inst == Instruction.StoreGlobal16 || operation.Inst == Instruction.StoreGlobal8;
             bool isWrite = isAtomic || operation.Inst == Instruction.StoreGlobal || isStg16Or8;
 
-            Operation storageOp;
+            Operation storageOp = null;
 
             Operand PrependOperation(Instruction inst, params Operand[] sources)
             {
@@ -120,49 +126,56 @@ namespace Ryujinx.Graphics.Shader.Translation
                 sbSlot        = PrependOperation(Instruction.ConditionalSelect, inRange, Const(slot), sbSlot);
             }
 
-            Operand alignMask = Const(-config.GpuAccessor.QueryHostStorageBufferOffsetAlignment());
-
-            Operand baseAddrTrunc = PrependOperation(Instruction.BitwiseAnd, sbBaseAddrLow, alignMask);
-            Operand byteOffset    = PrependOperation(Instruction.Subtract, addrLow, baseAddrTrunc);
-
-            Operand[] sources = new Operand[operation.SourcesCount];
-
-            sources[0] = sbSlot;
-
-            if (isStg16Or8)
+            if (sbUseMask != 0)
             {
-                sources[1] = byteOffset;
-            }
-            else
-            {
-                sources[1] = PrependOperation(Instruction.ShiftRightU32, byteOffset, Const(2));
-            }
+                Operand alignMask = Const(-config.GpuAccessor.QueryHostStorageBufferOffsetAlignment());
 
-            for (int index = 2; index < operation.SourcesCount; index++)
-            {
-                sources[index] = operation.GetSource(index);
-            }
+                Operand baseAddrTrunc = PrependOperation(Instruction.BitwiseAnd, sbBaseAddrLow, alignMask);
+                Operand byteOffset    = PrependOperation(Instruction.Subtract, addrLow, baseAddrTrunc);
 
-            if (isAtomic)
-            {
-                Instruction inst = (operation.Inst & ~Instruction.MrMask) | Instruction.MrStorage;
+                Operand[] sources = new Operand[operation.SourcesCount];
 
-                storageOp = new Operation(inst, operation.Dest, sources);
-            }
-            else if (operation.Inst == Instruction.LoadGlobal)
-            {
-                storageOp = new Operation(Instruction.LoadStorage, operation.Dest, sources);
-            }
-            else
-            {
-                Instruction storeInst = operation.Inst switch
+                sources[0] = sbSlot;
+
+                if (isStg16Or8)
                 {
-                    Instruction.StoreGlobal16 => Instruction.StoreStorage16,
-                    Instruction.StoreGlobal8 => Instruction.StoreStorage8,
-                    _ => Instruction.StoreStorage
-                };
+                    sources[1] = byteOffset;
+                }
+                else
+                {
+                    sources[1] = PrependOperation(Instruction.ShiftRightU32, byteOffset, Const(2));
+                }
 
-                storageOp = new Operation(storeInst, null, sources);
+                for (int index = 2; index < operation.SourcesCount; index++)
+                {
+                    sources[index] = operation.GetSource(index);
+                }
+
+                if (isAtomic)
+                {
+                    Instruction inst = (operation.Inst & ~Instruction.MrMask) | Instruction.MrStorage;
+
+                    storageOp = new Operation(inst, operation.Dest, sources);
+                }
+                else if (operation.Inst == Instruction.LoadGlobal)
+                {
+                    storageOp = new Operation(Instruction.LoadStorage, operation.Dest, sources);
+                }
+                else
+                {
+                    Instruction storeInst = operation.Inst switch
+                    {
+                        Instruction.StoreGlobal16 => Instruction.StoreStorage16,
+                        Instruction.StoreGlobal8 => Instruction.StoreStorage8,
+                        _ => Instruction.StoreStorage
+                    };
+
+                    storageOp = new Operation(storeInst, null, sources);
+                }
+            }
+            else if (operation.Dest != null)
+            {
+                storageOp = new Operation(Instruction.Copy, operation.Dest, Const(0));
             }
 
             for (int index = 0; index < operation.SourcesCount; index++)
@@ -171,10 +184,18 @@ namespace Ryujinx.Graphics.Shader.Translation
             }
 
             LinkedListNode<INode> oldNode = node;
+            LinkedList<INode> oldNodeList = oldNode.List;
 
-            node = node.List.AddBefore(node, storageOp);
+            if (storageOp != null)
+            {
+                node = node.List.AddBefore(node, storageOp);
+            }
+            else
+            {
+                node = null;
+            }
 
-            node.List.Remove(oldNode);
+            oldNodeList.Remove(oldNode);
 
             return node;
         }

Ryujinx.Horizon.Generators/Ryujinx.Horizon.Generators.csproj

@@ -9,7 +9,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
   </ItemGroup>
 
 </Project>

Ryujinx.Ui.Common/App/ApplicationData.cs

@@ -12,9 +12,11 @@ namespace Ryujinx.Ui.App.Common
         public string Developer     { get; set; }
         public string Version       { get; set; }
         public string TimePlayed    { get; set; }
+        public double TimePlayedNum { get; set; }
         public string LastPlayed    { get; set; }
         public string FileExtension { get; set; }
         public string FileSize      { get; set; }
+        public double FileSizeBytes { get; set; }
         public string Path          { get; set; }
         public BlitStruct<ApplicationControlProperty> ControlHolder { get; set; }
     }

Ryujinx.Ui.Common/App/ApplicationLibrary.cs

@@ -465,9 +465,11 @@ namespace Ryujinx.Ui.App.Common
                         Developer = developer,
                         Version = version,
                         TimePlayed = ConvertSecondsToReadableString(appMetadata.TimePlayed),
+                        TimePlayedNum = appMetadata.TimePlayed,
                         LastPlayed = appMetadata.LastPlayed,
                         FileExtension = Path.GetExtension(applicationPath).ToUpper().Remove(0, 1),
                         FileSize = (fileSize < 1) ? (fileSize * 1024).ToString("0.##") + " MiB" : fileSize.ToString("0.##") + " GiB",
+                        FileSizeBytes = fileSize,
                         Path = applicationPath,
                         ControlHolder = controlHolder
                     };

Ryujinx.Ui.Common/Configuration/ConfigurationState.cs

@@ -680,7 +680,7 @@ namespace Ryujinx.Ui.Common.Configuration
             Hid.EnableMouse.Value                     = false;
             Hid.Hotkeys.Value = new KeyboardHotkeys
             {
-                ToggleVsync = Key.Tab,
+                ToggleVsync = Key.F1,
                 ToggleMute = Key.F2,
                 Screenshot = Key.F8,
                 ShowUi = Key.F4,
@@ -818,7 +818,7 @@ namespace Ryujinx.Ui.Common.Configuration
 
                 configurationFileFormat.Hotkeys = new KeyboardHotkeys
                 {
-                    ToggleVsync = Key.Tab
+                    ToggleVsync = Key.F1
                 };
 
                 configurationFileUpdated = true;
@@ -999,7 +999,7 @@ namespace Ryujinx.Ui.Common.Configuration
 
                 configurationFileFormat.Hotkeys = new KeyboardHotkeys
                 {
-                    ToggleVsync = Key.Tab,
+                    ToggleVsync = Key.F1,
                     Screenshot = Key.F8
                 };
 
@@ -1012,7 +1012,7 @@ namespace Ryujinx.Ui.Common.Configuration
 
                 configurationFileFormat.Hotkeys = new KeyboardHotkeys
                 {
-                    ToggleVsync = Key.Tab,
+                    ToggleVsync = Key.F1,
                     Screenshot = Key.F8,
                     ShowUi = Key.F4
                 };

Ryujinx/Ui/Helper/SortHelper.cs

@@ -9,46 +9,56 @@ namespace Ryujinx.Ui.Helper
         {
             string aValue = model.GetValue(a, 5).ToString();
             string bValue = model.GetValue(b, 5).ToString();
+            float aFloat;
+            float bFloat;
 
-            if (aValue.Length > 4 && aValue[^4..] == "mins")
+            if (aValue.Length > 7 && aValue[^7..] == "minutes")
             {
-                aValue = (float.Parse(aValue[0..^5]) * 60).ToString();
+                aValue = aValue.Replace("minutes", "");
+                aFloat = (float.Parse(aValue) * 60);
             }
-            else if (aValue.Length > 3 && aValue[^3..] == "hrs")
+            else if (aValue.Length > 5 && aValue[^5..] == "hours")
             {
-                aValue = (float.Parse(aValue[0..^4]) * 3600).ToString();
+                aValue = aValue.Replace("hours", "");
+                aFloat = (float.Parse(aValue) * 3600);
             }
             else if (aValue.Length > 4 && aValue[^4..] == "days")
             {
-                aValue = (float.Parse(aValue[0..^5]) * 86400).ToString();
+                aValue = aValue.Replace("days", "");
+                aFloat = (float.Parse(aValue) * 86400);
             }
             else
             {
-                aValue = aValue[0..^1];
+                aValue = aValue.Replace("seconds", "");
+                aFloat = float.Parse(aValue);
             }
 
-            if (bValue.Length > 4 && bValue[^4..] == "mins")
+            if (bValue.Length > 7 && bValue[^7..] == "minutes")
             {
-                bValue = (float.Parse(bValue[0..^5]) * 60).ToString();
+                bValue = bValue.Replace("minutes", "");
+                bFloat = (float.Parse(bValue) * 60);
             }
-            else if (bValue.Length > 3 && bValue[^3..] == "hrs")
+            else if (bValue.Length > 5 && bValue[^5..] == "hours")
             {
-                bValue = (float.Parse(bValue[0..^4]) * 3600).ToString();
+                bValue = bValue.Replace("hours", "");
+                bFloat = (float.Parse(bValue) * 3600);
             }
             else if (bValue.Length > 4 && bValue[^4..] == "days")
             {
-                bValue = (float.Parse(bValue[0..^5]) * 86400).ToString();
+                bValue =  bValue.Replace("days", "");
+                bFloat = (float.Parse(bValue) * 86400);
             }
             else
             {
-                bValue = bValue[0..^1];
+                bValue = bValue[0..^8];
+                bFloat = float.Parse(bValue);
             }
 
-            if (float.Parse(aValue) > float.Parse(bValue))
+            if (aFloat > bFloat)
             {
                 return -1;
             }
-            else if (float.Parse(bValue) > float.Parse(aValue))
+            else if (bFloat > aFloat)
             {
                 return 1;
             }