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

going to save here. re-evaluating drawable now that runtimevertexdef is in

Browse Source
This commit is contained in:
mitchellhansen
2020-02-05 20:02:06 -08:00
parent 1fde36e42c
commit 0c1f513225
16 changed files with 166 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/canvas/managed/shader/generic_shader.rs
View File

@@ -16,7 +16,7 @@ use shade_runner as sr;
use vulkano::memory::pool::PotentialDedicatedAllocation::Generic;
use vulkano::SafeDeref;
use crate::canvas::managed::shader::shader_common::{ShaderType, CompiledGraphicsPipelineResources, CompiledGraphicsPipeline};
use crate::canvas::managed::handles::CompiledGraphicsPipelineHandle;
use crate::canvas::managed::handles::CompiledShaderHandle;
use crate::canvas::managed::shader::dynamic_vertex::RuntimeVertexDef;
use crate::canvas::managed::ShaderSpecializationConstants;
@@ -25,7 +25,7 @@ use crate::canvas::managed::ShaderSpecializationConstants;
pub struct GenericShader {
graphics_pipeline: Option<Arc<dyn GraphicsPipelineAbstract + Sync + Send>>,
handle: Arc<CompiledGraphicsPipelineHandle>,
handle: Arc<CompiledShaderHandle>,
name: String,
device: Arc<Device>,
@@ -43,9 +43,9 @@ impl CompiledGraphicsPipeline for GenericShader {
/// This will explode when the shader does not want to compile
fn new(filename: String,
device: Arc<Device>,
handle: Arc<CompiledGraphicsPipelineHandle>,
render_pass: Arc<dyn RenderPassAbstract + Send + Sync>) -> GenericShader {
device: Arc<Device>,
handle: Arc<CompiledShaderHandle>,
render_pass: Arc<dyn RenderPassAbstract + Send + Sync>) -> GenericShader {
let compiled_vertex = GenericShader::compile(
GenericShader::get_path(filename.clone(), ShaderType::VERTEX),
@@ -122,7 +122,7 @@ impl CompiledGraphicsPipeline for GenericShader {
self.name.clone()
}
fn get_handle(&self) -> Arc<CompiledGraphicsPipelineHandle> {
fn get_handle(&self) -> Arc<CompiledShaderHandle> {
self.handle.clone()
}