Support sharing Pipeline state between TextAtlas (#95)
* Support sharing `Pipeline` state between `TextAtlas` * Keep using `Vec` for pipeline cache * Use `OnceCell` to keep `Pipeline` private * Revert "Use `OnceCell` to keep `Pipeline` private" This reverts commit 4112732b1734a3bb6b915d2103e699ef549b77c1. * Rename `Pipeline` type to `Cache`
This commit is contained in:
Héctor Ramón
GitHub
parent
670140e2a1
commit
5aed9e1477
6 changed files with 295 additions and 237 deletions
|
|
@ -1,24 +1,14 @@
|
|||
use crate::{
|
||||
text_render::ContentType, CacheKey, FontSystem, GlyphDetails, GlyphToRender, GpuCacheStatus,
|
||||
Params, SwashCache,
|
||||
text_render::ContentType, Cache, CacheKey, FontSystem, GlyphDetails, GpuCacheStatus, SwashCache,
|
||||
};
|
||||
use etagere::{size2, Allocation, BucketedAtlasAllocator};
|
||||
use lru::LruCache;
|
||||
use rustc_hash::FxHasher;
|
||||
use std::{
|
||||
borrow::Cow, collections::HashSet, hash::BuildHasherDefault, mem::size_of, num::NonZeroU64,
|
||||
sync::Arc,
|
||||
};
|
||||
use std::{collections::HashSet, hash::BuildHasherDefault, sync::Arc};
|
||||
use wgpu::{
|
||||
BindGroup, BindGroupDescriptor, BindGroupEntry, BindGroupLayout, BindGroupLayoutEntry,
|
||||
BindingResource, BindingType, BlendState, BufferBindingType, ColorTargetState, ColorWrites,
|
||||
DepthStencilState, Device, Extent3d, FilterMode, FragmentState, ImageCopyTexture,
|
||||
ImageDataLayout, MultisampleState, Origin3d, PipelineCompilationOptions, PipelineLayout,
|
||||
PipelineLayoutDescriptor, PrimitiveState, Queue, RenderPipeline, RenderPipelineDescriptor,
|
||||
Sampler, SamplerBindingType, SamplerDescriptor, ShaderModule, ShaderModuleDescriptor,
|
||||
ShaderSource, ShaderStages, Texture, TextureAspect, TextureDescriptor, TextureDimension,
|
||||
TextureFormat, TextureSampleType, TextureUsages, TextureView, TextureViewDescriptor,
|
||||
TextureViewDimension, VertexFormat, VertexState,
|
||||
BindGroup, Buffer, DepthStencilState, Device, Extent3d, ImageCopyTexture, ImageDataLayout,
|
||||
MultisampleState, Origin3d, Queue, RenderPipeline, Texture, TextureAspect, TextureDescriptor,
|
||||
TextureDimension, TextureFormat, TextureUsages, TextureView, TextureViewDescriptor,
|
||||
};
|
||||
|
||||
type Hasher = BuildHasherDefault<FxHasher>;
|
||||
|
|
@ -261,137 +251,28 @@ pub enum ColorMode {
|
|||
|
||||
/// An atlas containing a cache of rasterized glyphs that can be rendered.
|
||||
pub struct TextAtlas {
|
||||
pub(crate) cached_pipelines: Vec<(
|
||||
MultisampleState,
|
||||
Option<DepthStencilState>,
|
||||
Arc<RenderPipeline>,
|
||||
)>,
|
||||
pub(crate) bind_group: Arc<BindGroup>,
|
||||
pub(crate) bind_group_layout: BindGroupLayout,
|
||||
pub(crate) text_render_bind_group_layout: BindGroupLayout,
|
||||
pub(crate) sampler: Sampler,
|
||||
cache: Cache,
|
||||
pub(crate) bind_group: BindGroup,
|
||||
pub(crate) color_atlas: InnerAtlas,
|
||||
pub(crate) mask_atlas: InnerAtlas,
|
||||
pub(crate) pipeline_layout: PipelineLayout,
|
||||
pub(crate) shader: ShaderModule,
|
||||
pub(crate) vertex_buffers: [wgpu::VertexBufferLayout<'static>; 1],
|
||||
pub(crate) format: TextureFormat,
|
||||
pub(crate) color_mode: ColorMode,
|
||||
}
|
||||
|
||||
impl TextAtlas {
|
||||
/// Creates a new [`TextAtlas`].
|
||||
pub fn new(device: &Device, queue: &Queue, format: TextureFormat) -> Self {
|
||||
Self::with_color_mode(device, queue, format, ColorMode::Accurate)
|
||||
pub fn new(device: &Device, queue: &Queue, cache: &Cache, format: TextureFormat) -> Self {
|
||||
Self::with_color_mode(device, queue, cache, format, ColorMode::Accurate)
|
||||
}
|
||||
|
||||
/// Creates a new [`TextAtlas`] with the given [`ColorMode`].
|
||||
pub fn with_color_mode(
|
||||
device: &Device,
|
||||
queue: &Queue,
|
||||
cache: &Cache,
|
||||
format: TextureFormat,
|
||||
color_mode: ColorMode,
|
||||
) -> Self {
|
||||
let sampler = device.create_sampler(&SamplerDescriptor {
|
||||
label: Some("glyphon sampler"),
|
||||
min_filter: FilterMode::Nearest,
|
||||
mag_filter: FilterMode::Nearest,
|
||||
mipmap_filter: FilterMode::Nearest,
|
||||
lod_min_clamp: 0f32,
|
||||
lod_max_clamp: 0f32,
|
||||
..Default::default()
|
||||
});
|
||||
|
||||
// Create a render pipeline to use for rendering later
|
||||
let shader = device.create_shader_module(ShaderModuleDescriptor {
|
||||
label: Some("glyphon shader"),
|
||||
source: ShaderSource::Wgsl(Cow::Borrowed(include_str!("shader.wgsl"))),
|
||||
});
|
||||
|
||||
let vertex_buffers = [wgpu::VertexBufferLayout {
|
||||
array_stride: size_of::<GlyphToRender>() as wgpu::BufferAddress,
|
||||
step_mode: wgpu::VertexStepMode::Vertex,
|
||||
attributes: &[
|
||||
wgpu::VertexAttribute {
|
||||
format: VertexFormat::Sint32x2,
|
||||
offset: 0,
|
||||
shader_location: 0,
|
||||
},
|
||||
wgpu::VertexAttribute {
|
||||
format: VertexFormat::Uint32,
|
||||
offset: size_of::<u32>() as u64 * 2,
|
||||
shader_location: 1,
|
||||
},
|
||||
wgpu::VertexAttribute {
|
||||
format: VertexFormat::Uint32,
|
||||
offset: size_of::<u32>() as u64 * 3,
|
||||
shader_location: 2,
|
||||
},
|
||||
wgpu::VertexAttribute {
|
||||
format: VertexFormat::Uint32,
|
||||
offset: size_of::<u32>() as u64 * 4,
|
||||
shader_location: 3,
|
||||
},
|
||||
wgpu::VertexAttribute {
|
||||
format: VertexFormat::Uint32,
|
||||
offset: size_of::<u32>() as u64 * 5,
|
||||
shader_location: 4,
|
||||
},
|
||||
wgpu::VertexAttribute {
|
||||
format: VertexFormat::Float32,
|
||||
offset: size_of::<u32>() as u64 * 6,
|
||||
shader_location: 5,
|
||||
},
|
||||
],
|
||||
}];
|
||||
|
||||
let text_render_bind_group_layout =
|
||||
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
|
||||
entries: &[BindGroupLayoutEntry {
|
||||
binding: 0,
|
||||
visibility: ShaderStages::VERTEX,
|
||||
ty: BindingType::Buffer {
|
||||
ty: BufferBindingType::Uniform,
|
||||
has_dynamic_offset: false,
|
||||
min_binding_size: NonZeroU64::new(size_of::<Params>() as u64),
|
||||
},
|
||||
count: None,
|
||||
}],
|
||||
label: Some("glyphon text render bind group layout"),
|
||||
});
|
||||
|
||||
let bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
|
||||
entries: &[
|
||||
BindGroupLayoutEntry {
|
||||
binding: 0,
|
||||
visibility: ShaderStages::VERTEX | ShaderStages::FRAGMENT,
|
||||
ty: BindingType::Texture {
|
||||
multisampled: false,
|
||||
view_dimension: TextureViewDimension::D2,
|
||||
sample_type: TextureSampleType::Float { filterable: true },
|
||||
},
|
||||
count: None,
|
||||
},
|
||||
BindGroupLayoutEntry {
|
||||
binding: 1,
|
||||
visibility: ShaderStages::VERTEX | ShaderStages::FRAGMENT,
|
||||
ty: BindingType::Texture {
|
||||
multisampled: false,
|
||||
view_dimension: TextureViewDimension::D2,
|
||||
sample_type: TextureSampleType::Float { filterable: true },
|
||||
},
|
||||
count: None,
|
||||
},
|
||||
BindGroupLayoutEntry {
|
||||
binding: 2,
|
||||
visibility: ShaderStages::FRAGMENT,
|
||||
ty: BindingType::Sampler(SamplerBindingType::Filtering),
|
||||
count: None,
|
||||
},
|
||||
],
|
||||
label: Some("glyphon text atlas bind group layout"),
|
||||
});
|
||||
|
||||
let color_atlas = InnerAtlas::new(
|
||||
device,
|
||||
queue,
|
||||
|
|
@ -404,42 +285,17 @@ impl TextAtlas {
|
|||
);
|
||||
let mask_atlas = InnerAtlas::new(device, queue, Kind::Mask);
|
||||
|
||||
let bind_group = Arc::new(device.create_bind_group(&BindGroupDescriptor {
|
||||
layout: &bind_group_layout,
|
||||
entries: &[
|
||||
BindGroupEntry {
|
||||
binding: 0,
|
||||
resource: BindingResource::TextureView(&color_atlas.texture_view),
|
||||
},
|
||||
BindGroupEntry {
|
||||
binding: 1,
|
||||
resource: BindingResource::TextureView(&mask_atlas.texture_view),
|
||||
},
|
||||
BindGroupEntry {
|
||||
binding: 2,
|
||||
resource: BindingResource::Sampler(&sampler),
|
||||
},
|
||||
],
|
||||
label: Some("glyphon text atlas bind group"),
|
||||
}));
|
||||
|
||||
let pipeline_layout = device.create_pipeline_layout(&PipelineLayoutDescriptor {
|
||||
label: None,
|
||||
bind_group_layouts: &[&text_render_bind_group_layout, &bind_group_layout],
|
||||
push_constant_ranges: &[],
|
||||
});
|
||||
let bind_group = cache.create_atlas_bind_group(
|
||||
device,
|
||||
&color_atlas.texture_view,
|
||||
&mask_atlas.texture_view,
|
||||
);
|
||||
|
||||
Self {
|
||||
cached_pipelines: Vec::new(),
|
||||
text_render_bind_group_layout,
|
||||
cache: cache.clone(),
|
||||
bind_group,
|
||||
bind_group_layout,
|
||||
sampler,
|
||||
color_atlas,
|
||||
mask_atlas,
|
||||
pipeline_layout,
|
||||
shader,
|
||||
vertex_buffers,
|
||||
format,
|
||||
color_mode,
|
||||
}
|
||||
|
|
@ -485,65 +341,24 @@ impl TextAtlas {
|
|||
}
|
||||
|
||||
pub(crate) fn get_or_create_pipeline(
|
||||
&mut self,
|
||||
&self,
|
||||
device: &Device,
|
||||
multisample: MultisampleState,
|
||||
depth_stencil: Option<DepthStencilState>,
|
||||
) -> Arc<RenderPipeline> {
|
||||
self.cached_pipelines
|
||||
.iter()
|
||||
.find(|(ms, ds, _)| ms == &multisample && ds == &depth_stencil)
|
||||
.map(|(_, _, p)| Arc::clone(p))
|
||||
.unwrap_or_else(|| {
|
||||
let pipeline = Arc::new(device.create_render_pipeline(&RenderPipelineDescriptor {
|
||||
label: Some("glyphon pipeline"),
|
||||
layout: Some(&self.pipeline_layout),
|
||||
vertex: VertexState {
|
||||
module: &self.shader,
|
||||
entry_point: "vs_main",
|
||||
buffers: &self.vertex_buffers,
|
||||
compilation_options: PipelineCompilationOptions::default(),
|
||||
},
|
||||
fragment: Some(FragmentState {
|
||||
module: &self.shader,
|
||||
entry_point: "fs_main",
|
||||
targets: &[Some(ColorTargetState {
|
||||
format: self.format,
|
||||
blend: Some(BlendState::ALPHA_BLENDING),
|
||||
write_mask: ColorWrites::default(),
|
||||
})],
|
||||
compilation_options: PipelineCompilationOptions::default(),
|
||||
}),
|
||||
primitive: PrimitiveState::default(),
|
||||
depth_stencil: depth_stencil.clone(),
|
||||
multisample,
|
||||
multiview: None,
|
||||
}));
|
||||
self.cache
|
||||
.get_or_create_pipeline(device, self.format, multisample, depth_stencil)
|
||||
}
|
||||
|
||||
self.cached_pipelines
|
||||
.push((multisample, depth_stencil, pipeline.clone()));
|
||||
pipeline
|
||||
})
|
||||
pub(crate) fn create_uniforms_bind_group(&self, device: &Device, buffer: &Buffer) -> BindGroup {
|
||||
self.cache.create_uniforms_bind_group(device, buffer)
|
||||
}
|
||||
|
||||
fn rebind(&mut self, device: &wgpu::Device) {
|
||||
self.bind_group = Arc::new(device.create_bind_group(&BindGroupDescriptor {
|
||||
layout: &self.bind_group_layout,
|
||||
entries: &[
|
||||
BindGroupEntry {
|
||||
binding: 0,
|
||||
resource: BindingResource::TextureView(&self.color_atlas.texture_view),
|
||||
},
|
||||
BindGroupEntry {
|
||||
binding: 1,
|
||||
resource: BindingResource::TextureView(&self.mask_atlas.texture_view),
|
||||
},
|
||||
BindGroupEntry {
|
||||
binding: 2,
|
||||
resource: BindingResource::Sampler(&self.sampler),
|
||||
},
|
||||
],
|
||||
label: Some("glyphon bind group"),
|
||||
}));
|
||||
self.bind_group = self.cache.create_atlas_bind_group(
|
||||
device,
|
||||
&self.color_atlas.texture_view,
|
||||
&self.mask_atlas.texture_view,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue