diff --git a/player/src/lib.rs b/player/src/lib.rs index 6eeef2f82..a8ea9ad3a 100644 --- a/player/src/lib.rs +++ b/player/src/lib.rs @@ -651,7 +651,7 @@ impl Player { }) } wgc::pipeline::RenderPipelineVertexProcessor::Mesh(task_state, mesh_state) => { - let resolved_task = task_state.map(|task| wgc::pipeline::ResolvedTaskState { + let resolved_task = task_state.map(|task| wgc::pipeline::TaskState { stage: wgc::pipeline::ProgrammableStageDescriptor { module: self.resolve_shader_module_id(task.stage.module), entry_point: task.stage.entry_point, diff --git a/wgpu-core/src/device/global.rs b/wgpu-core/src/device/global.rs index 16067073f..12574c0b6 100644 --- a/wgpu-core/src/device/global.rs +++ b/wgpu-core/src/device/global.rs @@ -12,7 +12,7 @@ use crate::{ instance::{self, Adapter, Surface}, pipeline::{ self, ProgrammableStageDescriptor, RenderPipelineVertexProcessor, - ResolvedGeneralRenderPipelineDescriptor, ResolvedMeshState, ResolvedTaskState, + ResolvedGeneralRenderPipelineDescriptor, ResolvedMeshState, TaskState, }, present, resource::{ @@ -923,7 +923,7 @@ impl Global { .stage .zero_initialize_workgroup_memory, }; - Some(ResolvedTaskState { stage: state }) + Some(TaskState { stage: state }) } else { None }; diff --git a/wgpu-core/src/device/trace/record.rs b/wgpu-core/src/device/trace/record.rs index bc1606dfc..56dcae756 100644 --- a/wgpu-core/src/device/trace/record.rs +++ b/wgpu-core/src/device/trace/record.rs @@ -806,7 +806,7 @@ impl<'a> IntoTrace } } -impl<'a> IntoTrace for crate::pipeline::ResolvedTaskState<'a> { +impl<'a> IntoTrace for crate::pipeline::TaskState<'a> { type Output = crate::pipeline::TaskState<'a, PointerId>; fn into_trace(self) -> Self::Output { crate::pipeline::TaskState { diff --git a/wgpu-core/src/pipeline.rs b/wgpu-core/src/pipeline.rs index a1bb5ffa5..080015db3 100644 --- a/wgpu-core/src/pipeline.rs +++ b/wgpu-core/src/pipeline.rs @@ -618,13 +618,11 @@ pub struct FragmentState<'a, SM = Arc> { /// Describes the task shader in a mesh shader pipeline. #[derive(Clone, Debug)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -pub struct TaskState<'a, SM = ShaderModuleId> { +pub struct TaskState<'a, SM = Arc> { /// The compiled task stage and its entry point. pub stage: ProgrammableStageDescriptor<'a, SM>, } -pub type ResolvedTaskState<'a> = TaskState<'a, Arc>; - /// Describes the mesh shader in a mesh shader pipeline. #[derive(Clone, Debug)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]