diff --git a/osu.Android.props b/osu.Android.props
index a93b450ebb..3ede0b85da 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -11,7 +11,7 @@
manifestmerger.jar
-
+
diff --git a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
index f8248e88bb..6639b6dd68 100644
--- a/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
+++ b/osu.Game.Tests/Rulesets/TestSceneDrawableRulesetDependencies.cs
@@ -164,7 +164,7 @@ namespace osu.Game.Tests.Rulesets
this.parentManager = parentManager;
}
- public override byte[] LoadRaw(string name) => parentManager.LoadRaw(name);
+ public override byte[] GetRawData(string fileName) => parentManager.GetRawData(fileName);
public bool IsDisposed { get; private set; }
diff --git a/osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs b/osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs
index a5a83d7231..585a3f95e7 100644
--- a/osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs
+++ b/osu.Game.Tests/Testing/TestSceneRulesetDependencies.cs
@@ -51,8 +51,8 @@ namespace osu.Game.Tests.Testing
{
AddStep("ruleset shaders retrieved without error", () =>
{
- Dependencies.Get().LoadRaw(@"sh_TestVertex.vs");
- Dependencies.Get().LoadRaw(@"sh_TestFragment.fs");
+ Dependencies.Get().GetRawData(@"sh_TestVertex.vs");
+ Dependencies.Get().GetRawData(@"sh_TestFragment.fs");
});
}
diff --git a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
index 76d84000f1..e34289c968 100644
--- a/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
+++ b/osu.Game/Rulesets/UI/DrawableRulesetDependencies.cs
@@ -206,27 +206,11 @@ namespace osu.Game.Rulesets.UI
this.parent = parent;
}
- // When the debugger is attached, exceptions are expensive.
- // Manually work around this by caching failed lookups and falling back straight to parent.
- private readonly HashSet<(string, string)> failedLookups = new HashSet<(string, string)>();
+ public override IShader? GetCachedShader(string vertex, string fragment) => base.GetCachedShader(vertex, fragment) ?? parent.GetCachedShader(vertex, fragment);
- public override IShader Load(string vertex, string fragment)
- {
- if (!failedLookups.Contains((vertex, fragment)))
- {
- try
- {
- return base.Load(vertex, fragment);
- }
- catch
- {
- // Shader lookup is very non-standard. Rather than returning null on missing shaders, exceptions are thrown.
- failedLookups.Add((vertex, fragment));
- }
- }
+ public override IShaderPart? GetCachedShaderPart(string name) => base.GetCachedShaderPart(name) ?? parent.GetCachedShaderPart(name);
- return parent.Load(vertex, fragment);
- }
+ public override byte[]? GetRawData(string fileName) => base.GetRawData(fileName) ?? parent.GetRawData(fileName);
}
}
}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 578b8512e7..085f78b27b 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/osu.iOS.props b/osu.iOS.props
index 3862ddacdb..127994c670 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -16,6 +16,6 @@
iossimulator-x64
-
+