mitchellhansen/Trac3r-rust
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

back in the saddle, upgrading dependencies

Browse Source
This commit is contained in:
mitchellhansen
2020-07-26 00:47:24 -07:00
parent 626eac4e86
commit ea52a20fce
10 changed files with 317 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/compute/compu_state.rs
View File

@@ -93,9 +93,8 @@ impl CompuState {
pub fn compute_commands(&mut self,
compute_frame: CompuFrame,
mut command_buffer: AutoCommandBufferBuilder,
canvas: &CanvasState)
-> AutoCommandBufferBuilder {
mut command_buffer: &mut AutoCommandBufferBuilder,
canvas: &CanvasState) {
// i = (Buffer, Kernel)
for i in compute_frame.pure_compute {
@@ -167,7 +166,6 @@ impl CompuState {
output_buffer.get_input_buffer()).unwrap();
}
command_buffer
}
}

11
src/compute/managed/compu_buffer.rs
View File

@@ -8,6 +8,7 @@ use image::ImageBuffer;
use image::Rgba;
use shade_runner::Layout;
use crate::compute::managed::handles::CompuBufferHandle;
use vulkano::descriptor::PipelineLayoutAbstract;
#[derive(Clone)]
@@ -30,13 +31,13 @@ impl CompuBuffers {
let input_buffer = {
let mut buff = data.iter();
let data_iter = (0..data_length).map(|n| *(buff.next().unwrap()));
CpuAccessibleBuffer::from_iter(device.clone(), BufferUsage::all(), data_iter).unwrap()
CpuAccessibleBuffer::from_iter(device.clone(), BufferUsage::all(), false, data_iter).unwrap()
};
let output_buffer = {
let mut buff = data.iter();
let data_iter = (0..data_length).map(|n| *(buff.next().unwrap()));
CpuAccessibleBuffer::from_iter(device.clone(), BufferUsage::all(), data_iter).unwrap()
CpuAccessibleBuffer::from_iter(device.clone(), BufferUsage::all(), false, data_iter).unwrap()
};
// Settings buffer which holds i32's
@@ -48,7 +49,7 @@ impl CompuBuffers {
(0..2).map(|n| *(buff.next().unwrap()));
CpuAccessibleBuffer::from_iter(device.clone(),
BufferUsage::all(),
data_iter).unwrap()
false, data_iter).unwrap()
};
CompuBuffers {
@@ -66,12 +67,12 @@ impl CompuBuffers {
}
pub fn get_descriptor_set(&self, compute_pipeline: std::sync::Arc<ComputePipeline<PipelineLayout<Layout>>>)
-> Arc<PersistentDescriptorSet<std::sync::Arc<ComputePipeline<PipelineLayout<Layout>>>, ((((),
-> Arc<PersistentDescriptorSet<((((),
PersistentDescriptorSetBuf<std::sync::Arc<vulkano::buffer::cpu_access::CpuAccessibleBuffer<[u8]>>>),
PersistentDescriptorSetBuf<std::sync::Arc<vulkano::buffer::cpu_access::CpuAccessibleBuffer<[u8]>>>),
PersistentDescriptorSetBuf<std::sync::Arc<vulkano::buffer::cpu_access::CpuAccessibleBuffer<[u32]>>>)>> {
Arc::new(PersistentDescriptorSet::start(compute_pipeline.clone(), 0)
Arc::new(PersistentDescriptorSet::start(compute_pipeline.clone().descriptor_set_layout(0).unwrap().clone())
.add_buffer(self.io_buffers.get(0).unwrap().clone()).unwrap()
.add_buffer(self.io_buffers.get(1).unwrap().clone()).unwrap()
.add_buffer(self.settings_buffer.clone()).unwrap()

5
src/compute/managed/compu_kernel.rs
View File

@@ -50,7 +50,8 @@ impl CompuKernel {
let mut options = CompileOptions::new().ok_or(CompileError::CreateCompiler).unwrap();
let shader = sr::load_compute_with_options(compute_path.clone(), options)
let shader = sr::load_compute(compute_path.clone(), Some(options))
.expect("Failed to compile");
let entry = sr::parse_compute(&shader)
@@ -106,7 +107,7 @@ impl CompuKernel {
self.compute_kernel_path = CompuKernel::get_path(filename);
self.shader =
sr::load_compute_with_options(self.compute_kernel_path.clone(), options)
sr::load_compute(self.compute_kernel_path.clone(), Some(options))
.expect("Failed to compile");
self.entry =