lots of refactoring for the dynamic vertex in addition to planning out documentation

This commit is contained in:
2020-01-22 18:38:45 -08:00
parent 8db858b29a
commit 83a5e9b997
25 changed files with 221 additions and 103 deletions

View File

@@ -7,11 +7,7 @@ use vulkano::descriptor::descriptor_set::{PersistentDescriptorSet, PersistentDes
use image::ImageBuffer;
use image::Rgba;
use shade_runner::Layout;
#[derive(Clone, Debug, Default, PartialEq, Eq, Hash)]
pub struct CompuBufferHandle {
pub handle: u32,
}
use crate::canvas::CompuBufferHandle;
#[derive(Clone)]

View File

@@ -1,8 +1,9 @@
use crate::canvas::canvas_state::{CanvasImageHandle, Drawable};
use crate::canvas::canvas_state::{Drawable};
use std::sync::Arc;
use crate::compute::compu_sprite::CompuSprite;
use crate::compute::compu_kernel::{CompuKernel, CompuKernelHandle};
use crate::compute::compu_buffer::{CompuBuffers, CompuBufferHandle};
use crate::compute::compu_buffer::{CompuBuffers};
use crate::canvas::{CompuBufferHandle, CanvasImageHandle};
pub struct CompuFrame {
// Vec<(Buffer, Kernel)>

View File

@@ -8,7 +8,7 @@ use vulkano::descriptor::pipeline_layout::PipelineLayout;
use shade_runner::{CompileError, Layout, Input, Output, CompiledShaders, Entry, CompiledShader};
use shaderc::CompileOptions;
use vulkano::pipeline::shader::{ShaderModule, GraphicsEntryPoint, SpecializationConstants, SpecializationMapEntry};
use crate::compute::compu_buffer::{CompuBuffers, CompuBufferHandle};
use crate::compute::compu_buffer::{CompuBuffers};
#[derive(Clone, Debug, Default, PartialEq, Eq, Hash)]
pub struct CompuKernelHandle {

View File

@@ -1,5 +1,6 @@
use crate::canvas::canvas_state::{CanvasImageHandle, Drawable, CanvasTextureHandle};
use crate::canvas::canvas_state::{Drawable};
use std::sync::Arc;
use crate::canvas::{CanvasImageHandle, CanvasTextureHandle};
pub struct CompuSprite {
pub vertices: [(f32, f32, f32); 6],

View File

@@ -1,7 +1,7 @@
use std::ffi::CStr;
use vulkano::buffer::{CpuAccessibleBuffer, BufferUsage};
use std::sync::Arc;
use crate::canvas::canvas_state::{Drawable, CanvasState, CanvasImageHandle, CanvasTextureHandle};
use crate::canvas::canvas_state::{Drawable, CanvasState};
use vulkano::framebuffer::RenderPassAbstract;
use vulkano::pipeline::{GraphicsPipelineAbstract, ComputePipeline};
use vulkano::device::Device;
@@ -19,8 +19,9 @@ use shade_runner::{CompiledShaders, Entry, CompileError};
use vulkano::pipeline::shader::ShaderModule;
use shaderc::CompileOptions;
use crate::compute::compu_kernel::{CompuKernel, CompuKernelHandle};
use crate::compute::compu_buffer::{CompuBuffers, CompuBufferHandle};
use crate::compute::compu_buffer::{CompuBuffers};
use crate::compute::compu_frame::CompuFrame;
use crate::canvas::CompuBufferHandle;
/// State holding the compute buffers for computation and the kernels which will compute them