Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Buildtest #9

Closed
wants to merge 49 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
9800da3
Let’s start again
IsaacMarovitz Jun 4, 2023
fe74d3b
Read folders and such
IsaacMarovitz Jun 4, 2023
98b3cd1
Remove Open Mod Folder menu items
IsaacMarovitz Jun 4, 2023
d291cd8
Fix folder opening, Selecting/deselecting
IsaacMarovitz Jun 4, 2023
99b7fe2
She works
IsaacMarovitz Jun 5, 2023
a4b69c5
Fix GTK
IsaacMarovitz Jun 5, 2023
e8d523b
AddMod
IsaacMarovitz Jun 5, 2023
83ef331
Delete
IsaacMarovitz Jun 5, 2023
600940d
Fix duplicate entries
IsaacMarovitz Jun 27, 2023
4b64616
Fix file check
IsaacMarovitz Jun 27, 2023
b14f808
Avalonia 11
IsaacMarovitz Aug 14, 2023
0aec0c5
Style fixes
IsaacMarovitz Aug 14, 2023
78eae90
Final style fixes
IsaacMarovitz Aug 14, 2023
73439b9
Might be too general
IsaacMarovitz Aug 14, 2023
3f2c2a1
Remove unnecessary using
IsaacMarovitz Aug 14, 2023
9979193
Enable new mods by default
IsaacMarovitz Aug 14, 2023
928b91b
More cleanup
IsaacMarovitz Aug 14, 2023
243654e
Fix saving metadata
IsaacMarovitz Aug 14, 2023
6dc8355
Dont deseralise ModMetadata several times
IsaacMarovitz Oct 23, 2023
288ad6f
Avalonia I hate you
IsaacMarovitz Oct 23, 2023
48d5bbf
Confirmation dialgoues
IsaacMarovitz Oct 23, 2023
c910c11
Allow selecting multiple folders
IsaacMarovitz Oct 24, 2023
fc8f819
Add back secondary folder
IsaacMarovitz Jan 11, 2024
a986fe3
Search both paths
IsaacMarovitz Jan 11, 2024
e0acdc4
Fix formatting
IsaacMarovitz Jan 11, 2024
0bae0d1
Add custom refresh interval target
Sep 22, 2023
4089ba9
revise naming, UX to conform closer to legacy
Oct 8, 2023
e6916ea
move setting to 'Hacks', tweak UI and tooltips accordingly
Oct 8, 2023
30552cc
Rename to VSyncMode internally, code cleanup
Jan 13, 2024
fc52e4f
Turn from Window -> Dialog
IsaacMarovitz Oct 30, 2023
793f830
Match cheats heading to other managers
IsaacMarovitz Oct 30, 2023
09214d3
Respect MVVM
IsaacMarovitz Jan 16, 2024
a665f92
initial Layout
IsaacMarovitz Oct 30, 2023
d4622c5
Tweak layout
IsaacMarovitz Oct 30, 2023
254e074
Format
IsaacMarovitz Jan 16, 2024
e5817a2
Fix Push Descriptors
riperiperi Jan 19, 2024
d76a023
Use push descriptor templates
riperiperi Jan 20, 2024
29a1356
Use reserved bindings
riperiperi Jan 20, 2024
61b66fd
Formatting
riperiperi Jan 20, 2024
961e73f
Vulkan: Enumerate Query Pool properly
riperiperi Jan 22, 2024
3368763
Merge pull request #6 from IsaacMarovitz/mod-manager
ryzendew Jan 23, 2024
d4954a2
Merge pull request #7 from IsaacMarovitz/cheat-refactor
ryzendew Jan 23, 2024
b751ead
Merge pull request #8 from jcm93/refreshinterval
ryzendew Jan 23, 2024
bd83221
Vulkan: Use staging buffer for temporary constants
riperiperi Jan 23, 2024
1b17ecc
Use temporary buffer for ConvertIndexBufferIndirect
riperiperi Jan 23, 2024
f2b895f
Simplify alignment passing for now
riperiperi Jan 24, 2024
5dcad74
Merge pull request #10 from riperiperi/perf/query-queue
ryzendew Jan 24, 2024
f5e120d
Merge pull request #11 from riperiperi/perf/push-descriptor
ryzendew Jan 24, 2024
a84a042
Merge pull request #12 from riperiperi/perf/helper-shader-staging
ryzendew Jan 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Dont deseralise ModMetadata several times
IsaacMarovitz committed Jan 13, 2024
commit 6dc8355edb712c98585cc45a1825c1df7ae84137
18 changes: 3 additions & 15 deletions src/Ryujinx.HLE/HOS/ModLoader.cs
Original file line number Diff line number Diff line change
@@ -160,22 +160,10 @@ private static string EnsureBaseDirStructure(string modsBasePath)
private static DirectoryInfo FindTitleDir(DirectoryInfo contentsDir, string titleId)
=> contentsDir.EnumerateDirectories(titleId, _dirEnumOptions).FirstOrDefault();

private static void AddModsFromDirectory(ModCache mods, DirectoryInfo dir, string titleId)
private static void AddModsFromDirectory(ModCache mods, DirectoryInfo dir, ModMetadata modMetadata)
{
System.Text.StringBuilder types = new();

string modJsonPath = Path.Combine(AppDataManager.GamesDirPath, titleId, "mods.json");
ModMetadata modMetadata = new();

try
{
modMetadata = JsonHelper.DeserializeFromFile(modJsonPath, _serializerContext.ModMetadata);
}
catch
{
Logger.Warning?.Print(LogClass.ModLoader, $"Failed to deserialize mod data for {titleId} at {modJsonPath}");
}

foreach (var modDir in dir.EnumerateDirectories())
{
types.Clear();
@@ -223,7 +211,7 @@ private static void AddModsFromDirectory(ModCache mods, DirectoryInfo dir, strin
}
else
{
AddModsFromDirectory(mods, modDir, titleId);
AddModsFromDirectory(mods, modDir, modMetadata);
}

if (types.Length > 0)
@@ -342,7 +330,7 @@ private static void QueryTitleDir(ModCache mods, DirectoryInfo titleDir, ulong t
mods.ExefsContainers.Add(new Mod<FileInfo>($"<{titleDir.Name} ExeFs>", fsFile, enabled));
}

AddModsFromDirectory(mods, titleDir, titleDir.Name);
AddModsFromDirectory(mods, titleDir, modMetadata);
}

public static void QueryContentsDir(ModCache mods, DirectoryInfo contentsDir, ulong titleId)