HRiggs/Performance-Fish
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for rare texture loading issues

Browse Source 
And an attempt to try prevent rare reported issues with prepatch loading
This commit is contained in:
bbradson
2023-06-13 19:43:02 +02:00
parent 76c0f7a371
commit 3d8c8e4d29
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
1.4/Assemblies/PerformanceFish.dll
BIN
View File
Binary file not shown.
1.4/Assemblies/PerformanceFish.pdb
BIN
View File
Binary file not shown.
Source/PerformanceFish/DDSLoader.cs
+1 -1
View File
@@ -185,5 +185,5 @@ public static class DDSLoader
}
private static bool FourCcEquals(IList<byte> bytes, string s)
=> bytes[0] == s[0] && bytes[1] == s[1] && bytes[2] == s[2] && bytes[3] == s[3];
=> bytes.Count >= 4 && bytes[0] == s[0] && bytes[1] == s[1] && bytes[2] == s[2] && bytes[3] == s[3];
}
Source/PerformanceFish/Prepatching/PrepatchManager.cs
+5 -2
View File
@@ -100,8 +100,11 @@ public static class PrepatchManager
{
var types = module.Types;
Parallel.For(0, types.Count, // about 20% faster than sequential for in testing
i => ModifyAllMethodsIn(types[i]));
// Parallel.For(0, types.Count, // about 20% faster than sequential for in testing
// i => ModifyAllMethodsIn(types[i]));
for (var i = 0; i < types.Count; i++)
ModifyAllMethodsIn(types[i]);
}
private static void ModifyAllMethodsIn(TypeDefinition type)
Source/PerformanceFish/TextureLoadingPatches.cs
+5 -4
View File
@@ -41,7 +41,7 @@ public class TextureLoadingPatches : ClassWithFishPrepatches
public static bool Prefix<T>(VirtualFile file, ref LoadedContentItem<T>? __result) where T : class
{
if (typeof(T) != typeof(Texture2D)
|| GetFileInfo(file).Extension.Equals(DDS_EXTENSION, StringComparison.OrdinalIgnoreCase)
|| (GetFileInfo(file)?.Extension.Equals(DDS_EXTENSION, StringComparison.OrdinalIgnoreCase) ?? true)
|| !File.Exists(Path.ChangeExtension(file.FullPath, DDS_EXTENSION)))
{
return true;
@@ -71,12 +71,12 @@ public class TextureLoadingPatches : ClassWithFishPrepatches
Texture2D? texture2D;
var fileInfo = GetFileInfo(file);
var isDds = fileInfo.Extension.Equals(DDS_EXTENSION, StringComparison.OrdinalIgnoreCase);
var isDds = fileInfo?.Extension.Equals(DDS_EXTENSION, StringComparison.OrdinalIgnoreCase) ?? false;
var hasStoredMipMaps = false;
if (isDds)
{
texture2D = DDSLoader.LoadDDS(fileInfo.OpenRead(), out hasStoredMipMaps);
texture2D = DDSLoader.LoadDDS(fileInfo!.OpenRead(), out hasStoredMipMaps);
if (!DDSLoader.error.NullOrEmpty())
LogDDSLoadingError(file);
@@ -143,7 +143,8 @@ public class TextureLoadingPatches : ClassWithFishPrepatches
=> Log.Warning($"DDS error at '{file.FullPath}': {DDSLoader.error}");
}
public static FileInfo GetFileInfo(VirtualFile file) => ((FilesystemFile)file).fileInfo;
public static FileInfo? GetFileInfo(VirtualFile file)
=> file is FilesystemFile systemFile ? systemFile.fileInfo : null;
public class GetAllFilesForModPatch : FishPrepatch
{