Commit graph

2 commits

Author SHA1 Message Date
LibretroAdmin
0786bc85fb core/d3d: fix box downsample PS signature for D3D12 PSO linkage
The pre-baked box_sample_downsample.ps.hlsl declared only
SV_Position as its pixel-shader input. With no preceding TEXCOORD0,
fxc packed SV_Position at input register 0. The fullscreen-quad
vertex shader these PSOs bind emits TEXCOORD0 at output register 0
and SV_Position at output register 1, so on D3D12 the PS input
register 0 had no matching VS output carrying the POSITION system
value. D3D12 links VS-output to PS-input by register at
CreateGraphicsPipelineState time, so the box PSO failed to compile
and the build returned null. UpdateDisplay then bound that null
pipeline (SetPipelineState dereferences its argument), faulting
inside D3D12Core when downsampling was switched on at runtime.

Declare an (unused) TEXCOORD0 input ahead of SV_Position so fxc
packs SV_Position at register 1, matching the vertex shader output
and the display pixel shaders (which likewise keep an unused
TEXCOORD0 at register 0). fxc preserves declared-but-unread inputs
in the signature, so the resolved layout is TEXCOORD0->reg0,
SV_Position->reg1 for every scale variant. This is also what
GenerateBoxSampleDownsampleFragmentShader already emits via
DeclareFragmentEntryPoint(ss, 0, 1, ...). D3D11 was unaffected
because CreatePixelShader does not validate against the bound VS.

Regenerated all 15 box DXBC variants (s2..s16).
2026-05-20 13:36:44 +02:00
LibretroAdmin
0ed7261c70 core: rename data/shaders/d3d12 -> data/shaders/d3d_common
The .inc consumers and the C++ host namespace moved to d3d_common
in 24bacbf, but the HLSL sources and the regen tool kept their
d3d12 tags for "historical / churn-avoidance reasons" - the
commit message there explicitly flagged it as deferred cleanup
("data/shaders/d3d12 -> data/shaders/d3d_common + tool rename.
Currently kept as d3d12 for historical/churn-avoidance
reasons"). With the downsample foundation landed at 251e457
also putting its HLSL under data/shaders/d3d12/ (despite being
consumed only by D3D11 today, with D3D12 consumption arriving
in a later phase), the naming inconsistency is now actively
confusing. This commit completes the rename.

What changes (mechanically, via git mv + sweep):

  data/shaders/d3d12/ -> data/shaders/d3d_common/
    Whole directory renames via git mv. 16 files move:
    README.md + 10 .hlsl source templates (5 batch + display +
    copy + vram_{copy,fill,read,update_depth,write} +
    fullscreen_quad + 4 downsample). Each .hlsl content
    is unchanged except where a comment string referenced the
    old path (3 files: box_sample_downsample.ps.hlsl,
    adaptive_downsample_composite.ps.hlsl, vram_fill.ps.hlsl).

  tools/regen_d3d12_dxbc.py -> tools/regen_d3d_common_dxbc.py
    Renamed via git mv. The HLSL_DIR constant repointed to the
    new HLSL directory; the .inc preamble template updated to
    emit the new paths; the top-of-file comment updated to
    drop the "kept as d3d12 for historical reasons" note now
    that it doesn't apply. Behaviour unchanged: same HLSL ->
    fxc /T ps_5_0 /E main /O3 -> same .inc bytes.

  src/common/d3d_common/embedded_dxbc/*.inc (182 files)
    Preamble line 1 updated:
      // Autogenerated from data/shaders/d3d12/<name>.hlsl.
      -> // Autogenerated from data/shaders/d3d_common/<name>.hlsl.
    Preamble line 2 updated:
      // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py.
      -> // DO NOT EDIT. Regenerate with tools/regen_d3d_common_dxbc.py.
    The byte arrays themselves are bit-identical pre/post-commit
    (fxc emits identical DXBC from the same HLSL source). Only
    the two comment lines of each .inc change.

  src/common/d3d_common/embedded_shaders.h
    14 doc comments updated:
      "// Source: data/shaders/d3d12/<name>.hlsl"
      -> "// Source: data/shaders/d3d_common/<name>.hlsl"
    Plus the top-of-file rationale block updated to drop the
    d3d12-tagged path reference.

  src/core/gpu_hw_d3d12.cpp
    Two comment lines referencing the old data/shaders/d3d12/
    path and the old regen tool name. The pre-bake call sites
    themselves were already namespace-qualified (D3DCommon::
    EmbeddedShaders::*) and need no change.

  data/shaders/d3d_common/README.md
    8 doc references to the old paths updated.

What doesn't change in this commit:

  - DXBC byte content. fxc is deterministic on identical source +
    flags; the post-rename HLSL is byte-identical to the
    pre-rename HLSL except for comment text, and comments don't
    survive into the compiled bytecode. Re-running
    tools/regen_d3d_common_dxbc.py produces .inc files that
    match this commit's preamble lines + the pre-existing byte
    arrays.

  - C++ namespaces. Already D3DCommon::EmbeddedShaders since
    24bacbf. Not touched here.

  - Header / library / TU layout. embedded_shaders.{h,cpp}
    already live at src/common/d3d_common/ since 24bacbf;
    embedded_dxbc/ already lives at
    src/common/d3d_common/embedded_dxbc/. This commit completes
    the symmetric rename on the data-side and tools-side.

  - Build system files (CMakeLists.txt, Makefile.libretro):
    none of them references the data/shaders directory tree or
    the regen tool - the data is consumed at HLSL-source-edit
    time only, not at build time. Untouched.

  - Runtime behaviour: zero diff across D3D11 + D3D12. Same
    blobs, same pickers, same PSOs.

Test:
  - git status post-rename shows 16 renames + 184 minor edits
    (preamble-only diffs in the .inc files + comment-only diffs
    in the regen tool + embedded_shaders.h + gpu_hw_d3d12.cpp).
    No moved file's content changed structurally.
  - Hand-compile of a representative variant
    (box_sample_downsample at RESOLUTION_SCALE=4) post-rename:
    1044 bytes DXBC, identical to pre-rename.
  - String search across the tree: zero remaining references to
    "data/shaders/d3d12" or "regen_d3d12_dxbc" outside of
    .git history.

Next:
  - Activation commit for the downsample pre-bake: add 22 extern
    pairs + 22 #include lines to embedded_shaders.{h,cpp},
    add 4 picker functions, rewrite the 5 shadergen calls in
    GPU_HW_D3D11::CompileShaders. The d3d_common naming is now
    coherent across HLSL sources, regen tool, .inc files, host
    TU, and host namespace - new pre-bake additions don't have
    to thread the old d3d12 naming.
  - Phase 2 (separate effort): port the D3D11 downsample
    machinery to D3D12 - PSOs, explicit resource barriers,
    texture / mip-view creation - and set
    m_supports_adaptive_downsampling = true on the D3D12 caps
    path. The pre-baked blobs are already in place by then.
2026-05-19 11:19:24 +02:00
Renamed from data/shaders/d3d12/box_sample_downsample.ps.hlsl (Browse further)