From 40f5763e7289c210aeff9f48256363dee091e93a Mon Sep 17 00:00:00 2001 From: sagudev <16504129+sagudev@users.noreply.github.com> Date: Fri, 7 Feb 2025 10:39:47 +0100 Subject: [PATCH] Unify `ResolvedFragmentState` into `FragmentState` Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --- wgpu-core/src/pipeline.rs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/wgpu-core/src/pipeline.rs b/wgpu-core/src/pipeline.rs index e7d6e17dab..595e7e1068 100644 --- a/wgpu-core/src/pipeline.rs +++ b/wgpu-core/src/pipeline.rs @@ -316,21 +316,14 @@ pub type ResolvedVertexState<'a> = VertexState<'a, Arc>; /// Describes fragment processing in a render pipeline. #[derive(Clone, Debug)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -pub struct FragmentState<'a> { +pub struct FragmentState<'a, SM = ShaderModuleId> { /// The compiled fragment stage and its entry point. - pub stage: ProgrammableStageDescriptor<'a>, + pub stage: ProgrammableStageDescriptor<'a, SM>, /// The effect of draw calls on the color aspect of the output target. pub targets: Cow<'a, [Option]>, } -/// Describes fragment processing in a render pipeline. -#[derive(Clone, Debug)] -pub struct ResolvedFragmentState<'a> { - /// The compiled fragment stage and its entry point. - pub stage: ResolvedProgrammableStageDescriptor<'a>, - /// The effect of draw calls on the color aspect of the output target. - pub targets: Cow<'a, [Option]>, -} +pub type ResolvedFragmentState<'a> = FragmentState<'a, Arc>; /// Describes a render (graphics) pipeline. #[derive(Clone, Debug)]