PPTC: fix rare EndOfStreamException in ContainsBlacklistedFunctions

See merge request ryubing/ryujinx!4

src/ARMeilleure/Translation/PTC/Ptc.cs

@@ -193,7 +193,7 @@ namespace ARMeilleure.Translation.PTC
             _infosStream.Seek(0L, SeekOrigin.Begin);
             bool foundBadFunction = false;
 
-            for (int index = 0; index < GetEntriesCount(); index++)
+            for (int index = 0; index < _infosStream.Length; index++)
             {
                 InfoEntry infoEntry = DeserializeStructure<InfoEntry>(_infosStream);
                 foreach (ulong address in blacklist)
@@ -201,7 +201,7 @@ namespace ARMeilleure.Translation.PTC
                     if (infoEntry.Address == address)
                     {
                         containsBlacklistedFunctions = true;
-                        Logger.Warning?.Print(LogClass.Ptc, "PPTC cache invalidated: Found blacklisted functions in PPTC cache");
+                        Logger.Warning?.Print(LogClass.Ptc, "Translation cache invalidated: Found blacklisted functions");
                         foundBadFunction = true;
                         break;
                     }

src/Ryujinx.Graphics.Shader/CodeGen/Glsl/Declarations.cs

@@ -512,13 +512,9 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl
                 if (context.Definitions.Stage == ShaderStage.Fragment && context.Definitions.DualSourceBlend)
                 {
                     IoDefinition firstOutput = outputs.ElementAtOrDefault(0);
-                    IoDefinition secondOutput = outputs.ElementAtOrDefault(1);
 
-                    if (firstOutput.Location + 1 == secondOutput.Location)
+                    DeclareOutputDualSourceBlendAttribute(context, firstOutput.Location);
-                    {
+                    outputs = outputs.Skip(2);
-                        DeclareOutputDualSourceBlendAttribute(context, firstOutput.Location);
-                        outputs = outputs.Skip(2);
-                    }
                 }
 
                 foreach (IoDefinition ioDefinition in outputs)

src/Ryujinx.Graphics.Shader/Translation/Translator.cs

@@ -181,13 +181,29 @@ namespace Ryujinx.Graphics.Shader.Translation
 
         private static void EmitOutputsInitialization(EmitterContext context, AttributeUsage attributeUsage, IGpuAccessor gpuAccessor, ShaderStage stage)
         {
-            // Compute has no output attributes, and fragment is the last stage, so we
+            // Compute has no output attributes, so we
-            // don't need to initialize outputs on those stages.
+            // don't need to initialize outputs on that stage.
-            if (stage == ShaderStage.Compute || stage == ShaderStage.Fragment)
+            if (stage == ShaderStage.Compute)
             {
                 return;
             }
 
+            if (stage == ShaderStage.Fragment)
+            {
+                // Fragment is the last stage, so we don't need to
+                // initialize outputs unless we're using DSB, in which
+                // we need to make sure the ouput has a valid value.
+                if (gpuAccessor.QueryGraphicsState().DualSourceBlendEnable)
+                {
+                    for (int i = 0; i < 4; i++)
+                    {
+                        context.Store(StorageKind.Output, IoVariable.FragmentOutputColor, null, Const(1), Const(i), ConstF(0));
+                    }
+                }
+
+                return;
+            }
+
             if (stage == ShaderStage.Vertex)
             {
                 InitializeVertexOutputs(context);

src/Ryujinx/Headless/HeadlessRyujinx.cs

@@ -165,10 +165,8 @@ namespace Ryujinx.Headless
             
             ReloadConfig();
 
-            if (option.InheritConfig)
+            if (!option.DisableMainInputConfig)
-            {
                 option.InheritMainConfigInput(originalArgs, ConfigurationState.Instance);
-            }
             
             _virtualFileSystem = VirtualFileSystem.CreateInstance();
             _libHacHorizonManager = new LibHacHorizonManager();

src/Ryujinx/Headless/Options.cs

@@ -193,6 +193,9 @@ namespace Ryujinx.Headless
         
         [Option("use-main-config", Required = false, Default = false, HelpText = "Use the settings from what was configured via the UI.")]
         public bool InheritConfig { get; set; }
+        
+        [Option("disable-main-input-config", Required = false, Default = false, HelpText = "Do not use the input-related settings from what was configured via the UI.")]
+        public bool DisableMainInputConfig { get; set; }
 
         [Option("root-data-dir", Required = false, HelpText = "Set the custom folder path for Ryujinx data.")]
         public string BaseDataDir { get; set; }

src/Ryujinx/Systems/AppHost.cs

@@ -1116,8 +1116,8 @@ namespace Ryujinx.Ava.Systems
                 LocaleManager.Instance[LocaleKeys.VolumeShort] + $": {(int)(Device.GetVolume() * 100)}%",
                 dockedMode,
                 ConfigurationState.Instance.Graphics.AspectRatio.Value.ToText(),
-                FormatGameFrameRate(),
+                Device.System.IsPaused ? LocaleManager.GetUnformatted(LocaleKeys.Paused) : FormatGameFrameRate(),
-                Device.Statistics.FormatFifoPercent(),
+                Device.System.IsPaused ? string.Empty : Device.Statistics.FormatFifoPercent(),
                 _displayCount));
         }
 

src/Ryujinx/Systems/DiscordIntegrationModule.cs

@@ -23,7 +23,7 @@ namespace Ryujinx.Ava.Systems
 
         private static readonly string _description =
             ReleaseInformation.IsValid
-                ? $"{VersionString} {ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelSourceRepo}"
+                ? $"{VersionString} {ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelRepo}"
                 : "dev build";
 
         private const string ApplicationId = "1293250299716173864";

src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs

@@ -14,8 +14,8 @@ namespace Ryujinx.Ava.UI.ViewModels
         [ObservableProperty] private Bitmap _gitLabLogo;
         [ObservableProperty] private Bitmap _discordLogo;
         [ObservableProperty] private string _version;
-
+        
-        public string Developers => "GreemDev";
+        public string Developers => "GreemDev, LotP";
 
         public string FormerDevelopers => LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.AboutPageDeveloperListMore, "gdkchan, Ac_K, marysaka, rip in peri peri, LDj3SNuD, emmaus, Thealexbarney, GoffyDude, TSRBerry, IsaacMarovitz");
 

src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml

@@ -249,7 +249,14 @@
                 IsVisible="{Binding !ShowLoadProgress}"
                 Text="{Binding GameStatusText}"
                 TextAlignment="Start" />
-            <controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
+            <controls:MiniVerticalSeparator>
+                <controls:MiniVerticalSeparator.IsVisible>
+                    <MultiBinding Converter="{x:Static BoolConverters.And}">
+                        <Binding Path="!ShowLoadProgress"/>
+                        <Binding Path="!IsPaused"/>
+                    </MultiBinding>
+                </controls:MiniVerticalSeparator.IsVisible>
+            </controls:MiniVerticalSeparator>
             <TextBlock
                 Margin="5,0,5,0"
                 HorizontalAlignment="Left"

src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml

@@ -109,7 +109,7 @@
                                       SimpleNumberFormat="F0"
                                       SpinButtonPlacementMode="Hidden"
                                       Minimum="50"
-                                      Maximum="300" />
+                                      Maximum="1000" />
                         <Slider Value="{Binding TurboMultiplier}"
                                 ToolTip.Tip="{ext:Locale SettingsTabSystemTurboMultiplierValueToolTip}"
                                 MinWidth="175"
@@ -122,7 +122,7 @@
                                 SmallChange="1"
                                 VerticalAlignment="Center"
                                 Minimum="50"
-                                Maximum="500" />
+                                Maximum="1000" />
                         <TextBlock Margin="5,0"
                                    Width="40"
                                    Text="{Binding TurboMultiplierPercentageText}"/>