diff --git a/player/src/lib.rs b/player/src/lib.rs index 40cc30ff8..6eeef2f82 100644 --- a/player/src/lib.rs +++ b/player/src/lib.rs @@ -677,7 +677,7 @@ impl Player { let fragment = desc .fragment - .map(|fragment_state| wgc::pipeline::ResolvedFragmentState { + .map(|fragment_state| wgc::pipeline::FragmentState { stage: wgc::pipeline::ProgrammableStageDescriptor { module: self.resolve_shader_module_id(fragment_state.stage.module), entry_point: fragment_state.stage.entry_point, diff --git a/wgpu-core/src/device/global.rs b/wgpu-core/src/device/global.rs index e82fe1a3a..16067073f 100644 --- a/wgpu-core/src/device/global.rs +++ b/wgpu-core/src/device/global.rs @@ -11,7 +11,7 @@ use crate::{ id::{self, AdapterId, DeviceId, QueueId, SurfaceId}, instance::{self, Adapter, Surface}, pipeline::{ - self, ProgrammableStageDescriptor, RenderPipelineVertexProcessor, ResolvedFragmentState, + self, ProgrammableStageDescriptor, RenderPipelineVertexProcessor, ResolvedGeneralRenderPipelineDescriptor, ResolvedMeshState, ResolvedTaskState, }, present, @@ -950,7 +950,7 @@ impl Global { constants: state.stage.constants.clone(), zero_initialize_workgroup_memory: state.stage.zero_initialize_workgroup_memory, }; - Some(ResolvedFragmentState { + Some(pipeline::FragmentState { stage, targets: state.targets.clone(), }) diff --git a/wgpu-core/src/device/trace/record.rs b/wgpu-core/src/device/trace/record.rs index ca4cfdab5..bc1606dfc 100644 --- a/wgpu-core/src/device/trace/record.rs +++ b/wgpu-core/src/device/trace/record.rs @@ -834,7 +834,7 @@ impl<'a> IntoTrace for crate::pipeline::VertexState<'a> { } } -impl<'a> IntoTrace for crate::pipeline::ResolvedFragmentState<'a> { +impl<'a> IntoTrace for crate::pipeline::FragmentState<'a> { type Output = crate::pipeline::FragmentState<'a, PointerId>; fn into_trace(self) -> Self::Output { crate::pipeline::FragmentState { diff --git a/wgpu-core/src/pipeline.rs b/wgpu-core/src/pipeline.rs index 327254533..a1bb5ffa5 100644 --- a/wgpu-core/src/pipeline.rs +++ b/wgpu-core/src/pipeline.rs @@ -607,16 +607,14 @@ pub struct VertexState<'a, SM = Arc> { /// Describes fragment processing in a render pipeline. #[derive(Clone, Debug)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -pub struct FragmentState<'a, SM = ShaderModuleId> { +/// cbindgen:ignore +pub struct FragmentState<'a, SM = Arc> { /// The compiled fragment stage and its entry point. pub stage: ProgrammableStageDescriptor<'a, SM>, /// The effect of draw calls on the color aspect of the output target. pub targets: Cow<'a, [Option]>, } -/// cbindgen:ignore -pub type ResolvedFragmentState<'a> = FragmentState<'a, Arc>; - /// Describes the task shader in a mesh shader pipeline. #[derive(Clone, Debug)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]