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.

Sign up for GitHub

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

Jump to bottom

Avoid performing GL occlusion queries on Veldrid #5600

Merged
merged 3 commits into from
Dec 19, 2022
Merged

Avoid performing GL occlusion queries on Veldrid #5600

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2224b2
Hide front-to-back test scene on Veldrid
frenzibyte Oct 24, 2022
eb84b40
Remove duplicate using directive
frenzibyte Dec 19, 2022
8f0aa60
Merge branch 'master' into avoid-gl-occlusion-query-on-veldrid
smoogipoo Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
54 changes: 42 additions & 12 deletions osu.Framework.Tests/Visual/Containers/TestSceneFrontToBack.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
using osu.Framework.Graphics.Textures;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.Rendering;
using osu.Framework.Graphics.Veldrid;

namespace osu.Framework.Tests.Visual.Containers
{
Expand Down Expand Up @@ -45,19 +46,9 @@ private void load(FrameworkDebugConfigManager debugConfig, TextureStore store, I
var edgeClampedTexture = store.Get(@"sample-texture", WrapMode.ClampToEdge, WrapMode.ClampToEdge);
var borderClampedTexture = store.Get(@"sample-texture", WrapMode.ClampToBorder, WrapMode.ClampToBorder);

AddStep("add sprites", () => addMoreDrawables(texture, new RectangleF(0, 0, 1, 1)));
AddStep("add sprites with shrink", () => addMoreDrawables(texture, new RectangleF(0.25f, 0.25f, 0.5f, 0.5f)));
AddStep("add sprites with repeat", () => addMoreDrawables(repeatedTexture, new RectangleF(0.25f, 0.25f, 0.5f, 0.5f)));
AddStep("add sprites with edge clamp", () => addMoreDrawables(edgeClampedTexture, new RectangleF(0.25f, 0.25f, 0.5f, 0.5f)));
AddStep("add sprites with border clamp", () => addMoreDrawables(borderClampedTexture, new RectangleF(0.25f, 0.25f, 0.5f, 0.5f)));
AddStep("add boxes", () => addMoreDrawables(renderer.WhitePixel, new RectangleF(0, 0, 1, 1)));
AddToggleStep("disable front to back", val =>
{
debugConfig.SetValue(DebugSetting.BypassFrontToBackPass, val);
Invalidate(Invalidation.DrawNode); // reset counts
});
Container content;

Add(new Container
Add(content = new Container
{
AutoSizeAxes = Axes.Both,
Depth = float.NegativeInfinity,
Expand Down Expand Up @@ -86,6 +77,33 @@ private void load(FrameworkDebugConfigManager debugConfig, TextureStore store, I
},
}
});

if (renderer is VeldridRenderer)
{
content.Hide();

Add(new SpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Text = "Veldrid currently has no support for occlusion queries.",
Font = FontUsage.Default.With(size: 32),
});

return;
}

AddStep("add sprites", () => addMoreDrawables(texture, new RectangleF(0, 0, 1, 1)));
AddStep("add sprites with shrink", () => addMoreDrawables(texture, new RectangleF(0.25f, 0.25f, 0.5f, 0.5f)));
AddStep("add sprites with repeat", () => addMoreDrawables(repeatedTexture, new RectangleF(0.25f, 0.25f, 0.5f, 0.5f)));
AddStep("add sprites with edge clamp", () => addMoreDrawables(edgeClampedTexture, new RectangleF(0.25f, 0.25f, 0.5f, 0.5f)));
AddStep("add sprites with border clamp", () => addMoreDrawables(borderClampedTexture, new RectangleF(0.25f, 0.25f, 0.5f, 0.5f)));
AddStep("add boxes", () => addMoreDrawables(renderer.WhitePixel, new RectangleF(0, 0, 1, 1)));
AddToggleStep("disable front to back", val =>
{
debugConfig.SetValue(DebugSetting.BypassFrontToBackPass, val);
Invalidate(Invalidation.DrawNode); // reset counts
});
}

protected override void Update()
Expand Down Expand Up @@ -135,6 +153,12 @@ public QueryingCompositeDrawableDrawNode(CompositeDrawable source)

internal override void DrawOpaqueInteriorSubTree(IRenderer renderer, DepthValue depthValue)
{
if (renderer is VeldridRenderer)
{
base.DrawOpaqueInteriorSubTree(renderer, depthValue);
return;
}

startQuery();
base.DrawOpaqueInteriorSubTree(renderer, depthValue);
DrawOpaqueInteriorSubTreeSamples = endQuery();
Expand All @@ -149,6 +173,12 @@ public override void ApplyState()

public override void Draw(IRenderer renderer)
{
if (renderer is VeldridRenderer)
{
base.Draw(renderer);
return;
}

startQuery();
base.Draw(renderer);
DrawSamples = endQuery();
Expand Down