9aaf97e785
This reverts ceec3bc4. Two independent reasons, either sufficient.
The rendering regression. The slice deleted TextRenderGlStateScope, which
saved GL_MULTISAMPLE and GL_SAMPLE_ALPHA_TO_COVERAGE on entry, disabled them
for the text pass, and restored them on exit (TextRenderGlStateScope.cs:111-112
and 153-154 at the parent commit). Its replacement bakes that state into the
text pipeline but nothing restores it, and GlGpuPassEncoder.Dispose does not
either. Every world renderer is still raw GL at this point in the campaign, so
from the first UI frame onward the world drew with multisampling disabled.
The offline pixel gate caught it: 1,791 of 563,200 compared pixels differed,
0.318% against a 0.001 threshold. The commit message attributed this to
wall-clock-driven ambient animation shifting phase, and committed through the
failure. That explanation does not survive its own control: capturing twice at
the reverted-to commit differs by 19 pixels and twice at the slice's own commit
by 8, while base-versus-head differs by 1,791 - a 224x gap that no shared-noise
source explains. An amplified difference image settles it visually: the changed
pixels are the silhouette edges of every tree, building and rock, with terrain
interiors, water and the entire UI untouched. That is the signature of losing
edge antialiasing, not of animated sprites.
This is the exact failure mode two existing memory notes already warn about -
a mid-frame renderer must set every GL state it uses rather than inherit it,
and issue #52's lesson that a rendering migration must audit per-pass GL state
before declaring itself done.
The scope. The brief was three small leaf renderers plus additive frame-
lifecycle wiring, roughly ten files. The commit changed 334 files with 3,665
insertions and 3,845 deletions, including 323 public-to-internal visibility
conversions across the App assembly, 55 test files, two retired conformance
tests, and a self-described temporary escape hatch for bridging raw-GL viewport
textures. Even without the regression, that is not separable into the part
worth keeping and the part worth dropping.
Reverting rather than patching because the good work here - the RHI frame
lifecycle wiring and a genuine render-state-cache staleness fix - is small
enough to redo cleanly against a tightened spec, while untangling it from 300+
files of unrelated churn is not.
Post-revert: Release build clean, App suite back to 3,843 passed / 3 skipped,
offline pixel gate passing at 19 differing pixels.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
103 lines
3.9 KiB
C#
103 lines
3.9 KiB
C#
using System;
|
|
using Silk.NET.OpenGL;
|
|
|
|
namespace AcDream.App.Rendering;
|
|
|
|
/// <summary>
|
|
/// Two persistent GL sampler objects (Repeat + ClampToEdge) created once
|
|
/// per GL context. Renderers <see cref="GL.BindSampler"/> the appropriate
|
|
/// one to a texture unit instead of mutating per-texture
|
|
/// <c>GL_TEXTURE_WRAP_S/T</c> state — sampler state overrides the
|
|
/// texture's own wrap parameters, so two renderers can share the same
|
|
/// texture handle but sample it with different wrap modes safely.
|
|
///
|
|
/// <para>
|
|
/// Ported from
|
|
/// <c>references/WorldBuilder/Chorizite.OpenGLSDLBackend/OpenGLGraphicsDevice.cs:115-132</c>.
|
|
/// Filter modes match <see cref="TextureCache"/>'s upload defaults
|
|
/// (Linear / Linear, no mipmaps) so binding either sampler doesn't
|
|
/// change the visual filtering behavior — only the wrap behavior at
|
|
/// UVs outside [0, 1].
|
|
/// </para>
|
|
///
|
|
/// <para>
|
|
/// Lifetime: created once at GL init, disposed with the GL context.
|
|
/// Anything that binds a sampler MUST unbind it (<c>BindSampler(unit, 0)</c>)
|
|
/// before yielding to a renderer that doesn't use samplers, otherwise
|
|
/// the bound sampler's wrap mode will silently override that renderer's
|
|
/// per-texture wrap state.
|
|
/// </para>
|
|
/// </summary>
|
|
public sealed class SamplerCache : IDisposable
|
|
{
|
|
private readonly GL _gl;
|
|
private readonly ResourceCleanupGroup _resources;
|
|
|
|
/// <summary>Sampler with WrapS = WrapT = Repeat. The default for textures uploaded by <see cref="TextureCache"/>.</summary>
|
|
public uint Wrap { get; }
|
|
|
|
/// <summary>Sampler with WrapS = WrapT = ClampToEdge. Used by sky meshes whose authored UVs are strictly in [0, 1] to avoid bilinear-filter bleed at seam edges.</summary>
|
|
public uint Clamp { get; }
|
|
|
|
public SamplerCache(GL gl)
|
|
{
|
|
_gl = gl ?? throw new ArgumentNullException(nameof(gl));
|
|
var resources = new ResourceCleanupGroup();
|
|
uint wrap = 0;
|
|
uint clamp = 0;
|
|
try
|
|
{
|
|
wrap = GlResourceCommand.CreateName(
|
|
_gl,
|
|
"repeat sampler",
|
|
_gl.GenSampler,
|
|
_gl.DeleteSampler);
|
|
uint ownedWrap = wrap;
|
|
resources.Add(
|
|
"repeat sampler",
|
|
() => GlResourceCommand.Execute(
|
|
_gl,
|
|
$"delete repeat sampler {ownedWrap}",
|
|
() => _gl.DeleteSampler(ownedWrap)));
|
|
Configure(wrap, TextureWrapMode.Repeat, "repeat sampler");
|
|
|
|
clamp = GlResourceCommand.CreateName(
|
|
_gl,
|
|
"clamp sampler",
|
|
_gl.GenSampler,
|
|
_gl.DeleteSampler);
|
|
uint ownedClamp = clamp;
|
|
resources.Add(
|
|
"clamp sampler",
|
|
() => GlResourceCommand.Execute(
|
|
_gl,
|
|
$"delete clamp sampler {ownedClamp}",
|
|
() => _gl.DeleteSampler(ownedClamp)));
|
|
Configure(clamp, TextureWrapMode.ClampToEdge, "clamp sampler");
|
|
}
|
|
catch (Exception constructionFailure)
|
|
{
|
|
resources.RollbackConstructionAndThrow(
|
|
"SamplerCache construction failed and its sampler prefix did not cleanly roll back.",
|
|
constructionFailure);
|
|
}
|
|
|
|
Wrap = wrap;
|
|
Clamp = clamp;
|
|
_resources = resources;
|
|
}
|
|
|
|
private void Configure(uint sampler, TextureWrapMode wrap, string name) =>
|
|
GlResourceCommand.Execute(_gl, $"configure {name}", () =>
|
|
{
|
|
_gl.SamplerParameter(sampler, SamplerParameterI.WrapS, (int)wrap);
|
|
_gl.SamplerParameter(sampler, SamplerParameterI.WrapT, (int)wrap);
|
|
_gl.SamplerParameter(sampler, SamplerParameterI.MinFilter, (int)TextureMinFilter.Linear);
|
|
_gl.SamplerParameter(sampler, SamplerParameterI.MagFilter, (int)TextureMagFilter.Linear);
|
|
});
|
|
|
|
public void Dispose()
|
|
{
|
|
_resources.RetryCleanup();
|
|
}
|
|
}
|