hal/dx12: build fixes for the new arrayvec

gfx-rs · Jul 13, 2021 · 0334e5b · 0334e5b
1 parent 450e5dc
commit 0334e5b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/wgpu-hal/src/dx12/device.rs b/wgpu-hal/src/dx12/device.rs
@@ -1027,7 +1027,7 @@ impl crate::Device<super::Api> for super::Device {
         let mut ranges = Vec::with_capacity(total_non_dynamic_entries);
 
         let mut bind_group_infos =
-            arrayvec::ArrayVec::<[super::BindGroupInfo; crate::MAX_BIND_GROUPS]>::default();
+            arrayvec::ArrayVec::<super::BindGroupInfo, { crate::MAX_BIND_GROUPS }>::default();
         for (index, bgl) in desc.bind_group_layouts.iter().enumerate() {
             let space = root_space_offset + index as u32;
             let mut info = super::BindGroupInfo {

diff --git a/wgpu-hal/src/dx12/mod.rs b/wgpu-hal/src/dx12/mod.rs
@@ -247,7 +247,7 @@ enum PassKind {
 
 struct PassState {
     has_label: bool,
-    resolves: ArrayVec<[PassResolve; crate::MAX_COLOR_TARGETS]>,
+    resolves: ArrayVec<PassResolve, { crate::MAX_COLOR_TARGETS }>,
     vertex_buffers: [d3d12::D3D12_VERTEX_BUFFER_VIEW; crate::MAX_VERTEX_BUFFERS],
     dirty_vertex_buffers: usize,
     kind: PassKind,
@@ -423,7 +423,7 @@ pub struct PipelineLayout {
     raw: native::RootSignature,
     // Storing for each associated bind group, which tables we created
     // in the root signature. This is required for binding descriptor sets.
-    bind_group_infos: ArrayVec<BindGroupInfo, crate::MAX_BIND_GROUPS>,
+    bind_group_infos: ArrayVec<BindGroupInfo, { crate::MAX_BIND_GROUPS }>,
     naga_options: naga::back::hlsl::Options,
 }