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

Renamed all wgpu labels

Browse Source
This commit is contained in:
Filipe Rodrigues 2025-09-17 10:03:31 +01:00
parent fe368dbef6
commit 657de4f5cb
Signed by: zenithsiz
SSH Key Fingerprint: SHA256:Mb5ppb3Sh7IarBO/sBTXLHbYEOz37hJAlslLQPPAPaU
4 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,6 @@ use {
app_error::Context,
core::sync::atomic::{self, AtomicBool},
image::DynamicImage,
std::path::Path,
wgpu::{util as wgpu_util, util::DeviceExt},
zsw_util::AppError,
};
@ -76,7 +75,7 @@ impl Wgpu {
/// Creates a texture from an image.
pub fn create_texture_from_image(
&self,
path: &Path,
label: &str,
image: DynamicImage,
) -> Result<(wgpu::Texture, wgpu::TextureView), AppError> {
// Get the image's format, converting if necessary.
@ -104,7 +103,7 @@ impl Wgpu {
);
let texture_descriptor = wgpu::TextureDescriptor {
label: Some(&format!("[zsw] Image ({path:?})")),
label: Some(label),
size: wgpu::Extent3d {
width: image.width(),
height: image.height(),
@ -125,7 +124,10 @@ impl Wgpu {
image.as_bytes(),
);
let texture_view_descriptor = wgpu::TextureViewDescriptor::default();
let texture_view_descriptor = wgpu::TextureViewDescriptor {
label: Some(&format!("{label}-view")),
..Default::default()
};
let texture_view = texture.create_view(&texture_view_descriptor);
Ok((texture, texture_view))
@ -136,7 +138,7 @@ impl Wgpu {
async fn create_device(adapter: &wgpu::Adapter) -> Result<(wgpu::Device, wgpu::Queue), AppError> {
// Request the device without any features
let device_descriptor = wgpu::DeviceDescriptor {
label: Some("[zsw] Device"),
label: Some("zsw-device"),
required_features: wgpu::Features::default(),
required_limits: wgpu::Limits::default(),
memory_hints: wgpu::MemoryHints::default(),
@ -185,7 +187,7 @@ async fn create_adapter(instance: &wgpu::Instance) -> Result<wgpu::Adapter, AppE
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"),
label: Some("zsw-texture-empty"),
size: wgpu::Extent3d {
width: 1,
height: 1,
@ -200,7 +202,10 @@ fn create_empty_image_texture(device: &wgpu::Device) -> (wgpu::Texture, wgpu::Te
};
let texture = device.create_texture(&texture_descriptor);
let texture_view_descriptor = wgpu::TextureViewDescriptor::default();
let texture_view_descriptor = wgpu::TextureViewDescriptor {
label: Some("zsw-texture-empty-view"),
..Default::default()
};
let texture_view = texture.create_view(&texture_view_descriptor);
(texture, texture_view)

4
zsw-wgpu/src/renderer.rs
View File

@ -87,14 +87,14 @@ impl WgpuRenderer {
}
});
let surface_view_descriptor = wgpu::TextureViewDescriptor {
label: Some("[zsw] Window surface texture view"),
label: Some("zsw-frame-surface-texture-view"),
..wgpu::TextureViewDescriptor::default()
};
let surface_texture_view = surface_texture.texture.create_view(&surface_view_descriptor);
// Then create an encoder for our frame
let encoder_descriptor = wgpu::CommandEncoderDescriptor {
label: Some("[zsw] Frame render command encoder"),
label: Some("zsw-frame-command-encoder"),
};
let encoder = wgpu.device.create_command_encoder(&encoder_descriptor);

27
zsw/src/panel/renderer.rs
View File

@ -157,7 +157,7 @@ impl PanelsRenderer {
},
};
let render_pass_descriptor = wgpu::RenderPassDescriptor {
label: Some("[zsw::panel] Render pass"),
label: Some("zsw-panel-render-pass"),
color_attachments: &[Some(render_pass_color_attachment)],
depth_stencil_attachment: None,
timestamp_writes: None,
@ -421,7 +421,7 @@ impl PanelsRenderer {
fn create_panel_geometry_uniforms(wgpu: &Wgpu, shared: &PanelsRendererShared) -> PanelGeometryUniforms {
// Create the uniforms
let buffer_descriptor = wgpu::BufferDescriptor {
label: Some("[zsw::panel] Geometry uniforms buffer"),
label: Some("zsw-panel-geometry-uniforms-buffer"),
usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,
size: u64::try_from(MAX_UNIFORM_SIZE).expect("Maximum uniform size didn't fit into a `u64`"),
mapped_at_creation: false,
@ -430,12 +430,12 @@ fn create_panel_geometry_uniforms(wgpu: &Wgpu, shared: &PanelsRendererShared) ->
// Create the uniform bind group
let bind_group_descriptor = wgpu::BindGroupDescriptor {
label: Some("zsw-panel-geometry-uniforms-bind-group"),
layout: &shared.uniforms_bind_group_layout,
entries: &[wgpu::BindGroupEntry {
binding: 0,
resource: buffer.as_entire_binding(),
}],
label: Some("[zsw::panel] Geometry uniforms bind group"),
};
let bind_group = wgpu.device.create_bind_group(&bind_group_descriptor);
@ -445,7 +445,7 @@ fn create_panel_geometry_uniforms(wgpu: &Wgpu, shared: &PanelsRendererShared) ->
/// Creates the vertices
fn create_vertices(wgpu: &Wgpu) -> wgpu::Buffer {
let descriptor = wgpu::util::BufferInitDescriptor {
label: Some("[zsw::panel] Vertex buffer"),
label: Some("zsw-panel-vertex-buffer"),
contents: bytemuck::cast_slice(&PanelVertex::QUAD),
usage: wgpu::BufferUsages::VERTEX,
};
@ -457,7 +457,7 @@ fn create_vertices(wgpu: &Wgpu) -> wgpu::Buffer {
fn create_indices(wgpu: &Wgpu) -> wgpu::Buffer {
const INDICES: [u32; 6] = [0, 1, 3, 0, 3, 2];
let descriptor = wgpu::util::BufferInitDescriptor {
label: Some("[zsw::panel] Index buffer"),
label: Some("zsw-panel-index-buffer"),
contents: bytemuck::cast_slice(&INDICES),
usage: wgpu::BufferUsages::INDEX,
};
@ -544,14 +544,16 @@ fn create_render_pipeline(
// Load the shader
let shader_descriptor = wgpu::ShaderModuleDescriptor {
label: Some(&format!("[zsw::panel] Shader {shader_name:?}")),
label: Some(&format!("zsw-panel-shader[name={shader_name:?}]")),
source: wgpu::ShaderSource::Naga(Cow::Owned(shader_module)),
};
let shader = wgpu.device.create_shader_module(shader_descriptor);
// Create the pipeline layout
let render_pipeline_layout_descriptor = wgpu::PipelineLayoutDescriptor {
label: Some(&format!("[zsw::panel] Render pipeline {render_pipeline_name:?} layout")),
label: Some(&format!(
"zsw-panel-render-pipeline[name={render_pipeline_name:?}]-layout"
)),
bind_group_layouts,
push_constant_ranges: &[],
};
@ -563,7 +565,7 @@ fn create_render_pipeline(
write_mask: wgpu::ColorWrites::ALL,
})];
let render_pipeline_descriptor = wgpu::RenderPipelineDescriptor {
label: Some(&format!("[zsw::panel] Render pipeline {render_pipeline_name:?}")),
label: Some(&format!("zsw-panel-render-pipeline[name={render_pipeline_name:?}]")),
layout: Some(&render_pipeline_layout),
vertex: wgpu::VertexState {
@ -615,25 +617,28 @@ fn create_msaa_framebuffer(
let surface_config = wgpu_renderer.surface_config();
let msaa_frame_descriptor = wgpu::TextureDescriptor {
label: Some("zsw-panel-framebuffer-msaa"),
size: msaa_texture_extent,
mip_level_count: 1,
sample_count: msaa_samples,
dimension: wgpu::TextureDimension::D2,
format: surface_config.format,
usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
label: Some("[zsw::panel] MSAA framebuffer"),
view_formats: &surface_config.view_formats,
};
wgpu.device
.create_texture(&msaa_frame_descriptor)
.create_view(&wgpu::TextureViewDescriptor::default())
.create_view(&wgpu::TextureViewDescriptor {
label: Some("zsw-panel-framebuffer-msaa-view"),
..Default::default()
})
}
/// Creates the uniforms bind group layout
fn create_uniforms_bind_group_layout(wgpu: &Wgpu) -> wgpu::BindGroupLayout {
let descriptor = wgpu::BindGroupLayoutDescriptor {
label: Some("[zsw::panel] Geometry uniforms bind group layout"),
label: Some("zsw-panel-geometry-uniforms-bind-group-layout"),
entries: &[wgpu::BindGroupLayoutEntry {
binding: 0,
visibility: wgpu::ShaderStages::VERTEX_FRAGMENT,

9
zsw/src/panel/state/fade/images.rs
View File

@ -179,7 +179,8 @@ impl PanelFadeImages {
};
if let Some(slot) = slot {
let texture_view = match wgpu.create_texture_from_image(&res.path, image) {
let texture_label = format!("zsw-panel-fade-image-texture[path={:?}]", res.path);
let texture_view = match wgpu.create_texture_from_image(&texture_label, image) {
Ok((_, texture_view)) => texture_view,
Err(err) => {
tracing::warn!("Unable to create texture for image {:?}: {}", res.path, err.pretty());
@ -294,7 +295,7 @@ pub fn load(path: &Arc<Path>, max_image_size: u32) -> Result<DynamicImage, AppEr
/// Creates the fade image bind group layout
fn create_bind_group_layout(wgpu: &Wgpu) -> wgpu::BindGroupLayout {
let descriptor = wgpu::BindGroupLayoutDescriptor {
label: Some("[zsw::panel] Fade image bind group layout"),
label: Some("zsw-panel-fade-image-bind-group-layout"),
entries: &[
wgpu::BindGroupLayoutEntry {
binding: 0,
@ -348,6 +349,7 @@ fn create_image_bind_group(
sampler: &wgpu::Sampler,
) -> wgpu::BindGroup {
let descriptor = wgpu::BindGroupDescriptor {
label: Some("zsw-panel-fade-image-bind-group"),
layout: bind_group_layout,
entries: &[
wgpu::BindGroupEntry {
@ -367,7 +369,6 @@ fn create_image_bind_group(
resource: wgpu::BindingResource::Sampler(sampler),
},
],
label: Some("[zsw::panel] Image bind group"),
};
wgpu.device.create_bind_group(&descriptor)
}
@ -375,7 +376,7 @@ fn create_image_bind_group(
/// Creates the image sampler
fn create_image_sampler(wgpu: &Wgpu) -> wgpu::Sampler {
let descriptor = wgpu::SamplerDescriptor {
label: Some("[zsw::panel] Image sampler"),
label: Some("zsw-panel-fade-image-sampler"),
address_mode_u: wgpu::AddressMode::ClampToEdge,
address_mode_v: wgpu::AddressMode::ClampToEdge,
address_mode_w: wgpu::AddressMode::ClampToEdge,