From 31c221a47b5f970aae544636f3c87fba5d15ef87 Mon Sep 17 00:00:00 2001
From: newfla <newfla@hotmail.it>
Date: Sat, 6 Jun 2026 16:18:44 +0200
Subject: [PATCH] feat: add VAE format and streaming options to ModelConfig

---
 src/api.rs               | 13 +++++++++++++
 sys/stable-diffusion.cpp |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/api.rs b/src/api.rs
index fe2ec65..18deeec 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -72,6 +72,9 @@ pub use diffusion_rs_sys::lora_apply_mode_t as LoraModeType;
 /// Hires mode
 pub use diffusion_rs_sys::sd_hires_upscaler_t as Upscaler;
 
+/// VAE latent format
+pub use diffusion_rs_sys::sd_vae_format_t as VaeFormat;
+
 static VALID_EXT: [&str; 3] = ["gguf", "safetensors", "pt"];
 
 #[allow(unused)]
@@ -386,6 +389,10 @@ pub struct ModelConfig {
     #[builder(default = "Default::default()")]
     vae: CLibPath,
 
+    /// should match the VAE latent layout used by the PiD checkpoint. This is important when using standalone VAE files because the PiD diffusion checkpoint alone does not identify the VAE format.
+    #[builder(default = "VaeFormat::SD_VAE_FORMAT_AUTO")]
+    vae_format: VaeFormat,
+
     /// Path to taesd. Using Tiny AutoEncoder for fast decoding (low quality)
     #[builder(default = "Default::default()")]
     taesd: CLibPath,
@@ -568,6 +575,10 @@ pub struct ModelConfig {
     #[builder(default = "(None, CLibString::default())", setter(custom))]
     extra_tiling_args: (Option<HashMap<String, String>>, CLibString),
 
+    /// Enable residency+prefetch streaming on top of [ModelConfig::max_vram] (no effect without [ModelConfig::max_vram]; defaults to false)
+    #[builder(default = "false")]
+    stream_layers: bool,
+
     #[builder(default = "None", private)]
     upscaler_ctx: Option<*mut upscaler_ctx_t>,
 
@@ -819,6 +830,8 @@ impl ModelConfig {
                     params_backend: self.params_backend.1.as_ptr(),
                     embeddings_connectors_path: self.embeddings_connectors.as_ptr(),
                     audio_vae_path: self.audio_vae.as_ptr(),
+                    vae_format: self.vae_format,
+                    stream_layers: self.stream_layers,
                 };
                 let ctx = new_sd_ctx(&sd_ctx_params);
                 self.diffusion_ctx = Some((ctx, sd_ctx_params))
diff --git a/sys/stable-diffusion.cpp b/sys/stable-diffusion.cpp
index 0e4ee04..0648f44 160000
--- a/sys/stable-diffusion.cpp
+++ b/sys/stable-diffusion.cpp
@@ -1 +1 @@
-Subproject commit 0e4ee04488159b81d95a9ffcd983a077fd5dcb77
+Subproject commit 0648f4426b4fcf11f326cc87030bd4727f44666e