zenithsiz/zsw
1
0
Fork 0
mirror of https://github.com/Zenithsiz/zsw.git synced 2026-02-04 02:08:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

The empty image is now created and stored in the shared wgpu state.

Browse Source
This commit is contained in:
Filipe Rodrigues 2025-08-25 11:19:05 +01:00
parent 3c3b071e71
commit d36afb4808
Signed by: zenithsiz
SSH Key Fingerprint: SHA256:Mb5ppb3Sh7IarBO/sBTXLHbYEOz37hJAlslLQPPAPaU
2 changed files with 53 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
zsw-wgpu/src/lib.rs
View File

@ -26,6 +26,12 @@ pub struct WgpuShared {
/// Queue
pub queue: wgpu::Queue,
/// Empty texture
pub empty_texture: wgpu::Texture,
/// Empty texture view
pub empty_texture_view: wgpu::TextureView,
}
/// Shared
@ -44,11 +50,15 @@ pub async fn get_or_create_shared() -> Result<&'static WgpuShared, AppError> {
.context("Unable to create adaptor")?;
let (device, queue) = self::create_device(&adapter).await.context("Unable to create device")?;
let (empty_texture, empty_texture_view) = self::create_empty_image_texture(&device);
Ok::<_, AppError>(WgpuShared {
instance,
adapter,
device,
queue,
empty_texture,
empty_texture_view,
})
})
.await
@ -108,3 +118,28 @@ async fn create_adapter(instance: &wgpu::Instance) -> Result<wgpu::Adapter, AppE
Ok(adapter)
}
/// Gets an empty texture
fn create_empty_image_texture(device: &wgpu::Device) -> (wgpu::Texture, wgpu::TextureView) {
// TODO: Pass some view formats?
let texture_descriptor = wgpu::TextureDescriptor {
label: Some("[zsw] Empty image"),
size: wgpu::Extent3d {
width: 1,
height: 1,
depth_or_array_layers: 1,
},
mip_level_count: 1,
sample_count: 1,
dimension: wgpu::TextureDimension::D2,
format: wgpu::TextureFormat::Rgba8UnormSrgb,
usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
view_formats: &[],
};
let texture = device.create_texture(&texture_descriptor);
let texture_view_descriptor = wgpu::TextureViewDescriptor::default();
let texture_view = texture.create_view(&texture_view_descriptor);
(texture, texture_view)
}

70
zsw/src/panel/images/image.rs
View File

@ -4,10 +4,7 @@
use {
cgmath::Vector2,
image::DynamicImage,
std::{
path::Path,
sync::{Arc, OnceLock},
},
std::{path::Path, sync::Arc},
wgpu::util::DeviceExt,
zsw_wgpu::WgpuShared,
};
@ -62,9 +59,9 @@ impl PanelImage {
}
/// Returns the texture view for this image.
pub fn texture_view<'a>(&'a self, wgpu_shared: &'_ WgpuShared) -> &'a wgpu::TextureView {
pub fn texture_view<'a>(&'a self, wgpu_shared: &'a WgpuShared) -> &'a wgpu::TextureView {
match self {
Self::Empty => &self::get_empty_image_texture(wgpu_shared).1,
Self::Empty => &wgpu_shared.empty_texture_view,
Self::Loaded { texture_view, .. } => texture_view,
}
}
@ -75,24 +72,6 @@ impl PanelImage {
}
}
/// Empty texture
static EMPTY_TEXTURE: OnceLock<(wgpu::Texture, wgpu::TextureView)> = OnceLock::new();
/// Gets an empty texture
fn get_empty_image_texture(wgpu_shared: &WgpuShared) -> &'static (wgpu::Texture, wgpu::TextureView) {
EMPTY_TEXTURE.get_or_init(|| {
// TODO: Pass some view formats?
let texture_descriptor =
self::texture_descriptor("[zsw::panel] Null image", 1, 1, wgpu::TextureFormat::Rgba8UnormSrgb, &[
]);
let texture = wgpu_shared.device.create_texture(&texture_descriptor);
let texture_view_descriptor = wgpu::TextureViewDescriptor::default();
let texture_view = texture.create_view(&texture_view_descriptor);
(texture, texture_view)
})
}
/// Creates the image texture and view
fn create_image_texture(
wgpu_shared: &WgpuShared,
@ -123,10 +102,21 @@ fn create_image_texture(
"Loaded image was too big {image_width}x{image_height} (max: {max_image_size})",
);
// TODO: Pass some view formats?
let texture_descriptor_label = format!("[zsw::panel_img] Image ({image_path:?})");
let texture_descriptor =
self::texture_descriptor(&texture_descriptor_label, image.width(), image.height(), format, &[]);
let texture_descriptor = wgpu::TextureDescriptor {
label: Some(&format!("[zsw::panel_img] Image ({image_path:?})")),
size: wgpu::Extent3d {
width: image.width(),
height: image.height(),
depth_or_array_layers: 1,
},
mip_level_count: 1,
sample_count: 1,
dimension: wgpu::TextureDimension::D2,
format,
usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
// TODO: Pass some view formats?
view_formats: &[],
};
let texture = wgpu_shared.device.create_texture_with_data(
&wgpu_shared.queue,
&texture_descriptor,
@ -137,27 +127,3 @@ fn create_image_texture(
let texture_view = texture.create_view(&texture_view_descriptor);
(texture, texture_view)
}
/// Builds the texture descriptor
fn texture_descriptor<'a>(
label: &'a str,
width: u32,
height: u32,
format: wgpu::TextureFormat,
view_formats: &'a [wgpu::TextureFormat],
) -> wgpu::TextureDescriptor<'a> {
wgpu::TextureDescriptor {
label: Some(label),
size: wgpu::Extent3d {
width,
height,
depth_or_array_layers: 1,
},
mip_level_count: 1,
sample_count: 1,
dimension: wgpu::TextureDimension::D2,
format,
usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
view_formats,
}
}