crafterpika/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-04-21 05:13:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Added: Fix Occlusion Culling

Browse source 
Added a new tab for new features needed for testing
This commit is contained in:
Vova 2025-04-18 19:33:18 +10:00
parent ef1f08055a
commit 0ae31654fc
15 changed files with 2842 additions and 2578 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5271
assets/locales.json
View file

File diff suppressed because it is too large Load diff

5
src/Ryujinx.Graphics.Gpu/Engine/Threed/SemaphoreUpdater.cs
View file

@ -165,11 +165,12 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
Timestamp = ticks,
};
if (result <= 0)
if (GraphicsConfig.FixOcclusionCulling && result <= 0)
{
return;
}
else if (counter?.Invalid != true)
if (counter?.Invalid != true)
{
_channel.MemoryManager.Write(gpuVa, counterData);
}

5
src/Ryujinx.Graphics.Gpu/GraphicsConfig.cs
View file

@ -72,6 +72,11 @@ namespace Ryujinx.Graphics.Gpu
/// Enables or disables color space passthrough, if available.
/// </summary>
public static bool EnableColorSpacePassthrough = false;
/// <summary>
/// Enables or disables fix occlusion culling.
/// </summary>
public static bool FixOcclusionCulling = true;
}
#pragma warning restore CA2211
}

7
src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs
View file

@ -15,7 +15,7 @@ namespace Ryujinx.Ava.Systems.Configuration
/// <summary>
/// The current version of the file format
/// </summary>
public const int CurrentVersion = 69;
public const int CurrentVersion = 70;
/// <summary>
/// Version of the configuration file format
@ -469,6 +469,11 @@ namespace Ryujinx.Ava.Systems.Configuration
/// </summary>
public ulong[] DirtyHacks { get; set; }
/// <summary>
/// Fixes Occlusion Culling in Games (test feature)
/// </summary>
public bool FixOcclusionCulling { get; set; }
/// <summary>
/// Loads a configuration file from disk
/// </summary>

5
src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs
View file

@ -156,6 +156,8 @@ namespace Ryujinx.Ava.Systems.Configuration
Multiplayer.LdnPassphrase.Value = cff.MultiplayerLdnPassphrase;
Multiplayer.LdnServer.Value = cff.LdnServer;
Tweaks.FixOcclusionCulling.Value = cff.FixOcclusionCulling;
{
Hacks.ShowDirtyHacks.Value = cff.ShowDirtyHacks;
@ -461,7 +463,8 @@ namespace Ryujinx.Ava.Systems.Configuration
TurboModeWhileHeld = false
};
}),
(69, static cff => cff.SkipUserProfiles = false)
(69, static cff => cff.SkipUserProfiles = false),
(70, static cff => cff.FixOcclusionCulling = false)
);
}
}

21
src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs
View file

@ -643,6 +643,21 @@ namespace Ryujinx.Ava.Systems.Configuration
}
}
/// <summary>
/// Tweaks Section
/// </summary>
public class TweaksSection
{
/// <summary>
/// Enable or disable Fix Occlusion Culling
/// </summary>
public ReactiveObject<bool> FixOcclusionCulling { get; private set; }
public TweaksSection()
{
FixOcclusionCulling = new ReactiveObject<bool>();
}
}
/// <summary>
/// Multiplayer configuration section
/// </summary>
@ -781,6 +796,11 @@ namespace Ryujinx.Ava.Systems.Configuration
/// </summary>
public GraphicsSection Graphics { get; private set; }
/// <summary>
/// The Tweaks Section
/// </summary>
public TweaksSection Tweaks { get; private set; }
/// <summary>
/// The Hid section
/// </summary>
@ -842,6 +862,7 @@ namespace Ryujinx.Ava.Systems.Configuration
Logger = new LoggerSection();
System = new SystemSection();
Graphics = new GraphicsSection();
Tweaks = new TweaksSection();
Hid = new HidSection();
Multiplayer = new MultiplayerSection();
Hacks = new HacksSection();

2
src/Ryujinx/Systems/Configuration/ConfigurationState.cs
View file

@ -147,6 +147,7 @@ namespace Ryujinx.Ava.Systems.Configuration
LdnServer = Multiplayer.LdnServer,
ShowDirtyHacks = Hacks.ShowDirtyHacks,
DirtyHacks = Hacks.EnabledHacks.Select(it => it.Pack()).ToArray(),
FixOcclusionCulling = Tweaks.FixOcclusionCulling,
};
return configurationFile;
@ -320,6 +321,7 @@ namespace Ryujinx.Ava.Systems.Configuration
},
}
];
Tweaks.FixOcclusionCulling.Value = true;
}
private static GraphicsBackend DefaultGraphicsBackend()

8
src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
View file

@ -383,6 +383,8 @@ namespace Ryujinx.Ava.UI.ViewModels
}
}
public bool FixOcclusionCulling { get; set; }
public SettingsViewModel(
VirtualFileSystem virtualFileSystem,
ContentManager contentManager,
@ -659,6 +661,9 @@ namespace Ryujinx.Ava.UI.ViewModels
DisableP2P = config.Multiplayer.DisableP2p;
LdnPassphrase = config.Multiplayer.LdnPassphrase;
LdnServer = config.Multiplayer.LdnServer;
// Tweaks
FixOcclusionCulling = config.Tweaks.FixOcclusionCulling.Value;
}
public void SaveSettings()
@ -785,6 +790,9 @@ namespace Ryujinx.Ava.UI.ViewModels
config.Hacks.DisableNifmIsAnyInternetRequestAccepted.Value =
DirtyHacks.NifmDisableIsAnyInternetRequestAccepted;
// Tweaks
config.Tweaks.FixOcclusionCulling.Value = FixOcclusionCulling;
config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
MainWindow.UpdateGraphicsConfig();

65
src/Ryujinx/UI/Views/Settings/SettingsTweaksView.axaml Normal file
View file

@ -0,0 +1,65 @@
<UserControl
x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsTweaksView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
mc:Ignorable="d"
x:DataType="viewModels:SettingsViewModel"
x:CompileBindings="True"
Focusable="True">
<Design.DataContext>
<viewModels:SettingsViewModel />
</Design.DataContext>
<UserControl.Styles>
<Style Selector="TextBlock.DefaultEnable" >
<Setter Property="Foreground" Value="SeaGreen"/>
<Setter Property="Margin" Value="5,0,0,0"/>
<Setter Property="VerticalAlignment" Value="Center"/>
</Style>
<Style Selector="TextBlock.DefaultDisable" >
<Setter Property="Foreground" Value="IndianRed"/>
<Setter Property="Margin" Value="5,0,0,0"/>
<Setter Property="VerticalAlignment" Value="Center"/>
</Style>
</UserControl.Styles>
<ScrollViewer
Name="HotkeysPage"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto">
<Border Classes="settings">
<StackPanel
Name="SettingButtons"
Margin="10"
Orientation="Vertical"
Spacing="10">
<TextBlock
HorizontalAlignment="Center"
Classes="h1"
Text="{ext:Locale SettingsTabTweaksTitle}" />
<TextBlock
HorizontalAlignment="Center"
Foreground="{DynamicResource SecondaryTextColor}"
TextDecorations="Underline"
Text="{ext:Locale SettingsTabTweaksDescription}" />
<Separator/>
<StackPanel Orientation="Vertical">
<CheckBox IsChecked="{Binding FixOcclusionCulling}"
ToolTip.Tip="{ext:Locale FixOcclusionCullingTooltip}">
<StackPanel Orientation="Horizontal">
<TextBlock Text="{ext:Locale FixOcclusionCulling}" />
<TextBlock Classes="DefaultEnable" Text="Default: enable" />
</StackPanel>
</CheckBox>
</StackPanel>
</StackPanel>
</Border>
</ScrollViewer>
</UserControl>

12
src/Ryujinx/UI/Views/Settings/SettingsTweaksView.axaml.cs Normal file
View file

@ -0,0 +1,12 @@
using Avalonia.Controls;
namespace Ryujinx.Ava.UI.Views.Settings
{
public partial class SettingsTweaksView : UserControl
{
public SettingsTweaksView()
{
InitializeComponent();
}
}
}

5
src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml
View file

@ -34,6 +34,7 @@
<settings:SettingsSystemView Name="SystemPage" />
<settings:SettingsCPUView Name="CpuPage" />
<settings:SettingsGraphicsView Name="GraphicsPage" />
<settings:SettingsTweaksView Name="TweaksPage" />
<settings:SettingsAudioView Name="AudioPage" />
<settings:SettingsNetworkView Name="NetworkPage" />
<settings:SettingsLoggingView Name="LoggingPage" />
@ -101,6 +102,10 @@
Content="{ext:Locale SettingsTabGraphics}"
Tag="GraphicsPage"
IconSource="Image" />
<ui:NavigationViewItem
Content="{ext:Locale SettingsTabTweaks}"
Tag="TweaksPage"
IconSource="Repair" />
<ui:NavigationViewItem
Content="{ext:Locale SettingsTabAudio}"
IconSource="Audio"

3
src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml.cs
View file

@ -70,6 +70,9 @@ namespace Ryujinx.Ava.UI.Windows
case nameof(GraphicsPage):
NavPanel.Content = GraphicsPage;
break;
case nameof(TweaksPage):
NavPanel.Content = TweaksPage;
break;
case nameof(AudioPage):
NavPanel.Content = AudioPage;
break;

1
src/Ryujinx/UI/Windows/MainWindow.axaml.cs
View file

@ -569,6 +569,7 @@ namespace Ryujinx.Ava.UI.Windows
GraphicsConfig.EnableShaderCache = ConfigurationState.Instance.Graphics.EnableShaderCache;
GraphicsConfig.EnableTextureRecompression = ConfigurationState.Instance.Graphics.EnableTextureRecompression;
GraphicsConfig.EnableMacroHLE = ConfigurationState.Instance.Graphics.EnableMacroHLE;
GraphicsConfig.FixOcclusionCulling = ConfigurationState.Instance.Tweaks.FixOcclusionCulling;
#pragma warning restore IDE0055
}

5
src/Ryujinx/UI/Windows/SettingsWindow.axaml
View file

@ -43,6 +43,7 @@
<settings:SettingsSystemView Name="SystemPage" />
<settings:SettingsCPUView Name="CpuPage" />
<settings:SettingsGraphicsView Name="GraphicsPage" />
<settings:SettingsTweaksView Name="TweaksPage" />
<settings:SettingsAudioView Name="AudioPage" />
<settings:SettingsNetworkView Name="NetworkPage" />
<settings:SettingsLoggingView Name="LoggingPage" />
@ -88,6 +89,10 @@
Content="{ext:Locale SettingsTabGraphics}"
Tag="GraphicsPage"
IconSource="Image" />
<ui:NavigationViewItem
Content="{ext:Locale SettingsTabTweaks}"
Tag="TweaksPage"
IconSource="Repair" />
<ui:NavigationViewItem
Content="{ext:Locale SettingsTabAudio}"
IconSource="Audio"

3
src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
View file

@ -88,6 +88,9 @@ namespace Ryujinx.Ava.UI.Windows
case "GraphicsPage":
NavPanel.Content = GraphicsPage;
break;
case "TweaksPage":
NavPanel.Content = TweaksPage;
break;
case "AudioPage":
NavPanel.Content = AudioPage;
break;