diff --git a/player/src/lib.rs b/player/src/lib.rs index a8ea9ad3a..fb5e4d9c5 100644 --- a/player/src/lib.rs +++ b/player/src/lib.rs @@ -661,7 +661,7 @@ impl Player { .zero_initialize_workgroup_memory, }, }); - let resolved_mesh = wgc::pipeline::ResolvedMeshState { + let resolved_mesh = wgc::pipeline::MeshState { stage: wgc::pipeline::ProgrammableStageDescriptor { module: self.resolve_shader_module_id(mesh_state.stage.module), entry_point: mesh_state.stage.entry_point, diff --git a/wgpu-core/src/device/global.rs b/wgpu-core/src/device/global.rs index 12574c0b6..d330b46cd 100644 --- a/wgpu-core/src/device/global.rs +++ b/wgpu-core/src/device/global.rs @@ -11,8 +11,8 @@ use crate::{ id::{self, AdapterId, DeviceId, QueueId, SurfaceId}, instance::{self, Adapter, Surface}, pipeline::{ - self, ProgrammableStageDescriptor, RenderPipelineVertexProcessor, - ResolvedGeneralRenderPipelineDescriptor, ResolvedMeshState, TaskState, + self, MeshState, ProgrammableStageDescriptor, RenderPipelineVertexProcessor, + ResolvedGeneralRenderPipelineDescriptor, TaskState, }, present, resource::{ @@ -934,10 +934,7 @@ impl Global { constants: mesh.stage.constants.clone(), zero_initialize_workgroup_memory: mesh.stage.zero_initialize_workgroup_memory, }; - RenderPipelineVertexProcessor::Mesh( - task_module, - ResolvedMeshState { stage: mesh_stage }, - ) + RenderPipelineVertexProcessor::Mesh(task_module, MeshState { stage: mesh_stage }) } }; diff --git a/wgpu-core/src/device/trace/record.rs b/wgpu-core/src/device/trace/record.rs index 56dcae756..176de8cf1 100644 --- a/wgpu-core/src/device/trace/record.rs +++ b/wgpu-core/src/device/trace/record.rs @@ -815,7 +815,7 @@ impl<'a> IntoTrace for crate::pipeline::TaskState<'a> { } } -impl<'a> IntoTrace for crate::pipeline::ResolvedMeshState<'a> { +impl<'a> IntoTrace for crate::pipeline::MeshState<'a> { type Output = crate::pipeline::MeshState<'a, PointerId>; fn into_trace(self) -> Self::Output { crate::pipeline::MeshState { diff --git a/wgpu-core/src/pipeline.rs b/wgpu-core/src/pipeline.rs index 080015db3..9f10011f5 100644 --- a/wgpu-core/src/pipeline.rs +++ b/wgpu-core/src/pipeline.rs @@ -626,13 +626,11 @@ pub struct TaskState<'a, SM = Arc> { /// Describes the mesh shader in a mesh shader pipeline. #[derive(Clone, Debug)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] -pub struct MeshState<'a, SM = ShaderModuleId> { +pub struct MeshState<'a, SM = Arc> { /// The compiled mesh stage and its entry point. pub stage: ProgrammableStageDescriptor<'a, SM>, } -pub type ResolvedMeshState<'a> = MeshState<'a, Arc>; - /// Describes a vertex processor for either a conventional or mesh shading /// pipeline architecture. ///