feat(render): Campaign V slice V6h — the Vulkan composition host
ACDREAM_RENDER_BACKEND=vulkan now runs the real GameWindow composition rather
than a second main(). All nine phases execute: DAT load, streaming, camera,
entity table, session, and the real retained UiHost drawing through the RHI.
No world renderers — they are raw GL until V4t and the world arm behind it.
The offline log is the client's own (acdream.pak opened, 6266 spells, Region
0x13000000, "loading world view centered on 0xA9B4FFFF", fourteen retail
LayoutDesc lines, streaming radii), and the captured frame is the retail
retained UI: vitals, combat/spell bar with DAT scarab icons, the nine-slot
toolbar, chat with tabs and Send, radar/compass with dat-font glyphs. Sampled
against the GL capture the widgets agree — chat interior RGBA (25,24,27,158)
vs (22,21,23,158), vitals bar (117,1,0) and toolbar slot (0,11,17) identical.
Three seams, as §5.5.9 specified:
1. Platform acquisition — already generic — publishes GameWindowGraphics
instead of a bare GL. Phases that still speak raw GL read Graphics.Gl and
take their Vulkan arm when it is null; each branch names the slice that
removes it.
2. VulkanHostInputCameraCompositionFactory is a new file and the whole of the
Phase-1 fork: four graphics members differ, input/camera/pointer delegate.
The default factory is chosen inside the phase from the platform result.
HostInputCameraResult gained backend-neutral Retirement and FrameSlots.
3. The frame root forks on one condition. The GL world-scene assembly is
unchanged, wrapped in `if (gl is not null)`; the Vulkan arm's graph is one
backbuffer clear pass computing the same RenderFrameFoundation from the same
clock and weather owners, then private presentation over it.
§5.5.9's three TextureCache couplings are unpicked: the constructor takes GL?
and rejects bindless without one, world entry points route through a Gl
property that throws naming V4t, and the (GlGpuTexture) VRAM-accounting cast
became a backend test. That cast's stated reason — DrawSprite's texture-unit
binding — was already stale, deleted at V6d.
VulkanBringUpHost is reduced to the capability-probe harness it is named for:
the instance/surface/device/swapchain sequence moved into VulkanGraphicsContext,
which the composition host and the harness now share. It is reached only with
ACDREAM_VULKAN_PROBE=1.
One latent Vulkan defect surfaced and is fixed here. The first composition-host
frame died with ErrorDeviceLost; validation named VUID-vkCmdDraw-None-08600 —
descriptor set 2 never bound. VulkanGpuPassEncoder bound sets 0/1/2 only as a
side effect of BindStorageBuffer/BindUniformBuffer, so a pass sampling the
texture table while binding no buffer — every retained-UI and debug-line pass —
drew with the table unbound. It survived V6c-V6g because the bring-up host
always drew VulkanRhiScene first and the UI pass inherited its binds; the
composition host has no 3-D scene. The fix is one line in the encoder's
constructor beside the viewport and scissor defaults, which exist for exactly
the same reason: a pass opens with complete binding state rather than depending
on what preceded it.
Gates: strict GL offline pixel gate against 46d893f7 measures 1.24e-05 (7 of
563,200 pixels), inside the documented 15-23 px / 4.1e-05 band, so GL behaviour
did not move. App tests 4,075/3 skips; complete Release suite 9,138/5 skips.
One full Vulkan run with VK_LAYER_KHRONOS_validation: zero errors, zero
warnings. Both Vulkan runs converged the ownership ledger — no [shutdown]
diagnostic on either stream. The reduced probe harness presented 34,811
validation-clean frames.
No divergence-register row: GL is the shipping backend and the pixel gate proves
it unmoved; the Vulkan arm is not a retail deviation but a backend under
construction.
Next is V4t, the texture stack, which the world arm cannot be written without.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Erik
parent
46d893f7c3
commit
b16f820643
29 changed files with 2292 additions and 997 deletions
|
|
@ -28,20 +28,30 @@ internal sealed record WorldTerrainBuildContext(
|
|||
TerrainBlendingContext Blending,
|
||||
ConcurrentDictionary<uint, SurfaceInfo> SurfaceCache);
|
||||
|
||||
/// <summary>
|
||||
/// The render foundation the later phases build on.
|
||||
///
|
||||
/// <para>Campaign V slice V6h made every raw-GL member nullable. They are all
|
||||
/// present on GL and all absent on Vulkan, because the world renderers that own
|
||||
/// them are still raw GL until slices V4t/V4c/V4d land the Vulkan world arm.
|
||||
/// What survives on both backends is exactly the RHI-ported set — the texture
|
||||
/// cache's UI path, the debug font, the text renderer and the debug lines — plus
|
||||
/// the backend-neutral residency ledger and shader directory.</para>
|
||||
/// </summary>
|
||||
internal sealed record WorldRenderFoundation(
|
||||
string ShadersDirectory,
|
||||
BindlessSupport Bindless,
|
||||
TerrainAtlas TerrainAtlas,
|
||||
Shader TerrainShader,
|
||||
SceneLightingUboBinding SceneLighting,
|
||||
BindlessSupport? Bindless,
|
||||
TerrainAtlas? TerrainAtlas,
|
||||
Shader? TerrainShader,
|
||||
SceneLightingUboBinding? SceneLighting,
|
||||
DebugLineRenderer DebugLines,
|
||||
BitmapFont? DebugFont,
|
||||
TextRenderer? TextRenderer,
|
||||
TerrainModernRenderer Terrain,
|
||||
Shader MeshShader,
|
||||
WbMeshAdapter MeshAdapter,
|
||||
TerrainModernRenderer? Terrain,
|
||||
Shader? MeshShader,
|
||||
WbMeshAdapter? MeshAdapter,
|
||||
TextureCache TextureCache,
|
||||
SamplerCache Samplers,
|
||||
SamplerCache? Samplers,
|
||||
ResidencyManager Residency);
|
||||
|
||||
internal sealed record WorldRenderResult(
|
||||
|
|
@ -107,10 +117,18 @@ internal interface IWorldRenderCompositionFactory
|
|||
Shader shader,
|
||||
TerrainAtlas atlas,
|
||||
IGpuResourceRetirementQueue retirement);
|
||||
/// <param name="atlas">
|
||||
/// The built terrain atlas, or null on a backend that has none. The atlas is
|
||||
/// where the blending layer/T-code tables come from, so a null one yields an
|
||||
/// empty <see cref="TerrainBlendingContext"/>: streaming still builds real
|
||||
/// landblock heightfields and collision, but every surface resolves to
|
||||
/// <see cref="SurfaceInfo.None"/> because nothing is going to sample it.
|
||||
/// Campaign V slice V4t builds those tables without GL.
|
||||
/// </param>
|
||||
WorldTerrainBuildContext CreateTerrainBuildContext(
|
||||
uint initialCenterLandblockId,
|
||||
float[] heightTable,
|
||||
TerrainAtlas atlas);
|
||||
TerrainAtlas? atlas);
|
||||
Shader CreateMeshShader(GL gl, string shadersDirectory);
|
||||
WbMeshAdapter CreateMeshAdapter(
|
||||
GL gl,
|
||||
|
|
@ -120,16 +138,16 @@ internal interface IWorldRenderCompositionFactory
|
|||
IGpuResourceRetirementQueue retirement,
|
||||
ResidencyBudgetOptions budgets);
|
||||
TextureCache CreateTextureCache(
|
||||
GL gl,
|
||||
GL? gl,
|
||||
AcDream.App.Rendering.Gpu.IGpuDevice device,
|
||||
IDatReaderWriter dats,
|
||||
BindlessSupport bindless,
|
||||
BindlessSupport? bindless,
|
||||
IGpuResourceRetirementQueue retirement,
|
||||
string diagnosticsDirectory,
|
||||
ResidencyBudgetOptions budgets);
|
||||
void RegisterResidencySources(
|
||||
ResidencyManager manager,
|
||||
WbMeshAdapter meshes,
|
||||
WbMeshAdapter? meshes,
|
||||
TextureCache textures,
|
||||
IPreparedAssetSource preparedAssets,
|
||||
IAnimationLoader animations,
|
||||
|
|
@ -253,10 +271,29 @@ internal sealed class RetailWorldRenderCompositionFactory
|
|||
public WorldTerrainBuildContext CreateTerrainBuildContext(
|
||||
uint initialCenterLandblockId,
|
||||
float[] heightTable,
|
||||
TerrainAtlas atlas)
|
||||
TerrainAtlas? atlas)
|
||||
{
|
||||
int centerX = (int)((initialCenterLandblockId >> 24) & 0xFFu);
|
||||
int centerY = (int)((initialCenterLandblockId >> 16) & 0xFFu);
|
||||
if (atlas is null)
|
||||
{
|
||||
return new WorldTerrainBuildContext(
|
||||
initialCenterLandblockId,
|
||||
centerX,
|
||||
centerY,
|
||||
heightTable,
|
||||
new TerrainBlendingContext(
|
||||
TerrainTypeToLayer: new Dictionary<uint, byte>(),
|
||||
RoadLayer: SurfaceInfo.None,
|
||||
CornerAlphaLayers: [],
|
||||
SideAlphaLayers: [],
|
||||
RoadAlphaLayers: [],
|
||||
CornerAlphaTCodes: [],
|
||||
SideAlphaTCodes: [],
|
||||
RoadAlphaRCodes: []),
|
||||
new ConcurrentDictionary<uint, SurfaceInfo>());
|
||||
}
|
||||
|
||||
var layers = new Dictionary<uint, byte>(atlas.TerrainTypeToLayer.Count);
|
||||
foreach ((uint terrainType, uint layer) in atlas.TerrainTypeToLayer)
|
||||
layers[terrainType] = (byte)layer;
|
||||
|
|
@ -307,10 +344,10 @@ internal sealed class RetailWorldRenderCompositionFactory
|
|||
budgets);
|
||||
|
||||
public TextureCache CreateTextureCache(
|
||||
GL gl,
|
||||
GL? gl,
|
||||
AcDream.App.Rendering.Gpu.IGpuDevice device,
|
||||
IDatReaderWriter dats,
|
||||
BindlessSupport bindless,
|
||||
BindlessSupport? bindless,
|
||||
IGpuResourceRetirementQueue retirement,
|
||||
string diagnosticsDirectory,
|
||||
ResidencyBudgetOptions budgets) =>
|
||||
|
|
@ -325,13 +362,13 @@ internal sealed class RetailWorldRenderCompositionFactory
|
|||
|
||||
public void RegisterResidencySources(
|
||||
ResidencyManager manager,
|
||||
WbMeshAdapter meshes,
|
||||
WbMeshAdapter? meshes,
|
||||
TextureCache textures,
|
||||
IPreparedAssetSource preparedAssets,
|
||||
IAnimationLoader animations,
|
||||
DatSoundCache? audio)
|
||||
{
|
||||
meshes.RegisterResidencySources(manager);
|
||||
meshes?.RegisterResidencySources(manager);
|
||||
textures.RegisterResidencySources(manager);
|
||||
manager.RegisterDomainSource(new DelegateResidencyDomainSource(
|
||||
ResidencyDomain.PreparedPackage,
|
||||
|
|
@ -418,7 +455,7 @@ internal enum WorldRenderCompositionPoint
|
|||
/// </summary>
|
||||
internal sealed class WorldRenderCompositionPhase
|
||||
: IWorldRenderCompositionPhase<
|
||||
GameWindowPlatformResult<GL, IInputContext>,
|
||||
GameWindowPlatformResult<GameWindowGraphics, IInputContext>,
|
||||
ContentEffectsAudioResult,
|
||||
SettingsDevToolsResult,
|
||||
WorldRenderResult>
|
||||
|
|
@ -443,7 +480,7 @@ internal sealed class WorldRenderCompositionPhase
|
|||
}
|
||||
|
||||
public WorldRenderResult Compose(
|
||||
GameWindowPlatformResult<GL, IInputContext> platform,
|
||||
GameWindowPlatformResult<GameWindowGraphics, IInputContext> platform,
|
||||
ContentEffectsAudioResult content,
|
||||
SettingsDevToolsResult settings)
|
||||
{
|
||||
|
|
@ -454,10 +491,16 @@ internal sealed class WorldRenderCompositionPhase
|
|||
var scope = new CompositionAcquisitionScope();
|
||||
try
|
||||
{
|
||||
GL gl = platform.Graphics;
|
||||
// Campaign V slice V6h: null on a backend with no GL context. Every
|
||||
// world renderer below is still raw GL, so the Vulkan arm composes
|
||||
// the RHI-ported subset only — the texture cache's UI path, the
|
||||
// debug font, the text renderer, the debug lines — and leaves the
|
||||
// world absent until slices V4t/V4c/V4d land it.
|
||||
GL? gl = platform.Graphics.Gl;
|
||||
var residency = new ResidencyManager(
|
||||
_dependencies.ResidencyBudgets);
|
||||
_factory.InitializeGlState(gl);
|
||||
if (gl is not null)
|
||||
_factory.InitializeGlState(gl);
|
||||
Fault(WorldRenderCompositionPoint.GlStateInitialized);
|
||||
|
||||
WorldRegionData region = _factory.LoadRegion(content.Dats);
|
||||
|
|
@ -465,34 +508,44 @@ internal sealed class WorldRenderCompositionPhase
|
|||
_factory.InitializeEnvironment(_dependencies.Environment, region.Region);
|
||||
Fault(WorldRenderCompositionPoint.EnvironmentInitialized);
|
||||
|
||||
BindlessSupport bindless = _factory.RequireBindless(gl, _dependencies.Log);
|
||||
_publication.PublishBindlessSupport(bindless);
|
||||
BindlessSupport? bindless = gl is null
|
||||
? null
|
||||
: _factory.RequireBindless(gl, _dependencies.Log);
|
||||
if (bindless is not null)
|
||||
_publication.PublishBindlessSupport(bindless);
|
||||
Fault(WorldRenderCompositionPoint.BindlessPublished);
|
||||
|
||||
TerrainAtlas terrainAtlas = _factory.AcquireTerrainAtlas(
|
||||
_dependencies.RenderResources,
|
||||
gl,
|
||||
content.Dats,
|
||||
bindless);
|
||||
_factory.SetTerrainAnisotropic(
|
||||
terrainAtlas,
|
||||
settings.ResolvedQuality.AnisotropicLevel);
|
||||
TerrainAtlas? terrainAtlas = gl is null || bindless is null
|
||||
? null
|
||||
: _factory.AcquireTerrainAtlas(
|
||||
_dependencies.RenderResources,
|
||||
gl,
|
||||
content.Dats,
|
||||
bindless);
|
||||
if (terrainAtlas is not null)
|
||||
{
|
||||
_factory.SetTerrainAnisotropic(
|
||||
terrainAtlas,
|
||||
settings.ResolvedQuality.AnisotropicLevel);
|
||||
}
|
||||
Fault(WorldRenderCompositionPoint.TerrainAtlasAcquired);
|
||||
|
||||
string shadersDirectory = Path.Combine(
|
||||
AppContext.BaseDirectory,
|
||||
"Rendering",
|
||||
"Shaders");
|
||||
Shader terrainShader = AcquireAndPublish(
|
||||
Shader? terrainShader = AcquireAndPublishIf(
|
||||
gl is not null,
|
||||
scope,
|
||||
"terrain shader",
|
||||
() => _factory.CreateTerrainShader(gl, shadersDirectory),
|
||||
() => _factory.CreateTerrainShader(gl!, shadersDirectory),
|
||||
_publication.PublishTerrainShader,
|
||||
WorldRenderCompositionPoint.TerrainShaderPublished);
|
||||
SceneLightingUboBinding sceneLighting = AcquireAndPublish(
|
||||
SceneLightingUboBinding? sceneLighting = AcquireAndPublishIf(
|
||||
gl is not null,
|
||||
scope,
|
||||
"scene lighting",
|
||||
() => _factory.CreateSceneLighting(gl),
|
||||
() => _factory.CreateSceneLighting(gl!),
|
||||
_publication.PublishSceneLighting,
|
||||
WorldRenderCompositionPoint.SceneLightingPublished);
|
||||
DebugLineRenderer debugLines = AcquireAndPublish(
|
||||
|
|
@ -508,14 +561,15 @@ internal sealed class WorldRenderCompositionPhase
|
|||
(BitmapFont? debugFont, TextRenderer? textRenderer) =
|
||||
ComposeOptionalHudResources(scope, shadersDirectory);
|
||||
|
||||
TerrainModernRenderer terrain = AcquireAndPublish(
|
||||
TerrainModernRenderer? terrain = AcquireAndPublishIf(
|
||||
gl is not null,
|
||||
scope,
|
||||
"terrain renderer",
|
||||
() => _factory.CreateTerrain(
|
||||
gl,
|
||||
bindless,
|
||||
terrainShader,
|
||||
terrainAtlas,
|
||||
gl!,
|
||||
bindless!,
|
||||
terrainShader!,
|
||||
terrainAtlas!,
|
||||
_dependencies.ResourceRetirement),
|
||||
_publication.PublishTerrain,
|
||||
WorldRenderCompositionPoint.TerrainPublished);
|
||||
|
|
@ -531,18 +585,21 @@ internal sealed class WorldRenderCompositionPhase
|
|||
terrainBuild.SurfaceCache);
|
||||
Fault(WorldRenderCompositionPoint.TerrainBuildStatePublished);
|
||||
|
||||
Shader meshShader = AcquireAndPublish(
|
||||
Shader? meshShader = AcquireAndPublishIf(
|
||||
gl is not null,
|
||||
scope,
|
||||
"mesh shader",
|
||||
() => _factory.CreateMeshShader(gl, shadersDirectory),
|
||||
() => _factory.CreateMeshShader(gl!, shadersDirectory),
|
||||
_publication.PublishMeshShader,
|
||||
WorldRenderCompositionPoint.MeshShaderPublished);
|
||||
_dependencies.Log("[N.5] mesh_modern shader loaded");
|
||||
WbMeshAdapter meshAdapter = AcquireAndPublish(
|
||||
if (meshShader is not null)
|
||||
_dependencies.Log("[N.5] mesh_modern shader loaded");
|
||||
WbMeshAdapter? meshAdapter = AcquireAndPublishIf(
|
||||
gl is not null,
|
||||
scope,
|
||||
"WB mesh adapter",
|
||||
() => _factory.CreateMeshAdapter(
|
||||
gl,
|
||||
gl!,
|
||||
_dependencies.GpuDevice,
|
||||
content.Dats,
|
||||
content.PreparedAssets,
|
||||
|
|
@ -563,10 +620,11 @@ internal sealed class WorldRenderCompositionPhase
|
|||
residency.Budgets),
|
||||
_publication.PublishTextureCache,
|
||||
WorldRenderCompositionPoint.TextureCachePublished);
|
||||
SamplerCache samplers = AcquireAndPublish(
|
||||
SamplerCache? samplers = AcquireAndPublishIf(
|
||||
gl is not null,
|
||||
scope,
|
||||
"sampler cache",
|
||||
() => _factory.CreateSamplerCache(gl),
|
||||
() => _factory.CreateSamplerCache(gl!),
|
||||
_publication.PublishSamplerCache,
|
||||
WorldRenderCompositionPoint.SamplerCachePublished);
|
||||
_factory.RegisterResidencySources(
|
||||
|
|
@ -579,8 +637,11 @@ internal sealed class WorldRenderCompositionPhase
|
|||
|
||||
scope.Complete();
|
||||
_dependencies.Log(
|
||||
"[N.4+N.5] WB foundation + modern path active — " +
|
||||
"routing all content through ObjectMeshManager.");
|
||||
meshAdapter is not null
|
||||
? "[N.4+N.5] WB foundation + modern path active — " +
|
||||
"routing all content through ObjectMeshManager."
|
||||
: "[V6h] Vulkan composition host — RHI foundation active " +
|
||||
"(retained UI, text, debug lines); no world renderers.");
|
||||
return new WorldRenderResult(
|
||||
terrainBuild,
|
||||
new WorldRenderFoundation(
|
||||
|
|
@ -659,6 +720,27 @@ internal sealed class WorldRenderCompositionPhase
|
|||
return value;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Campaign V slice V6h: acquires an owner the active backend may not have.
|
||||
/// The fault point still fires on both arms so a failure-injection test
|
||||
/// covers the same ordered sequence whichever backend composed it.
|
||||
/// </summary>
|
||||
private T? AcquireAndPublishIf<T>(
|
||||
bool supported,
|
||||
CompositionAcquisitionScope scope,
|
||||
string name,
|
||||
Func<T> factory,
|
||||
Action<T> publish,
|
||||
WorldRenderCompositionPoint point)
|
||||
where T : class, IDisposable
|
||||
{
|
||||
T? value = supported
|
||||
? scope.Acquire(name, factory, _factory.Release).Publish(publish)
|
||||
: null;
|
||||
Fault(point);
|
||||
return value;
|
||||
}
|
||||
|
||||
private void Fault(WorldRenderCompositionPoint point) =>
|
||||
_faultInjection?.Invoke(point);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue