nordic-dev.net/vulkano
nordic-dev.net/vulkano
2
0
Fork 0
mirror of https://github.com/vulkano-rs/vulkano.git synced 2025-02-16 17:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backport #2379 to 0.34.1

Browse Source
This commit is contained in:
marc0246 2023-10-30 00:38:34 +01:00
parent 424753d543
commit d27ac7efac
No known key found for this signature in database
GPG Key ID: 689CB88C1090C684
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vulkano/src/descriptor_set/allocator.rs
View File

@ -196,8 +196,6 @@ struct FixedEntry {
// The `FixedPool` struct contains an actual Vulkan pool. Every time it is full we create // The `FixedPool` struct contains an actual Vulkan pool. Every time it is full we create
// a new pool and replace the current one with the new one. // a new pool and replace the current one with the new one.
pool: Arc<FixedPool>, pool: Arc<FixedPool>,
// The amount of sets available to use when we create a new Vulkan pool.
set_count: usize,
// The descriptor set layout that this pool is for. // The descriptor set layout that this pool is for.
layout: Arc<DescriptorSetLayout>, layout: Arc<DescriptorSetLayout>,
} }
@ -209,7 +207,6 @@ impl FixedEntry {
) -> Result<Self, Validated<VulkanError>> { ) -> Result<Self, Validated<VulkanError>> {
Ok(FixedEntry { Ok(FixedEntry {
pool: FixedPool::new(&layout, create_info)?, pool: FixedPool::new(&layout, create_info)?,
set_count: create_info.set_count,
layout, layout,
}) })
} }
@ -221,7 +218,6 @@ impl FixedEntry {
let inner = if let Some(inner) = self.pool.reserve.pop() { let inner = if let Some(inner) = self.pool.reserve.pop() {
inner inner
} else { } else {
self.set_count *= 2;
self.pool = FixedPool::new(&self.layout, create_info)?; self.pool = FixedPool::new(&self.layout, create_info)?;
self.pool.reserve.pop().unwrap() self.pool.reserve.pop().unwrap()