First end-to-end pre-bake migration off the runtime D3DCompile path, on top of the scaffolding fromca8c9b0. Picks the smallest possible target - a single-variant vertex shader with zero state dependency, used by every non-batch pipeline (vram_fill / vram_copy / vram_write / vram_update_depth / vram_readback / display / copy/blit) - to validate the full pipeline before larger migrations land. Reasoning for starting here: the screen-quad VS emits a fullscreen triangle from SV_VertexID via the standard bit-shift trick and has no #defines or compile-time-baked uniforms, so a single pre-baked variant covers all seven call sites. Compared to vram_read (which I evaluated as the first target earlier in this arc): RESOLUTION_SCALE bakes in compile-time on non-batch shaders via WriteCommonFunctions, so vram_read would need either one variant per scale value or a refactor of the runtime to bind the batch cbuffer to non-batch shaders. That's a real refactor, not a validation patch. The screen-quad VS sidesteps it entirely. Files in this patch: * data/shaders/d3d12/fullscreen_quad.vs.hlsl - standalone HLSL equivalent to what ShaderGen::GenerateScreenQuadVertexShader() produces in D3D12 mode after preprocessor expansion. Stripped the shadergen prelude (#define HLSL 1, #define vec2 float2, the SAMPLE_TEXTURE / LOAD_TEXTURE / FOR_UNROLL macros, the API_* defines) because the shader uses none of them - native HLSL is what fxc wants. Also dropped the dead #if API_OPENGL || API_OPENGL_ES || API_VULKAN branch since API_OPENGL=0 / API_OPENGL_ES=0 / API_VULKAN=0 for D3D12. * src/common/d3d12/embedded_shaders.h - replaces the placeholder comment block fromca8c9b0with the first concrete extern declaration: extern const uint8_t k_fullscreen_quad_vs[]; extern const size_t k_fullscreen_quad_vs_size_bytes; Pattern matches the regen_d3d12_dxbc.py emission convention documented in ca8c9b0's commit message. * src/common/d3d12/embedded_shaders.cpp - replaces its placeholder with the first #include of a generated .inc. The .inc itself (src/common/d3d12/embedded_dxbc/fullscreen_quad_vs.inc) is generated by tools/regen_d3d12_dxbc.py from the .hlsl source above. **The .inc is NOT included in this patch** because the submission environment doesn't have fxc.exe available. See the applying instructions at the bottom of this commit message. * src/core/gpu_hw_d3d12.h: - GetFullscreenQuadVertexShader() return type changed from ComPtr<ID3DBlob> to D3D12_SHADER_BYTECODE. The function is no longer a lazy-fault helper - the embedded blob is statically linked, always available, no allocation. Function comment refreshed accordingly. - m_fullscreen_quad_vertex_shader member dropped. It was the cache slot for the lazy-faulted blob; with pre-bake there's no fault-in, no caching state, no mutex. * src/core/gpu_hw_d3d12.cpp: - #include "common/d3d12/embedded_shaders.h" added next to the other common/d3d12/ includes. - GetFullscreenQuadVertexShader body rewritten to return a D3D12_SHADER_BYTECODE aggregate over the embedded blob. No mutex, no shader_cache.GetVertexShader, no D3DCompile. - Two precompile_sync if-checks removed. The block at line ~956 used to call GetFullscreenQuadVertexShader() and increment progress; the block at line ~1023 used to fault it in for Lazy mode. Both meaningless now - the blob is statically linked, there is no fault to drive. Left explanatory comments at both sites so the absence is documented. - Progress unit count updated 18 -> 17. The fullscreen-quad VS was one of the 18 non-batch compilation units the progress bar ticked through; with pre-bake it has no compile step to tick. Inline comment refreshed at both the count declaration site (line ~825) and the "1 + 4 + 2 + 2 + 1 + 1 + 6 + 1 = 18" comment that explained the breakdown. - Seven call sites in the GetXxxPipeline helpers converted from: ComPtr<ID3DBlob> vs = GetFullscreenQuadVertexShader(); if (!vs) return {}; ... gpbuilder.SetVertexShader(vs.Get()); to: const D3D12_SHADER_BYTECODE vs = GetFullscreenQuadVertexShader(); ... gpbuilder.SetVertexShader(vs.pShaderBytecode, static_cast<uint32_t>(vs.BytecodeLength)); The null check is dropped because the embedded blob is never null. The cast to uint32_t matches the existing SetVertexShader(const void*, uint32_t) overload signature in src/common/d3d12/util.h. (A future cleanup could add a SetVertexShader(const D3D12_SHADER_BYTECODE&) overload to elide the verbose unpacking at call sites; left for the next patch in the arc where we'll have several more embedded blobs and the savings justify the overload.) - m_fullscreen_quad_vertex_shader.Reset() in DestroyPipelines dropped. Comment block trimmed accordingly. - Stale comment block above GetFullscreenQuadVertexShader refreshed to describe pre-bake semantics instead of the fault-in pattern that no longer applies. Applying instructions (the .inc file isn't in this patch, so build will fail until it lands): $ git am 0001-core-d3d12-pre-bake-the-fullscreen-quad-vertex-shader.patch $ python3 tools/regen_d3d12_dxbc.py # produces src/common/d3d12/embedded_dxbc/fullscreen_quad_vs.inc $ git add src/common/d3d12/embedded_dxbc/fullscreen_quad_vs.inc $ git commit --amend --no-edit $ git push The amend folds the generated .inc into this commit so upstream sees a single self-contained patch. (Alternative: commit the .inc as a separate "regenerate fullscreen_quad_vs.inc" follow-up; either works, but amending keeps the history one-commit-per- migration which matches the Vulkan-side convention.) Cost / behaviour: - Cold boot, shader_precompile_mode = Enabled: one fewer D3DCompile call, one fewer ID3DBlob allocation. Microseconds saved per boot, not user-visible at this scale. - Lazy mode pre-fill: same delta. - Disabled mode first FillVRAM / etc.: same delta. - Runtime: no behaviour change. PSOs that bind the embedded blob produce byte-identical bytecode to what D3DCompile would have produced from GenerateScreenQuadVertexShader() (modulo fxc version compiler-output differences, which the runtime cache normalises against anyway). - Failure mode: if fxc produces a different shader (e.g. a fxc version drift bug), every non-batch pipeline using the embedded VS would render incorrectly - blank framebuffer, wrong UVs, etc. The visual regression is immediate on first frame. Easy to spot. Test: - Cold boot under shader_precompile_mode = Enabled. Progress bar reaches 100% (now sized to 17 non-batch units). FillVRAM / display / readback / etc. all render correctly. - Cold boot under Lazy. Pre-fill happens in the foreground before runloop, no nullptr at draw time on the first frame. - Cold boot under Disabled. First FillVRAM lazy-faults the fill pipeline; the embedded VS is bound, render is correct. - Toggle a non_dim setting (multisamples) to force full-flush of pipelines. CompilePipelines walks the matrix again, rebinds the embedded VS on every non-batch PSO. No leak, no use-after-free. - Toggle chroma_smoothing to fire the partial-flush branch (display pipelines only). Embedded VS is bound on the new display PSOs. Display still renders. - DestroyPipelines on shutdown / UpdateSettings: no m_fullscreen_quad_vertex_shader to Reset; nothing to leak. Next patch in the arc: extend to non-batch pixel shaders that don't bake state. vram_copy_ps and vram_update_depth_ps are the next candidates - both are single-variant and have no RESOLUTION_SCALE dependency (they sample VRAM coordinates directly, no box-filter loop). After those, vram_fill_ps (two variants: wrapped/unwrapped, interlaced/not - 4 total - so TEMPLATE_VARIANTS gets its first non-empty entry). vram_read and the batch matrix come later, after we have a cbuffer- routing migration that lets RESOLUTION_SCALE be runtime-set in non-batch shaders too.
20 lines
874 B
HLSL
20 lines
874 B
HLSL
// Pre-baked fullscreen-quad vertex shader for the D3D12 backend.
|
|
//
|
|
// Equivalent to ShaderGen::GenerateScreenQuadVertexShader() invoked with
|
|
// HostDisplay::RenderAPI::D3D12 in src/core/shadergen.cpp. The runtime
|
|
// path goes through D3DCompile on the generated HLSL; the pre-bake path
|
|
// embeds the DXBC output of fxc on this source.
|
|
//
|
|
// No state dependency. The body computes a fullscreen triangle from
|
|
// SV_VertexID (0, 1, 2) using the standard bit-shift trick - v_id 0
|
|
// emits (0, 0), v_id 1 emits (2, 0), v_id 2 emits (0, 2) in tex-space,
|
|
// mapped to NDC by the * float2(2, -2) + float2(-1, 1) transform.
|
|
|
|
void main(
|
|
in uint v_id : SV_VertexID,
|
|
out float2 v_tex0 : TEXCOORD0,
|
|
out float4 v_pos : SV_Position)
|
|
{
|
|
v_tex0 = float2(float((v_id << 1) & 2u), float(v_id & 2u));
|
|
v_pos = float4(v_tex0 * float2(2.0f, -2.0f) + float2(-1.0f, 1.0f), 0.0f, 1.0f);
|
|
}
|