mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-20 22:41:07 +01:00
Create implicit layouts for render pipelines
This commit is contained in:
1 parent
a9b8a99e19
commit
173c7c3dbf
5 files changed
+181
-26
No files matched your search
+1
-1
@@ -256,7 +256,7 @@ impl GlobalPlay for wgc::hub::Global<IdentityPassThroughFactory> {
|
||||
}
|
||||
A::CreateRenderPipeline(id, desc) => {
|
||||
self.device_maintain_ids::<B>(device).unwrap();
|
||||
self.device_create_render_pipeline::<B>(device, &desc, id)
|
||||
self.device_create_render_pipeline::<B>(device, &desc, id, None)
|
||||
.unwrap();
|
||||
}
|
||||
A::DestroyRenderPipeline(id) => {
|
||||
|
||||
+168
-21
@@ -2420,7 +2420,9 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
|
||||
device_id: id::DeviceId,
|
||||
desc: &pipeline::RenderPipelineDescriptor,
|
||||
id_in: Input<G, id::RenderPipelineId>,
|
||||
) -> Result<id::RenderPipelineId, pipeline::CreateRenderPipelineError> {
|
||||
implicit_pipeline_ids: Option<ImplicitPipelineIds<G>>,
|
||||
) -> Result<(id::RenderPipelineId, DerivedBindGroupCount), pipeline::CreateRenderPipelineError>
|
||||
{
|
||||
span!(_guard, INFO, "Device::create_render_pipeline");
|
||||
|
||||
let hub = B::hub(self);
|
||||
@@ -2546,17 +2548,18 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
|
||||
));
|
||||
}
|
||||
|
||||
let (raw_pipeline, layout_ref_count) = {
|
||||
let (pipeline_layout_guard, mut token) = hub.pipeline_layouts.read(&mut token);
|
||||
let (bgl_guard, mut token) = hub.bind_group_layouts.read(&mut token);
|
||||
let layout = pipeline_layout_guard
|
||||
.get(desc.layout)
|
||||
.map_err(|_| pipeline::CreateRenderPipelineError::InvalidLayout)?;
|
||||
let group_layouts = layout
|
||||
.bind_group_layout_ids
|
||||
.iter()
|
||||
.map(|&id| &bgl_guard[id].entries)
|
||||
.collect::<ArrayVec<[&binding_model::BindEntryMap; MAX_BIND_GROUPS]>>();
|
||||
let (raw_pipeline, layout_id, layout_ref_count, derived_bind_group_count) = {
|
||||
//TODO: only lock mutable if the layout is derived
|
||||
let (mut pipeline_layout_guard, mut token) = hub.pipeline_layouts.write(&mut token);
|
||||
let (mut bgl_guard, mut token) = hub.bind_group_layouts.write(&mut token);
|
||||
|
||||
let mut derived_group_layouts =
|
||||
ArrayVec::<[binding_model::BindEntryMap; MAX_BIND_GROUPS]>::new();
|
||||
if desc.layout.is_none() {
|
||||
for _ in 0..device.limits.max_bind_groups {
|
||||
derived_group_layouts.push(binding_model::BindEntryMap::default());
|
||||
}
|
||||
}
|
||||
|
||||
let (shader_module_guard, _) = hub.shader_modules.read(&mut token);
|
||||
|
||||
@@ -2610,9 +2613,29 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
|
||||
})?;
|
||||
|
||||
if let Some(ref module) = shader_module.module {
|
||||
let given_group_layouts: ArrayVec<
|
||||
[&binding_model::BindEntryMap; MAX_BIND_GROUPS],
|
||||
>;
|
||||
let group_layouts = match desc.layout {
|
||||
Some(pipeline_layout_id) => {
|
||||
let layout = pipeline_layout_guard
|
||||
.get(pipeline_layout_id)
|
||||
.map_err(|_| pipeline::CreateRenderPipelineError::InvalidLayout)?;
|
||||
given_group_layouts = layout
|
||||
.bind_group_layout_ids
|
||||
.iter()
|
||||
.map(|&id| &bgl_guard[id].entries)
|
||||
.collect();
|
||||
validation::IntrospectionBindGroupLayouts::Given(&given_group_layouts)
|
||||
}
|
||||
None => validation::IntrospectionBindGroupLayouts::Derived(
|
||||
&mut derived_group_layouts,
|
||||
),
|
||||
};
|
||||
|
||||
interface = validation::check_stage(
|
||||
module,
|
||||
validation::IntrospectionBindGroupLayouts::Given(&group_layouts),
|
||||
group_layouts,
|
||||
&entry_point_name,
|
||||
naga::ShaderStage::Vertex,
|
||||
interface,
|
||||
@@ -2640,11 +2663,31 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
|
||||
}
|
||||
})?;
|
||||
|
||||
let given_group_layouts: ArrayVec<
|
||||
[&binding_model::BindEntryMap; MAX_BIND_GROUPS],
|
||||
>;
|
||||
let group_layouts = match desc.layout {
|
||||
Some(pipeline_layout_id) => {
|
||||
let layout = pipeline_layout_guard
|
||||
.get(pipeline_layout_id)
|
||||
.map_err(|_| pipeline::CreateRenderPipelineError::InvalidLayout)?;
|
||||
given_group_layouts = layout
|
||||
.bind_group_layout_ids
|
||||
.iter()
|
||||
.map(|&id| &bgl_guard[id].entries)
|
||||
.collect();
|
||||
validation::IntrospectionBindGroupLayouts::Given(&given_group_layouts)
|
||||
}
|
||||
None => validation::IntrospectionBindGroupLayouts::Derived(
|
||||
&mut derived_group_layouts,
|
||||
),
|
||||
};
|
||||
|
||||
if validated_stages == wgt::ShaderStage::VERTEX {
|
||||
if let Some(ref module) = shader_module.module {
|
||||
interface = validation::check_stage(
|
||||
module,
|
||||
validation::IntrospectionBindGroupLayouts::Given(&group_layouts),
|
||||
group_layouts,
|
||||
&entry_point_name,
|
||||
naga::ShaderStage::Fragment,
|
||||
interface,
|
||||
@@ -2682,6 +2725,9 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
|
||||
);
|
||||
}
|
||||
}
|
||||
} else if desc.layout.is_none() {
|
||||
tracing::error!("Shader failed to validate, unable to derive the implicit layout!");
|
||||
return Err(pipeline::CreateRenderPipelineError::InvalidLayout);
|
||||
}
|
||||
|
||||
let shaders = hal::pso::GraphicsShaderSet {
|
||||
@@ -2694,6 +2740,95 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
|
||||
|
||||
// TODO
|
||||
let flags = hal::pso::PipelineCreationFlags::empty();
|
||||
// TODO
|
||||
let parent = hal::pso::BasePipeline::None;
|
||||
|
||||
let derived_bind_group_count = derived_group_layouts.len() as DerivedBindGroupCount;
|
||||
|
||||
let pipeline_layout_id = match desc.layout {
|
||||
Some(id) => id,
|
||||
None => {
|
||||
while derived_group_layouts
|
||||
.last()
|
||||
.map_or(false, |map| map.is_empty())
|
||||
{
|
||||
derived_group_layouts.pop();
|
||||
}
|
||||
let ids = implicit_pipeline_ids
|
||||
.as_ref()
|
||||
.ok_or(pipeline::CreateRenderPipelineError::InvalidLayout)?;
|
||||
if ids.group_ids.len() < derived_group_layouts.len() {
|
||||
tracing::error!(
|
||||
"Not enough bind group IDs ({}) specified for the implicit layout ({})",
|
||||
ids.group_ids.len(),
|
||||
derived_group_layouts.len()
|
||||
);
|
||||
return Err(pipeline::CreateRenderPipelineError::InvalidLayout);
|
||||
}
|
||||
|
||||
let mut derived_group_layout_ids =
|
||||
ArrayVec::<[id::BindGroupLayoutId; MAX_BIND_GROUPS]>::new();
|
||||
for (bgl_id, map) in ids.group_ids.iter().zip(derived_group_layouts) {
|
||||
let processed_id = match Device::deduplicate_bind_group_layout(
|
||||
device_id,
|
||||
&map,
|
||||
&*bgl_guard,
|
||||
) {
|
||||
Some(dedup_id) => dedup_id,
|
||||
None => {
|
||||
#[cfg(feature = "trace")]
|
||||
let bgl_desc = wgt::BindGroupLayoutDescriptor {
|
||||
label: None,
|
||||
entries: if device.trace.is_some() {
|
||||
Cow::Owned(map.values().cloned().collect())
|
||||
} else {
|
||||
Cow::Borrowed(&[])
|
||||
},
|
||||
};
|
||||
let bgl = device.create_bind_group_layout(device_id, None, map)?;
|
||||
let out_id = hub.bind_group_layouts.register_identity_locked(
|
||||
bgl_id.clone(),
|
||||
bgl,
|
||||
&mut *bgl_guard,
|
||||
);
|
||||
#[cfg(feature = "trace")]
|
||||
match device.trace {
|
||||
Some(ref trace) => trace.lock().add(
|
||||
trace::Action::CreateBindGroupLayout(out_id.0, bgl_desc),
|
||||
),
|
||||
None => (),
|
||||
};
|
||||
out_id.0
|
||||
}
|
||||
};
|
||||
derived_group_layout_ids.push(processed_id);
|
||||
}
|
||||
|
||||
let layout_desc = wgt::PipelineLayoutDescriptor {
|
||||
bind_group_layouts: Cow::Borrowed(&derived_group_layout_ids),
|
||||
push_constant_ranges: Cow::Borrowed(&[]), //TODO?
|
||||
};
|
||||
let layout =
|
||||
device.create_pipeline_layout(device_id, &layout_desc, &*bgl_guard)?;
|
||||
let layout_id = hub.pipeline_layouts.register_identity_locked(
|
||||
ids.root_id.clone(),
|
||||
layout,
|
||||
&mut *pipeline_layout_guard,
|
||||
);
|
||||
#[cfg(feature = "trace")]
|
||||
match device.trace {
|
||||
Some(ref trace) => trace.lock().add(trace::Action::CreatePipelineLayout(
|
||||
layout_id.0,
|
||||
layout_desc,
|
||||
)),
|
||||
None => (),
|
||||
};
|
||||
layout_id.0
|
||||
}
|
||||
};
|
||||
let layout = pipeline_layout_guard
|
||||
.get(pipeline_layout_id)
|
||||
.map_err(|_| pipeline::CreateRenderPipelineError::InvalidLayout)?;
|
||||
|
||||
let mut render_pass_cache = device.render_passes.lock();
|
||||
let pipeline_desc = hal::pso::GraphicsPipelineDesc {
|
||||
@@ -2720,7 +2855,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
|
||||
},
|
||||
},
|
||||
flags,
|
||||
parent: hal::pso::BasePipeline::None,
|
||||
parent,
|
||||
};
|
||||
// TODO: cache
|
||||
let pipeline = unsafe {
|
||||
@@ -2733,7 +2868,12 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
|
||||
})?
|
||||
};
|
||||
|
||||
(pipeline, layout.life_guard.add_ref())
|
||||
(
|
||||
pipeline,
|
||||
pipeline_layout_id,
|
||||
layout.life_guard.add_ref(),
|
||||
derived_bind_group_count,
|
||||
)
|
||||
};
|
||||
|
||||
let pass_context = RenderPassContext {
|
||||
@@ -2765,7 +2905,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
|
||||
let pipeline = pipeline::RenderPipeline {
|
||||
raw: raw_pipeline,
|
||||
layout_id: Stored {
|
||||
value: id::Valid(desc.layout),
|
||||
value: id::Valid(layout_id),
|
||||
ref_count: layout_ref_count,
|
||||
},
|
||||
device_id: Stored {
|
||||
@@ -2785,12 +2925,16 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
|
||||
|
||||
#[cfg(feature = "trace")]
|
||||
match device.trace {
|
||||
Some(ref trace) => trace
|
||||
.lock()
|
||||
.add(trace::Action::CreateRenderPipeline(id.0, desc.clone())),
|
||||
Some(ref trace) => trace.lock().add(trace::Action::CreateRenderPipeline(
|
||||
id.0,
|
||||
wgt::RenderPipelineDescriptor {
|
||||
layout: Some(layout_id),
|
||||
..desc.clone()
|
||||
},
|
||||
)),
|
||||
None => (),
|
||||
};
|
||||
Ok(id.0)
|
||||
Ok((id.0, derived_bind_group_count))
|
||||
}
|
||||
|
||||
pub fn render_pipeline_error<B: GfxBackend>(
|
||||
@@ -2904,6 +3048,9 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
|
||||
interface,
|
||||
)
|
||||
.map_err(pipeline::CreateComputePipelineError::Stage)?;
|
||||
} else if desc.layout.is_none() {
|
||||
tracing::error!("Shader failed to validate, unable to derive the implicit layout!");
|
||||
return Err(pipeline::CreateComputePipelineError::InvalidLayout);
|
||||
}
|
||||
|
||||
let shader = hal::pso::EntryPoint::<B> {
|
||||
|
||||
@@ -78,6 +78,10 @@ pub enum CreateRenderPipelineError {
|
||||
Device(#[from] DeviceError),
|
||||
#[error("pipelie layout is invalid")]
|
||||
InvalidLayout,
|
||||
#[error("implicit bind group layout failed to validate")]
|
||||
ImplicitBindGroupLayout(#[from] CreateBindGroupLayoutError),
|
||||
#[error("implicit pipeline layout failed to validate")]
|
||||
ImplicitPipelineLayout(#[from] CreatePipelineLayoutError),
|
||||
#[error("incompatible output format at index {index}")]
|
||||
IncompatibleOutputFormat { index: u8 },
|
||||
#[error("invalid sample count {0}")]
|
||||
|
||||
@@ -755,7 +755,7 @@ fn derive_binding_type(
|
||||
|
||||
pub fn check_stage<'a>(
|
||||
module: &'a naga::Module,
|
||||
mut group_layouts: IntrospectionBindGroupLayouts<'a>,
|
||||
mut group_layouts: IntrospectionBindGroupLayouts,
|
||||
entry_point_name: &str,
|
||||
stage: naga::ShaderStage,
|
||||
inputs: StageInterface<'a>,
|
||||
|
||||
@@ -2104,7 +2104,7 @@ impl<'a, M> ProgrammableStageDescriptor<'a, M> {
|
||||
#[cfg_attr(feature = "replay", derive(serde::Deserialize))]
|
||||
pub struct RenderPipelineDescriptor<'a, L, D> {
|
||||
/// The layout of bind groups for this pipeline.
|
||||
pub layout: L,
|
||||
pub layout: Option<L>,
|
||||
/// The compiled vertex stage and its entry point.
|
||||
pub vertex_stage: D,
|
||||
/// The compiled fragment stage and its entry point, if any.
|
||||
@@ -2136,14 +2136,13 @@ pub struct RenderPipelineDescriptor<'a, L, D> {
|
||||
|
||||
impl<'a, L, D> RenderPipelineDescriptor<'a, L, D> {
|
||||
pub fn new(
|
||||
layout: L,
|
||||
vertex_stage: D,
|
||||
primitive_topology: PrimitiveTopology,
|
||||
color_states: impl IntoCow<'a, [ColorStateDescriptor]>,
|
||||
vertex_state: VertexStateDescriptor<'a>,
|
||||
) -> Self {
|
||||
Self {
|
||||
layout,
|
||||
layout: None,
|
||||
vertex_stage,
|
||||
fragment_stage: None,
|
||||
rasterization_state: None,
|
||||
@@ -2157,6 +2156,11 @@ impl<'a, L, D> RenderPipelineDescriptor<'a, L, D> {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn layout(&mut self, layout: L) -> &mut Self {
|
||||
self.layout = Some(layout);
|
||||
self
|
||||
}
|
||||
|
||||
pub fn fragment_stage(&mut self, stage: D) -> &mut Self {
|
||||
self.fragment_stage = Some(stage);
|
||||
self
|
||||
|
||||
Reference in new issue
Block a user