karim/DOSSIER-STANDALONE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wgpu 22 → 29, glyphon 0.6 → 0.11: requestDevice-Shim entfällt

Browse Source 
glyphon 0.11 ist die neueste zu wgpu 29 passende Version (wgpu 30 existiert
bereits, glyphon pinnt aber ^29). Das 22er-Limit maxInterStageShaderComponents
wird von 29 nicht mehr in requiredLimits gesendet — src/engine/requestDeviceShim.ts
komplett entfernt, beide Hook-Importstellen (useWasmPlanRenderer, useWasm3dRenderer)
angepasst. pollster 0.3→0.4, naga 22→29 mitgezogen. Alle Draw-/Text-Pfade
(draw_sequence, glyphon ColorMode::Web, widthScreen-Polylinien, Headless/Golden)
unverändert funktionsfähig.

Verifiziert: cargo check nativ (render2d/render3d/src-tauri) grün, cargo test
render2d 17/17 + Golden bit-exakt, render3d 29/29, wasm32 --features web für
beide grün, npx tsc -b + npm run build grün.
This commit is contained in:
Karim
2026-07-03 18:17:41 +02:00
parent 9371b65b3b
commit 8a79f6cbaa
17 changed files with 1794 additions and 1124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/render3d/Cargo.lock
Generated
+449 -302
View File
File diff suppressed because it is too large Load Diff
src-tauri/render3d/Cargo.toml
+7 -7
View File
@@ -59,12 +59,12 @@ serde = { version = "1", features = ["derive"] }
serde_json = { version = "1", optional = true }
# --- GPU (nur mit Feature "render") ------------------------------------------
# Standard-Features von wgpu (wgsl, webgpu, dx12, metal). Die Linux-Backends
# Vulkan/GLES aktiviert wgpu selbst ueber seine target-spezifischen Defaults —
# es gibt in wgpu 22 keine expliziten `vulkan`/`gles`-Feature-Namen.
wgpu = { version = "22", optional = true }
# Standard-Features von wgpu (wgsl, webgpu, dx12, metal + target-spezifisch
# Vulkan/GLES auf Linux). Version im Gleichschritt mit render2d: wgpu 29, weil
# glyphon (dort) noch keine 30 unterstuetzt — beide Crates teilen den Stand.
wgpu = { version = "29", optional = true }
bytemuck = { version = "1", optional = true, features = ["derive"] }
pollster = { version = "0.3", optional = true }
pollster = { version = "0.4", optional = true }
# --- Fenster (nur mit Feature "window") --------------------------------------
winit = { version = "0.30", optional = true }
@@ -87,8 +87,8 @@ web-sys = { version = "0.3", optional = true, features = [
[dev-dependencies]
serde_json = "1"
# naga validiert die WGSL-Quellen headless (Parser + Validator) im Test, ohne
# GPU/Display. Version an wgpu 22 gekoppelt (transitiv ohnehin vorhanden).
naga = { version = "22", features = ["wgsl-in"] }
# GPU/Display. Version an wgpu gekoppelt (transitiv ohnehin vorhanden).
naga = { version = "29", features = ["wgsl-in"] }
# Der Fenster-Spike ist nur mit Feature "window" verfuegbar; ohne das Feature
# wird das Binary aus dem Build ausgeschlossen (required-features).
src-tauri/render3d/src/bin/spike3d.rs
+15 -13
View File
@@ -76,15 +76,14 @@ impl GpuState {
compatible_surface: Some(&surface),
}))
.expect("kein passender GPU-Adapter");
let (device, queue) = pollster::block_on(adapter.request_device(
&wgpu::DeviceDescriptor {
label: Some("3d.device"),
required_features: wgpu::Features::empty(),
required_limits: wgpu::Limits::default(),
memory_hints: wgpu::MemoryHints::Performance,
},
None,
))
let (device, queue) = pollster::block_on(adapter.request_device(&wgpu::DeviceDescriptor {
label: Some("3d.device"),
required_features: wgpu::Features::empty(),
required_limits: wgpu::Limits::default(),
experimental_features: wgpu::ExperimentalFeatures::disabled(),
memory_hints: wgpu::MemoryHints::Performance,
trace: wgpu::Trace::Off,
}))
.expect("Device anfordern");
let caps = surface.get_capabilities(&adapter);
@@ -129,14 +128,17 @@ impl GpuState {
}
fn render(&mut self, camera: &Camera) {
// wgpu 29: `get_current_texture` liefert ein Enum statt eines Results —
// Suboptimal ist weiterhin praesentierbar, Lost/Outdated -> rekonfigurieren.
let frame = match self.surface.get_current_texture() {
Ok(f) => f,
Err(wgpu::SurfaceError::Lost | wgpu::SurfaceError::Outdated) => {
wgpu::CurrentSurfaceTexture::Success(f)
| wgpu::CurrentSurfaceTexture::Suboptimal(f) => f,
wgpu::CurrentSurfaceTexture::Lost | wgpu::CurrentSurfaceTexture::Outdated => {
self.surface.configure(&self.device, &self.config);
return;
}
Err(e) => {
eprintln!("Surface-Fehler: {e:?}");
other => {
eprintln!("Surface-Fehler: {other:?}");
return;
}
};
src-tauri/render3d/src/gpu.rs
+10 -7
View File
@@ -108,8 +108,8 @@ impl Renderer {
let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
label: Some("3d.layout"),
bind_group_layouts: &[&bind_group_layout],
push_constant_ranges: &[],
bind_group_layouts: &[Some(&bind_group_layout)],
immediate_size: 0,
});
// Vertex-Layout: [pos vec3, normal vec3, color vec3], stride 9*4.
@@ -124,13 +124,13 @@ impl Renderer {
layout: Some(&pipeline_layout),
vertex: wgpu::VertexState {
module: &module,
entry_point: "vs_main",
entry_point: Some("vs_main"),
buffers: &[vertex_layout],
compilation_options: Default::default(),
},
fragment: Some(wgpu::FragmentState {
module: &module,
entry_point: "fs_main",
entry_point: Some("fs_main"),
targets: &[Some(wgpu::ColorTargetState {
format: color_format,
blend: Some(wgpu::BlendState::REPLACE),
@@ -147,13 +147,13 @@ impl Renderer {
},
depth_stencil: Some(wgpu::DepthStencilState {
format: DEPTH_FORMAT,
depth_write_enabled: true,
depth_compare: wgpu::CompareFunction::Less,
depth_write_enabled: Some(true),
depth_compare: Some(wgpu::CompareFunction::Less),
stencil: wgpu::StencilState::default(),
bias: wgpu::DepthBiasState::default(),
}),
multisample: wgpu::MultisampleState::default(),
multiview: None,
multiview_mask: None,
cache: None,
});
@@ -292,6 +292,8 @@ impl Renderer {
label: Some("3d.pass"),
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
view,
// Ziel ist eine 2D-Textur (kein 3D-Volumen) -> kein Depth-Slice.
depth_slice: None,
resolve_target: None,
ops: wgpu::Operations {
load: wgpu::LoadOp::Clear(self.clear_color),
@@ -308,6 +310,7 @@ impl Renderer {
}),
timestamp_writes: None,
occlusion_query_set: None,
multiview_mask: None,
});
if let Some(m) = &self.mesh {
src-tauri/render3d/src/web.rs
+20 -16
View File
@@ -63,7 +63,7 @@ impl WebModelRenderer {
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
backends: wgpu::Backends::BROWSER_WEBGPU,
..Default::default()
..wgpu::InstanceDescriptor::new_without_display_handle()
});
let surface = instance
.create_surface(wgpu::SurfaceTarget::Canvas(canvas))
@@ -76,19 +76,20 @@ impl WebModelRenderer {
compatible_surface: Some(&surface),
})
.await
.ok_or_else(|| JsValue::from_str("kein WebGPU-Adapter (navigator.gpu?)"))?;
.map_err(|e| {
JsValue::from_str(&format!("kein WebGPU-Adapter (navigator.gpu?): {e}"))
})?;
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: Some("render3d.web.device"),
required_features: wgpu::Features::empty(),
required_limits: wgpu::Limits::downlevel_webgl2_defaults()
.using_resolution(adapter.limits()),
memory_hints: wgpu::MemoryHints::Performance,
},
None,
)
.request_device(&wgpu::DeviceDescriptor {
label: Some("render3d.web.device"),
required_features: wgpu::Features::empty(),
required_limits: wgpu::Limits::downlevel_webgl2_defaults()
.using_resolution(adapter.limits()),
experimental_features: wgpu::ExperimentalFeatures::disabled(),
memory_hints: wgpu::MemoryHints::Performance,
trace: wgpu::Trace::Off,
})
.await
.map_err(|e| JsValue::from_str(&format!("request_device: {e:?}")))?;
@@ -192,15 +193,18 @@ impl WebModelRenderer {
/// Zeichnet EINEN Frame in die Surface-Textur.
pub fn render(&mut self) {
// wgpu 29: `get_current_texture` liefert ein Enum statt eines Results —
// Suboptimal ist weiterhin praesentierbar, Lost/Outdated -> rekonfigurieren.
let frame = match self.surface.get_current_texture() {
Ok(f) => f,
Err(wgpu::SurfaceError::Lost | wgpu::SurfaceError::Outdated) => {
wgpu::CurrentSurfaceTexture::Success(f)
| wgpu::CurrentSurfaceTexture::Suboptimal(f) => f,
wgpu::CurrentSurfaceTexture::Lost | wgpu::CurrentSurfaceTexture::Outdated => {
self.surface.configure(&self.device, &self.config);
return;
}
Err(e) => {
other => {
web_sys::console::warn_1(&JsValue::from_str(&format!(
"render3d Surface-Fehler: {e:?}"
"render3d Surface-Fehler: {other:?}"
)));
return;
}