[core] Do not use IDs as default type

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

Author: sagudev

player/src/lib.rs

@@ -213,7 +213,7 @@ impl Player {
                     .map(|bgl_id| bgl_id.map(|bgl_id| self.resolve_bind_group_layout_id(bgl_id)))
                     .collect();
 
-                let resolved_desc = wgc::binding_model::ResolvedPipelineLayoutDescriptor {
+                let resolved_desc = wgc::binding_model::PipelineLayoutDescriptor {
                     label: desc.label.clone(),
                     bind_group_layouts: Cow::from(&bind_group_layouts),
                     immediate_size: desc.immediate_size,

wgpu-core/src/binding_model.rs

@@ -999,7 +999,7 @@ impl WebGpuError for ImmediateUploadError {
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "serde", serde(bound = "BGL: Serialize"))]
-pub struct PipelineLayoutDescriptor<'a, BGL = BindGroupLayoutId>
+pub struct PipelineLayoutDescriptor<'a, BGL = Arc<BindGroupLayout>>
 where
     [Option<BGL>]: ToOwned,
     <[Option<BGL>] as ToOwned>::Owned: fmt::Debug,
@@ -1023,10 +1023,6 @@ where
     pub immediate_size: u32,
 }
 
-/// cbindgen:ignore
-pub type ResolvedPipelineLayoutDescriptor<'a, BGL = Arc<BindGroupLayout>> =
-    PipelineLayoutDescriptor<'a, BGL>;
-
 #[derive(Debug)]
 pub struct PipelineLayout {
     pub(crate) raw: ResourceState<Box<dyn hal::DynPipelineLayout>>,

wgpu-core/src/device/global.rs

@@ -442,7 +442,7 @@ impl Global {
     pub fn device_create_pipeline_layout(
         &self,
         device_id: DeviceId,
-        desc: &binding_model::PipelineLayoutDescriptor,
+        desc: &binding_model::PipelineLayoutDescriptor<id::BindGroupLayoutId>,
         id_in: Option<id::PipelineLayoutId>,
     ) -> (
         id::PipelineLayoutId,
@@ -461,7 +461,7 @@ impl Global {
                 .collect::<Vec<_>>()
         };
 
-        let desc = binding_model::ResolvedPipelineLayoutDescriptor {
+        let desc = binding_model::PipelineLayoutDescriptor {
             label: desc.label.clone(),
             bind_group_layouts: Cow::Owned(bind_group_layouts),
             immediate_size: desc.immediate_size,

wgpu-core/src/device/resource.rs

@@ -4022,7 +4022,7 @@ impl Device {
 
     pub fn create_pipeline_layout(
         self: &Arc<Self>,
-        desc: &binding_model::ResolvedPipelineLayoutDescriptor,
+        desc: &binding_model::PipelineLayoutDescriptor,
     ) -> (
         Arc<binding_model::PipelineLayout>,
         Option<binding_model::CreatePipelineLayoutError>,
@@ -4052,7 +4052,7 @@ impl Device {
 
     fn create_pipeline_layout_impl(
         self: &Arc<Self>,
-        desc: &binding_model::ResolvedPipelineLayoutDescriptor,
+        desc: &binding_model::PipelineLayoutDescriptor,
         ignore_exclusive_pipeline_check: bool,
     ) -> Result<Arc<binding_model::PipelineLayout>, binding_model::CreatePipelineLayoutError> {
         use crate::binding_model::CreatePipelineLayoutError as Error;
@@ -4208,7 +4208,7 @@ impl Device {
             })
             .collect::<Result<Vec<_>, _>>()?;
 
-        let layout_desc = binding_model::ResolvedPipelineLayoutDescriptor {
+        let layout_desc = binding_model::PipelineLayoutDescriptor {
             label: None,
             bind_group_layouts: Cow::Owned(bind_group_layouts),
             immediate_size,

wgpu-core/src/device/trace.rs

@@ -173,10 +173,7 @@ pub enum Action<'a, R: ReferenceType> {
     DropBindGroupLayout(PointerId<markers::BindGroupLayout>),
     CreatePipelineLayout(
         PointerId<markers::PipelineLayout>,
-        crate::binding_model::ResolvedPipelineLayoutDescriptor<
-            'a,
-            PointerId<markers::BindGroupLayout>,
-        >,
+        crate::binding_model::PipelineLayoutDescriptor<'a, PointerId<markers::BindGroupLayout>>,
     ),
     DropPipelineLayout(PointerId<markers::PipelineLayout>),
     CreateBindGroup(PointerId<markers::BindGroup>, TraceBindGroupDescriptor<'a>),

wgpu-core/src/device/trace/record.rs

@@ -654,7 +654,7 @@ impl IntoTrace for ArcRenderCommand {
     }
 }
 
-impl IntoTrace for crate::binding_model::ResolvedPipelineLayoutDescriptor<'_> {
+impl IntoTrace for crate::binding_model::PipelineLayoutDescriptor<'_> {
     type Output = crate::binding_model::PipelineLayoutDescriptor<
         'static,
         PointerId<markers::BindGroupLayout>,