Skip to content

Commit bd4b64c

Browse files
teoxoycwfitzgerald
authored andcommitted
[vk] implement our own descriptor allocator (gfx-rs#9161)
Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
1 parent b0f3f40 commit bd4b64c

8 files changed

Lines changed: 390 additions & 221 deletions

File tree

Cargo.lock

Lines changed: 0 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ raw-window-metal = "1.0"
268268
# Vulkan dependencies
269269
android_system_properties = "0.1.1"
270270
ash = "0.38"
271-
gpu-descriptor = "0.3.2"
272271

273272
# DX12 dependencies
274273
range-alloc = "0.1"

wgpu-hal/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ vulkan = [
9393
"dep:arrayvec",
9494
"dep:ash",
9595
"dep:bytemuck",
96-
"dep:gpu-descriptor",
9796
"dep:libc",
9897
"dep:libloading",
9998
"dep:ordered-float",
@@ -229,7 +228,6 @@ glow = { workspace = true, optional = true }
229228
gpu-allocator = { workspace = true, optional = true }
230229
# Backend: Vulkan
231230
ash = { workspace = true, optional = true }
232-
gpu-descriptor = { workspace = true, optional = true }
233231
smallvec = { workspace = true, optional = true, features = ["union"] }
234232
# Backend: GLES
235233
khronos-egl = { workspace = true, features = ["dynamic"], optional = true }

wgpu-hal/src/vulkan/adapter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2833,7 +2833,7 @@ impl super::Adapter {
28332833
allocation_sizes,
28342834
})?;
28352835

2836-
let desc_allocator = gpu_descriptor::DescriptorAllocator::new(
2836+
let desc_allocator = super::descriptor::DescriptorAllocator::new(
28372837
if let Some(di) = self.phd_capabilities.descriptor_indexing {
28382838
di.max_update_after_bind_descriptors_in_all_pools
28392839
} else {

wgpu-hal/src/vulkan/command.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,7 @@ impl crate::CommandEncoder for super::CommandEncoder {
932932
group: &super::BindGroup,
933933
dynamic_offsets: &[wgt::DynamicOffset],
934934
) {
935-
let sets = [*group.set.raw()];
935+
let sets = [group.set.raw()];
936936
unsafe {
937937
self.device.raw.cmd_bind_descriptor_sets(
938938
self.active,

0 commit comments

Comments
 (0)