diff options
Diffstat (limited to 'stockton-render/src/draw/texture')
| -rw-r--r-- | stockton-render/src/draw/texture/chunk.rs | 16 | ||||
| -rw-r--r-- | stockton-render/src/draw/texture/image.rs | 346 | ||||
| -rw-r--r-- | stockton-render/src/draw/texture/loader.rs | 42 |
3 files changed, 340 insertions, 64 deletions
diff --git a/stockton-render/src/draw/texture/chunk.rs b/stockton-render/src/draw/texture/chunk.rs index f1b88e9..b95e863 100644 --- a/stockton-render/src/draw/texture/chunk.rs +++ b/stockton-render/src/draw/texture/chunk.rs @@ -47,6 +47,7 @@ impl TextureChunk { pub fn new_empty( device: &mut Device, adapter: &mut Adapter, + allocator: &mut DynamicAllocator, command_queue: &mut CommandQueue, command_pool: &mut CommandPool, descriptor_set: DescriptorSet, @@ -64,6 +65,7 @@ impl TextureChunk { i, device, adapter, + allocator, command_queue, command_pool, ) @@ -78,6 +80,7 @@ impl TextureChunk { pub fn new<'a, I, R: TextureResolver<T>, T: LoadableImage>( device: &mut Device, adapter: &mut Adapter, + allocator: &mut DynamicAllocator, command_queue: &mut CommandQueue, command_pool: &mut CommandPool, descriptor_set: DescriptorSet, @@ -98,11 +101,11 @@ impl TextureChunk { for tex in textures { if let Some(img) = resolver.resolve(tex) { store - .put_texture(img, local_idx, device, adapter, command_queue, command_pool) + .put_texture(img, local_idx, device, adapter, allocator, command_queue, command_pool) .unwrap(); } else { // Texture not found. For now, tear everything down. - store.deactivate(device); + store.deactivate(device, allocator); return Err(error::CreationError::BadDataError); } @@ -119,6 +122,7 @@ impl TextureChunk { local_idx, device, adapter, + allocator, command_queue, command_pool, ) @@ -136,6 +140,7 @@ impl TextureChunk { idx: usize, device: &mut Device, adapter: &mut Adapter, + allocator: &mut DynamicAllocator, command_queue: &mut CommandQueue, command_pool: &mut CommandPool, ) -> Result<(), &'static str> { @@ -144,6 +149,7 @@ impl TextureChunk { image, device, adapter, + allocator, command_queue, command_pool, hal::format::Format::Rgba8Srgb, // TODO @@ -177,7 +183,7 @@ impl TextureChunk { // Store it so we can safely deactivate it when we need to // Deactivate the old image if we need to if idx < self.sampled_images.len() { - replace(&mut self.sampled_images[idx], texture).deactivate(device); + replace(&mut self.sampled_images[idx], texture).deactivate(device, allocator); } else { self.sampled_images.push(texture); } @@ -185,9 +191,9 @@ impl TextureChunk { Ok(()) } - pub fn deactivate(mut self, device: &mut Device) { + pub fn deactivate(mut self, device: &mut Device, allocator: &mut DynamicAllocator) { for img in self.sampled_images.drain(..) { - img.deactivate(device); + img.deactivate(device, allocator); } } } diff --git a/stockton-render/src/draw/texture/image.rs b/stockton-render/src/draw/texture/image.rs index 37e8ce8..bd8058b 100644 --- a/stockton-render/src/draw/texture/image.rs +++ b/stockton-render/src/draw/texture/image.rs @@ -23,13 +23,14 @@ use hal::{ buffer::Usage as BufUsage, format::{Aspects, Format, Swizzle}, image::{SubresourceRange, Usage as ImgUsage, ViewKind}, - memory::{Dependencies as MemDependencies, Properties as MemProperties, Segment}, + memory::{Dependencies as MemDependencies, Properties as MemProperties}, prelude::*, queue::Submission, MemoryTypeId, }; use image::RgbaImage; use std::{convert::TryInto, iter::once}; +use rendy_memory::{Allocator, Block}; use crate::draw::buffer::create_buffer; use crate::types::*; @@ -73,17 +74,18 @@ pub struct LoadedImage { pub image_view: ManuallyDrop<ImageView>, /// The memory backing the image - memory: ManuallyDrop<Memory>, + memory: ManuallyDrop<DynamicBlock>, } pub fn create_image_view( device: &mut Device, adapter: &Adapter, + allocator: &mut DynamicAllocator, format: Format, usage: ImgUsage, width: usize, height: usize, -) -> Result<(Memory, Image), &'static str> { +) -> Result<(DynamicBlock, Image), &'static str> { // Round up the size to align properly let initial_row_size = PIXEL_SIZE * width; let limits = adapter.physical_device.limits(); @@ -108,47 +110,37 @@ pub fn create_image_view( .map_err(|_| "Couldn't create image")?; // Allocate memory - let memory = unsafe { + let (block, _) = unsafe { let requirements = device.get_image_requirements(&image_ref); - let memory_type_id = adapter - .physical_device - .memory_properties() - .memory_types - .iter() - .enumerate() - .find(|&(id, memory_type)| { - requirements.type_mask & (1 << id) != 0 - && memory_type.properties.contains(MemProperties::DEVICE_LOCAL) - }) - .map(|(id, _)| MemoryTypeId(id)) - .ok_or("Couldn't find a memory type for image memory")?; - - let memory = device - .allocate_memory(memory_type_id, requirements.size) - .map_err(|_| "Couldn't allocate image memory")?; + allocator.alloc( + device, + requirements.size, + requirements.alignment + ) + }.map_err(|_| "Out of memory")?; + unsafe { device - .bind_image_memory(&memory, 0, &mut image_ref) + .bind_image_memory(&block.memory(), block.range().start, &mut image_ref) .map_err(|_| "Couldn't bind memory to image")?; + } - Ok(memory) - }?; - - Ok((memory, image_ref)) + Ok((block, image_ref)) } impl LoadedImage { pub fn new( device: &mut Device, adapter: &Adapter, + allocator: &mut DynamicAllocator, format: Format, usage: ImgUsage, resources: SubresourceRange, width: usize, height: usize, ) -> Result<LoadedImage, &'static str> { - let (memory, image_ref) = create_image_view(device, adapter, format, usage, width, height)?; + let (memory, image_ref) = create_image_view(device, adapter, allocator, format, usage, width, height)?; // Create ImageView and sampler let image_view = unsafe { @@ -169,6 +161,7 @@ impl LoadedImage { img: T, device: &mut Device, adapter: &Adapter, + allocator: &mut DynamicAllocator, command_queue: &mut CommandQueue, command_pool: &mut CommandPool, ) -> Result<(), &'static str> { @@ -194,7 +187,7 @@ impl LoadedImage { // Copy everything into it unsafe { let mapped_memory: *mut u8 = std::mem::transmute(device - .map_memory(&staging_memory, Segment::ALL) + .map_memory(&staging_memory, 0..total_size) .map_err(|_| "Couldn't map buffer memory")?); for y in 0..img.height() as usize { @@ -315,6 +308,7 @@ impl LoadedImage { img: T, device: &mut Device, adapter: &Adapter, + allocator: &mut DynamicAllocator, command_queue: &mut CommandQueue, command_pool: &mut CommandPool, format: Format, @@ -323,6 +317,7 @@ impl LoadedImage { let mut loaded_image = Self::new( device, adapter, + allocator, format, usage | ImgUsage::TRANSFER_DST, SubresourceRange { @@ -333,20 +328,20 @@ impl LoadedImage { img.width() as usize, img.height() as usize, )?; - loaded_image.load(img, device, adapter, command_queue, command_pool)?; + loaded_image.load(img, device, adapter, allocator, command_queue, command_pool)?; Ok(loaded_image) } /// Properly frees/destroys all the objects in this struct /// Dropping without doing this is a bad idea - pub fn deactivate(self, device: &Device) { + pub fn deactivate(self, device: &mut Device, allocator: &mut DynamicAllocator) { unsafe { use core::ptr::read; device.destroy_image_view(ManuallyDrop::into_inner(read(&self.image_view))); device.destroy_image(ManuallyDrop::into_inner(read(&self.image))); - device.free_memory(ManuallyDrop::into_inner(read(&self.memory))); + allocator.free(device, ManuallyDrop::into_inner(read(&self.memory))); } } } @@ -360,6 +355,7 @@ impl SampledImage { pub fn new( device: &mut Device, adapter: &Adapter, + allocator: &mut DynamicAllocator, format: Format, usage: ImgUsage, width: usize, @@ -368,6 +364,7 @@ impl SampledImage { let image = LoadedImage::new( device, adapter, + allocator, format, usage | ImgUsage::SAMPLED, SubresourceRange { @@ -396,6 +393,7 @@ impl SampledImage { img: T, device: &mut Device, adapter: &Adapter, + allocator: &mut DynamicAllocator, command_queue: &mut CommandQueue, command_pool: &mut CommandPool, format: Format, @@ -404,6 +402,7 @@ impl SampledImage { let mut sampled_image = SampledImage::new( device, adapter, + allocator, format, usage | ImgUsage::TRANSFER_DST, img.width() as usize, @@ -411,18 +410,299 @@ impl SampledImage { )?; sampled_image .image - .load(img, device, adapter, command_queue, command_pool)?; + .load(img, device, adapter, allocator, command_queue, command_pool)?; Ok(sampled_image) } - pub fn deactivate(self, device: &mut Device) { + pub fn deactivate(self, device: &mut Device, allocator: &mut DynamicAllocator) { unsafe { use core::ptr::read; device.destroy_sampler(ManuallyDrop::into_inner(read(&self.sampler))); - ManuallyDrop::into_inner(read(&self.image)).deactivate(device); + ManuallyDrop::into_inner(read(&self.image)).deactivate(device, allocator); } } } + +/// Holds an image that's loaded into GPU memory dedicated only to that image, bypassing the memory allocator. +pub struct DedicatedLoadedImage { + /// The GPU Image handle + image: ManuallyDrop<Image>, + + /// The full view of the image + pub image_view: ManuallyDrop<ImageView>, + + /// The memory backing the image + memory: ManuallyDrop<Memory>, +} + + +impl DedicatedLoadedImage { + pub fn new( + device: &mut Device, + adapter: &Adapter, + format: Format, + usage: ImgUsage, + resources: SubresourceRange, + width: usize, + height: usize, + ) -> Result<DedicatedLoadedImage, &'static str> { + let (memory, image_ref) = { + // Round up the size to align properly + let initial_row_size = PIXEL_SIZE * width; + let limits = adapter.physical_device.limits(); + let row_alignment_mask = limits.optimal_buffer_copy_pitch_alignment as u32 - 1; + + let row_size = ((initial_row_size as u32 + row_alignment_mask) & !row_alignment_mask) as usize; + debug_assert!(row_size as usize >= initial_row_size); + + // Make the image + let mut image_ref = unsafe { + use hal::image::{Kind, Tiling, ViewCapabilities}; + + device.create_image( + Kind::D2(width as u32, height as u32, 1, 1), + 1, + format, + Tiling::Optimal, + usage, + ViewCapabilities::empty(), + ) + } + .map_err(|_| "Couldn't create image")?; + + // Allocate memory + + // Allocate memory + let memory = unsafe { + let requirements = device.get_image_requirements(&image_ref); + + let memory_type_id = adapter + .physical_device + .memory_properties() + .memory_types + .iter() + .enumerate() + .find(|&(id, memory_type)| { + requirements.type_mask & (1 << id) != 0 + && memory_type.properties.contains(MemProperties::DEVICE_LOCAL) + }) + .map(|(id, _)| MemoryTypeId(id)) + .ok_or("Couldn't find a memory type for image memory")?; + + let memory = device + .allocate_memory(memory_type_id, requirements.size) + .map_err(|_| "Couldn't allocate image memory")?; + + device + .bind_image_memory(&memory, 0, &mut image_ref) + .map_err(|_| "Couldn't bind memory to image")?; + + Ok(memory) + }?; + + Ok((memory, image_ref)) + }?; + + // Create ImageView and sampler + let image_view = unsafe { + device.create_image_view(&image_ref, ViewKind::D2, format, Swizzle::NO, resources) + } + .map_err(|_| "Couldn't create the image view!")?; + + Ok(DedicatedLoadedImage { + image: ManuallyDrop::new(image_ref), + image_view: ManuallyDrop::new(image_view), + memory: ManuallyDrop::new(memory), + }) + } + + /// Load the given image + pub fn load<T: LoadableImage>( + &mut self, + img: T, + device: &mut Device, + adapter: &Adapter, + command_queue: &mut CommandQueue, + command_pool: &mut CommandPool, + ) -> Result<(), &'static str> { + let initial_row_size = PIXEL_SIZE * img.width() as usize; + let limits = adapter.physical_device.limits(); + let row_alignment_mask = limits.optimal_buffer_copy_pitch_alignment as u32 - 1; + + let row_size = + ((initial_row_size as u32 + row_alignment_mask) & !row_alignment_mask) as usize; + let total_size = (row_size * (img.height() as usize)) as u64; + debug_assert!(row_size as usize >= initial_row_size); + + // Make a staging buffer + let (staging_buffer, staging_memory) = create_buffer( + device, + adapter, + BufUsage::TRANSFER_SRC, + MemProperties::CPU_VISIBLE | MemProperties::COHERENT, + total_size, + ) + .map_err(|_| "Couldn't create staging buffer")?; + + // Copy everything into it + unsafe { + let mapped_memory: *mut u8 = std::mem::transmute(device + .map_memory(&staging_memory, 0..total_size) + .map_err(|_| "Couldn't map buffer memory")?); + + for y in 0..img.height() as usize { + let dest_base: isize = (y * row_size).try_into().unwrap(); + img.copy_row(y as u32, mapped_memory.offset(dest_base)); + } + + device.unmap_memory(&staging_memory); + } + + // Copy from staging to image memory + let buf = unsafe { + use hal::command::{BufferImageCopy, CommandBufferFlags}; + use hal::image::{Access, Extent, Layout, Offset, SubresourceLayers}; + use hal::memory::Barrier; + use hal::pso::PipelineStage; + + // Get a command buffer + let mut buf = command_pool.allocate_one(hal::command::Level::Primary); + buf.begin_primary(CommandBufferFlags::ONE_TIME_SUBMIT); + + // Setup the layout of our image for copying + let image_barrier = Barrier::Image { + states: (Access::empty(), Layout::Undefined) + ..(Access::TRANSFER_WRITE, Layout::TransferDstOptimal), + target: &(*self.image), + families: None, + range: SubresourceRange { + aspects: Aspects::COLOR, + levels: 0..1, + layers: 0..1, + }, + }; + buf.pipeline_barrier( + PipelineStage::TOP_OF_PIPE..PipelineStage::TRANSFER, + MemDependencies::empty(), + &[image_barrier], + ); + + // Copy from buffer to image + buf.copy_buffer_to_image( + &staging_buffer, + &(*self.image), + Layout::TransferDstOptimal, + &[BufferImageCopy { + buffer_offset: 0, + buffer_width: (row_size / PIXEL_SIZE) as u32, + buffer_height: img.height(), + image_layers: SubresourceLayers { + aspects: Aspects::COLOR, + level: 0, + layers: 0..1, + }, + image_offset: Offset { x: 0, y: 0, z: 0 }, + image_extent: Extent { + width: img.width(), + height: img.height(), + depth: 1, + }, + }], + ); + + // Setup the layout of our image for shaders + let image_barrier = Barrier::Image { + states: (Access::TRANSFER_WRITE, Layout::TransferDstOptimal) + ..(Access::SHADER_READ, Layout::ShaderReadOnlyOptimal), + target: &(*self.image), + families: None, + range: SubresourceRange { + aspects: Aspects::COLOR, + levels: 0..1, + layers: 0..1, + }, + }; + + buf.pipeline_barrier( + PipelineStage::TRANSFER..PipelineStage::FRAGMENT_SHADER, + MemDependencies::empty(), + &[image_barrier], + ); + + buf.finish(); + + buf + }; + + // Submit our commands and wait for them to finish + unsafe { + let setup_finished = device.create_fence(false).unwrap(); + command_queue.submit::<_, _, Semaphore, _, _>( + Submission { + command_buffers: &[&buf], + wait_semaphores: std::iter::empty::<_>(), + signal_semaphores: std::iter::empty::<_>(), + }, + Some(&setup_finished), + ); + + device + .wait_for_fence(&setup_finished, core::u64::MAX) + .unwrap(); + device.destroy_fence(setup_finished); + }; + + // Clean up temp resources + unsafe { + command_pool.free(once(buf)); + + device.free_memory(staging_memory); + device.destroy_buffer(staging_buffer); + } + + Ok(()) + } + + /// Load the given image into a new buffer + pub fn load_into_new<T: LoadableImage>( + img: T, + device: &mut Device, + adapter: &Adapter, + command_queue: &mut CommandQueue, + command_pool: &mut CommandPool, + format: Format, + usage: ImgUsage, + ) -> Result<DedicatedLoadedImage, &'static str> { + let mut loaded_image = Self::new( + device, + adapter, + format, + usage | ImgUsage::TRANSFER_DST, + SubresourceRange { + aspects: Aspects::COLOR, + levels: 0..1, + layers: 0..1, + }, + img.width() as usize, + img.height() as usize, + )?; + loaded_image.load(img, device, adapter, command_queue, command_pool)?; + + Ok(loaded_image) + } + + /// Properly frees/destroys all the objects in this struct + /// Dropping without doing this is a bad idea + pub fn deactivate(self, device: &mut Device) { + unsafe { + use core::ptr::read; + + device.destroy_image_view(ManuallyDrop::into_inner(read(&self.image_view))); + device.destroy_image(ManuallyDrop::into_inner(read(&self.image))); + device.free_memory(ManuallyDrop::into_inner(read(&self.memory))); + } + } +}
\ No newline at end of file diff --git a/stockton-render/src/draw/texture/loader.rs b/stockton-render/src/draw/texture/loader.rs index 30c89dc..9385d96 100644 --- a/stockton-render/src/draw/texture/loader.rs +++ b/stockton-render/src/draw/texture/loader.rs @@ -47,6 +47,7 @@ impl TextureStore { pub fn new_empty( device: &mut Device, adapter: &mut Adapter, + allocator: &mut DynamicAllocator, command_queue: &mut CommandQueue, command_pool: &mut CommandPool, size: usize, @@ -64,7 +65,7 @@ impl TextureStore { // Descriptor pool, where we get our sets from let mut descriptor_pool = unsafe { use hal::pso::{ - DescriptorPoolCreateFlags, DescriptorRangeDesc, DescriptorType, ImageDescriptorType, + DescriptorPoolCreateFlags, DescriptorRangeDesc, DescriptorType, }; device @@ -72,11 +73,7 @@ impl TextureStore { num_chunks, &[ DescriptorRangeDesc { - ty: DescriptorType::Image { - ty: ImageDescriptorType::Sampled { - with_sampler: false, - }, - }, + ty: DescriptorType::SampledImage, count: rounded_size, }, DescriptorRangeDesc { @@ -95,18 +92,14 @@ impl TextureStore { // Layout of our descriptor sets let descriptor_set_layout = unsafe { use hal::pso::{ - DescriptorSetLayoutBinding, DescriptorType, ImageDescriptorType, ShaderStageFlags, + DescriptorSetLayoutBinding, DescriptorType, ShaderStageFlags, }; device.create_descriptor_set_layout( &[ DescriptorSetLayoutBinding { binding: 0, - ty: DescriptorType::Image { - ty: ImageDescriptorType::Sampled { - with_sampler: false, - }, - }, + ty: DescriptorType::SampledImage, count: CHUNK_SIZE, stage_flags: ShaderStageFlags::FRAGMENT, immutable_samplers: false, @@ -140,6 +133,7 @@ impl TextureStore { chunks.push(TextureChunk::new_empty( device, adapter, + allocator, command_queue, command_pool, descriptor_set, @@ -159,6 +153,7 @@ impl TextureStore { pub fn new<T: HasTextures>( device: &mut Device, adapter: &mut Adapter, + allocator: &mut DynamicAllocator, command_queue: &mut CommandQueue, command_pool: &mut CommandPool, file: &T, @@ -177,7 +172,7 @@ impl TextureStore { // Descriptor pool, where we get our sets from let mut descriptor_pool = unsafe { use hal::pso::{ - DescriptorPoolCreateFlags, DescriptorRangeDesc, DescriptorType, ImageDescriptorType, + DescriptorPoolCreateFlags, DescriptorRangeDesc, DescriptorType, }; device @@ -185,11 +180,7 @@ impl TextureStore { num_chunks, &[ DescriptorRangeDesc { - ty: DescriptorType::Image { - ty: ImageDescriptorType::Sampled { - with_sampler: false, - }, - }, + ty: DescriptorType::SampledImage, count: rounded_size, }, DescriptorRangeDesc { @@ -208,18 +199,14 @@ impl TextureStore { // Layout of our descriptor sets let descriptor_set_layout = unsafe { use hal::pso::{ - DescriptorSetLayoutBinding, DescriptorType, ImageDescriptorType, ShaderStageFlags, + DescriptorSetLayoutBinding, DescriptorType, ShaderStageFlags, }; device.create_descriptor_set_layout( &[ DescriptorSetLayoutBinding { binding: 0, - ty: DescriptorType::Image { - ty: ImageDescriptorType::Sampled { - with_sampler: false, - }, - }, + ty: DescriptorType::SampledImage, count: CHUNK_SIZE, stage_flags: ShaderStageFlags::FRAGMENT, immutable_samplers: false, @@ -254,6 +241,7 @@ impl TextureStore { chunks.push(TextureChunk::new( device, adapter, + allocator, command_queue, command_pool, descriptor_set, @@ -272,12 +260,12 @@ impl TextureStore { } /// Call this before dropping - pub fn deactivate(mut self, device: &mut Device) { + pub fn deactivate(mut self, device: &mut Device, allocator: &mut DynamicAllocator) { unsafe { use core::ptr::read; for chunk in self.chunks.into_vec().drain(..) { - chunk.deactivate(device) + chunk.deactivate(device, allocator); } self.descriptor_pool.reset(); @@ -299,6 +287,7 @@ impl TextureStore { img: T, device: &mut Device, adapter: &mut Adapter, + allocator: &mut DynamicAllocator, command_queue: &mut CommandQueue, command_pool: &mut CommandPool, ) -> Result<(), &'static str> { @@ -309,6 +298,7 @@ impl TextureStore { idx % CHUNK_SIZE, device, adapter, + allocator, command_queue, command_pool, ) |