diff --git a/deno_webgpu/device.rs b/deno_webgpu/device.rs index 9cfab48cf..4e4b8035f 100644 --- a/deno_webgpu/device.rs +++ b/deno_webgpu/device.rs @@ -749,18 +749,17 @@ impl GPUDevice { GPUComputePipeline, Option, ) { - let wgpu_descriptor = - wgpu_core::pipeline::ResolvedComputePipelineDescriptor { - label: crate::transform_label(descriptor.label.clone()), - layout: descriptor.layout.into(), - stage: ProgrammableStageDescriptor { - module: descriptor.compute.module.wgpu_shader_module.clone(), - entry_point: descriptor.compute.entry_point.map(Into::into), - constants: descriptor.compute.constants.into_iter().collect(), - zero_initialize_workgroup_memory: true, - }, - cache: None, - }; + let wgpu_descriptor = wgpu_core::pipeline::ComputePipelineDescriptor { + label: crate::transform_label(descriptor.label.clone()), + layout: descriptor.layout.into(), + stage: ProgrammableStageDescriptor { + module: descriptor.compute.module.wgpu_shader_module.clone(), + entry_point: descriptor.compute.entry_point.map(Into::into), + constants: descriptor.compute.constants.into_iter().collect(), + zero_initialize_workgroup_memory: true, + }, + cache: None, + }; let (wgpu_compute_pipeline, err) = self.wgpu_device.create_compute_pipeline(wgpu_descriptor); diff --git a/player/src/lib.rs b/player/src/lib.rs index 417d92dd6..0c7a59641 100644 --- a/player/src/lib.rs +++ b/player/src/lib.rs @@ -616,8 +616,8 @@ impl Player { fn resolve_compute_pipeline_descriptor<'a>( &self, desc: wgc::device::trace::TraceComputePipelineDescriptor<'a>, - ) -> wgc::pipeline::ResolvedComputePipelineDescriptor<'a> { - wgc::pipeline::ResolvedComputePipelineDescriptor { + ) -> wgc::pipeline::ComputePipelineDescriptor<'a> { + wgc::pipeline::ComputePipelineDescriptor { label: desc.label, layout: desc.layout.map(|id| self.resolve_pipeline_layout_id(id)), stage: wgc::pipeline::ProgrammableStageDescriptor { diff --git a/wgpu-core/src/device/global.rs b/wgpu-core/src/device/global.rs index 0d351f2b3..b45c94066 100644 --- a/wgpu-core/src/device/global.rs +++ b/wgpu-core/src/device/global.rs @@ -11,8 +11,7 @@ use crate::{ id::{self, AdapterId, DeviceId, QueueId, SurfaceId}, instance::{self, Adapter, Surface}, pipeline::{ - self, ProgrammableStageDescriptor, RenderPipelineVertexProcessor, - ResolvedComputePipelineDescriptor, ResolvedFragmentState, + self, ProgrammableStageDescriptor, RenderPipelineVertexProcessor, ResolvedFragmentState, ResolvedGeneralRenderPipelineDescriptor, ResolvedMeshState, ResolvedTaskState, ResolvedVertexState, }, @@ -56,6 +55,13 @@ pub type BindingResource<'a> = binding_model::BindingResource< id::ExternalTextureId, >; +pub type ComputePipelineDescriptor<'a> = pipeline::ComputePipelineDescriptor< + 'a, + id::PipelineLayoutId, + id::ShaderModuleId, + id::PipelineCacheId, +>; + impl Global { pub fn adapter_is_surface_supported( &self, @@ -1003,7 +1009,7 @@ impl Global { pub fn device_create_compute_pipeline( &self, device_id: DeviceId, - desc: &pipeline::ComputePipelineDescriptor, + desc: &ComputePipelineDescriptor, id_in: Option, ) -> ( id::ComputePipelineId, @@ -1028,7 +1034,7 @@ impl Global { zero_initialize_workgroup_memory: desc.stage.zero_initialize_workgroup_memory, }; - let desc = ResolvedComputePipelineDescriptor { + let desc = pipeline::ComputePipelineDescriptor { label: desc.label.clone(), layout, stage, diff --git a/wgpu-core/src/device/resource.rs b/wgpu-core/src/device/resource.rs index 56b0bae5f..578051fda 100644 --- a/wgpu-core/src/device/resource.rs +++ b/wgpu-core/src/device/resource.rs @@ -4269,7 +4269,7 @@ impl Device { pub fn create_compute_pipeline( self: &Arc, - desc: pipeline::ResolvedComputePipelineDescriptor, + desc: pipeline::ComputePipelineDescriptor, ) -> ( Arc, Option, @@ -4300,7 +4300,7 @@ impl Device { pub fn create_compute_pipeline_inner( self: &Arc, - desc: pipeline::ResolvedComputePipelineDescriptor, + desc: pipeline::ComputePipelineDescriptor, ) -> Result, pipeline::CreateComputePipelineError> { self.check_is_valid()?; diff --git a/wgpu-core/src/device/trace/record.rs b/wgpu-core/src/device/trace/record.rs index 4106f169b..d6f38bc4b 100644 --- a/wgpu-core/src/device/trace/record.rs +++ b/wgpu-core/src/device/trace/record.rs @@ -760,7 +760,7 @@ impl<'a> IntoTrace for crate::pipeline::ResolvedGeneralRenderPipelineDescriptor< } } -impl<'a> IntoTrace for crate::pipeline::ResolvedComputePipelineDescriptor<'a> { +impl<'a> IntoTrace for crate::pipeline::ComputePipelineDescriptor<'a> { type Output = TraceComputePipelineDescriptor<'a>; fn into_trace(self) -> Self::Output { diff --git a/wgpu-core/src/pipeline.rs b/wgpu-core/src/pipeline.rs index e5bdea7f4..43cc30f4b 100644 --- a/wgpu-core/src/pipeline.rs +++ b/wgpu-core/src/pipeline.rs @@ -302,11 +302,12 @@ impl WebGpuError for ImplicitLayoutError { /// Describes a compute pipeline. #[derive(Clone, Debug)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +/// cbindgen:ignore pub struct ComputePipelineDescriptor< 'a, - PLL = PipelineLayoutId, - SM = ShaderModuleId, - PLC = PipelineCacheId, + PLL = Arc, + SM = Arc, + PLC = Arc, > { pub label: Label<'a>, /// The layout of bind groups for this pipeline. @@ -317,10 +318,6 @@ pub struct ComputePipelineDescriptor< pub cache: Option, } -/// cbindgen:ignore -pub type ResolvedComputePipelineDescriptor<'a> = - ComputePipelineDescriptor<'a, Arc, Arc, Arc>; - #[derive(Clone, Debug, Error)] #[non_exhaustive] pub enum CreateComputePipelineError {