Skip to content

fix(compositor): restore the export speed lost to the 3D models in the layer shader #982

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

Merged
EtienneLescot merged 10 commits into from
Oct 2, 2026
Merged

fix(compositor): restore the export speed lost to the 3D models in the layer shader #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1bd3e4d
fix(compositor): keep the 3D models out of the Linux layer pipeline
EtienneLescot Oct 2, 2026
9c7f661
perf(compositor): evaluate one corner distance per pixel on Linux
EtienneLescot Oct 2, 2026
1204aca
perf(compositor): scissor the Linux cursor trail composite to the trail
EtienneLescot Oct 2, 2026
c00e5b7
perf(compositor): copy a static background instead of redrawing it on…
EtienneLescot Oct 2, 2026
f2d3b28
docs(perf): record the Linux export regression of 2.0 and its fixes
EtienneLescot Oct 2, 2026
294b0eb
fix(compositor): pick the Linux layer pipeline from the layer's mode
EtienneLescot Oct 2, 2026
48c2778
fix(compositor): keep the 3D models out of the D3D11 and Metal layer …
EtienneLescot Oct 2, 2026
527f934
perf(compositor): evaluate one corner distance per pixel on Windows a…
EtienneLescot Oct 2, 2026
1f3f843
docs(perf): record the per-mode pipeline choice and what Windows and …
EtienneLescot Oct 2, 2026
73de470
perf(compositor): compare the background key without copying the back…
EtienneLescot Oct 2, 2026
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
38 changes: 23 additions & 15 deletions crates/compositor/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ fn main() {
fn compile_hlsl(out: &Path) {
use windows::core::PCSTR;
use windows::Win32::Graphics::Direct3D::Fxc::{D3DCompile, D3DCOMPILE_OPTIMIZATION_LEVEL3};
use windows::Win32::Graphics::Direct3D::ID3DBlob;
use windows::Win32::Graphics::Direct3D::{ID3DBlob, D3D_SHADER_MACRO};

fn blob_bytes(blob: &ID3DBlob) -> Vec<u8> {
unsafe {
Expand All @@ -203,17 +203,25 @@ fn compile_hlsl(out: &Path) {
const SRC: &str = "src/shaders.hlsl";
println!("cargo:rerun-if-changed={SRC}");
let hlsl = std::fs::read(SRC).expect(SRC);
// Tous les points d'entrée que `Compositor::new_inner` instancie, avec leur profil.
for (entry, profile) in [
("vs_main", "vs_5_0"),
("ps_main", "ps_5_0"),
("vs_fs", "vs_5_0"),
("ps_y", "ps_5_0"),
("ps_uv", "ps_5_0"),
("ps_blur", "ps_5_0"),
("ps_tex", "ps_5_0"),
("ps_kawase_down", "ps_5_0"),
("ps_kawase_up", "ps_5_0"),
// `ps_main` avec les modèles 3D : la variante que seuls ces calques utilisent (le haut de
// `shaders.hlsl`). La liste se termine par une entrée nulle.
let models = [
D3D_SHADER_MACRO { Name: PCSTR(b"LAYER_MODELS\0".as_ptr()), Definition: PCSTR(b"1\0".as_ptr()) },
D3D_SHADER_MACRO { Name: PCSTR::null(), Definition: PCSTR::null() },
];
// Tous les points d'entrée que `Compositor::new_inner` instancie, avec leur profil, le nom du
// `.cso` qu'en lit `shader!` et leurs macros.
for (entry, profile, cso, defines) in [
("vs_main", "vs_5_0", "vs_main", None),
("ps_main", "ps_5_0", "ps_main", None),
("ps_main", "ps_5_0", "ps_main_models", Some(models.as_ptr())),
("vs_fs", "vs_5_0", "vs_fs", None),
("ps_y", "ps_5_0", "ps_y", None),
("ps_uv", "ps_5_0", "ps_uv", None),
("ps_blur", "ps_5_0", "ps_blur", None),
("ps_tex", "ps_5_0", "ps_tex", None),
("ps_kawase_down", "ps_5_0", "ps_kawase_down", None),
("ps_kawase_up", "ps_5_0", "ps_kawase_up", None),
] {
let (entry_z, profile_z) = (format!("{entry}\0"), format!("{profile}\0"));
let (mut code, mut errors): (Option<ID3DBlob>, Option<ID3DBlob>) = (None, None);
Expand All @@ -222,7 +230,7 @@ fn compile_hlsl(out: &Path) {
hlsl.as_ptr().cast(),
hlsl.len(),
PCSTR(b"shaders.hlsl\0".as_ptr()),
None,
defines,
None,
PCSTR(entry_z.as_ptr()),
PCSTR(profile_z.as_ptr()),
Expand All @@ -234,9 +242,9 @@ fn compile_hlsl(out: &Path) {
};
if let Err(e) = compiled {
let log = errors.as_ref().map(blob_bytes).unwrap_or_default();
panic!("{SRC} : {entry} ne compile pas ({e})\n{}", String::from_utf8_lossy(&log));
panic!("{SRC} : {cso} ne compile pas ({e})\n{}", String::from_utf8_lossy(&log));
}
std::fs::write(out.join(format!("{entry}.cso")), blob_bytes(&code.unwrap())).expect(entry);
std::fs::write(out.join(format!("{cso}.cso")), blob_bytes(&code.unwrap())).expect(cso);
}
}

Expand Down
Loading
Loading