Skip to content

Dispose VBOs created during mipmap generation #5755

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

Open
smoogipoo wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Dispose VBOs created during mipmap generation #5755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6c1904
Dispose VBOs created during mipmap generation
smoogipoo Apr 26, 2023
93a3e8b
Merge branch 'master' into dispose-mipmap-vbo
peppy Apr 26, 2023
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
2 changes: 1 addition & 1 deletion osu.Framework/Graphics/OpenGL/Textures/GLTexture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ public unsafe bool Upload()
int count = Math.Min(uploadedRegions.Count, IRenderer.MAX_QUADS);

// Generate quad buffer that will hold all the updated regions
var quadBuffer = new GLQuadBuffer<UncolouredVertex2D>(Renderer, count, BufferUsageHint.StreamDraw);
using var quadBuffer = new GLQuadBuffer<UncolouredVertex2D>(Renderer, count, BufferUsageHint.StreamDraw);

// Compute mipmap by iteratively blitting coarser and coarser versions of the updated regions
for (int level = 1; level < IRenderer.MAX_MIPMAP_LEVELS + 1 && (width > 1 || height > 1); ++level)
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework/Graphics/Veldrid/Buffers/VeldridVertexBuffer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

namespace osu.Framework.Graphics.Veldrid.Buffers
{
internal abstract class VeldridVertexBuffer<T> : IVertexBuffer
internal abstract class VeldridVertexBuffer<T> : IVertexBuffer, IDisposable
where T : unmanaged, IEquatable<T>, IVertex
{
protected static readonly int STRIDE = VeldridVertexUtils<DepthWrappingVertex<T>>.STRIDE;
Expand Down
5 changes: 3 additions & 2 deletions osu.Framework/Graphics/Veldrid/Textures/VeldridTexture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,8 @@ public bool Upload()
Renderer.BindTexture(this);
Renderer.GetMipmapShader().Bind();

using var samplingTexture = Renderer.Factory.CreateTexture(TextureDescription.Texture2D((uint)Width, (uint)Height, resources!.Texture.MipLevels, 1, resources!.Texture.Format, TextureUsage.Sampled));
using var samplingTexture =
Renderer.Factory.CreateTexture(TextureDescription.Texture2D((uint)Width, (uint)Height, resources!.Texture.MipLevels, 1, resources!.Texture.Format, TextureUsage.Sampled));
using var samplingResources = new VeldridTextureResources(samplingTexture, null);

while (uploadedRegions.Count > 0)
Expand All @@ -283,7 +284,7 @@ public bool Upload()
int count = Math.Min(uploadedRegions.Count, IRenderer.MAX_QUADS);

// Generate quad buffer that will hold all the updated regions
var quadBuffer = new VeldridQuadBuffer<UncolouredVertex2D>(Renderer, count, BufferUsage.Dynamic);
using var quadBuffer = new VeldridQuadBuffer<UncolouredVertex2D>(Renderer, count, BufferUsage.Dynamic);

// Compute mipmap by iteratively blitting coarser and coarser versions of the updated regions
for (int level = 1; level < IRenderer.MAX_MIPMAP_LEVELS + 1 && (width > 1 || height > 1); ++level)
Expand Down