going to save here. re-evaluating drawable now that runtimevertexdef is in
This commit is contained in:
@@ -13,7 +13,7 @@ use vulkano::pipeline::vertex::{SingleBufferDefinition, OneVertexOneInstanceDefi
|
||||
use crate::util::vertex_3d::Vertex3D;
|
||||
use shade_runner as sr;
|
||||
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::generic_shader::GenericShader;
|
||||
use crate::canvas::managed::shader::dynamic_vertex::RuntimeVertexDef;
|
||||
use crate::canvas::managed::ShaderSpecializationConstants;
|
||||
@@ -32,7 +32,7 @@ vulkano::impl_vertex!(GlyphInstance, screen_position, atlas_position, atlas_size
|
||||
pub struct TextShader {
|
||||
graphics_pipeline: Option<Arc<dyn GraphicsPipelineAbstract + Sync + Send>>,
|
||||
|
||||
handle: Arc<CompiledGraphicsPipelineHandle>,
|
||||
handle: Arc<CompiledShaderHandle>,
|
||||
name: String,
|
||||
|
||||
device: Arc<Device>,
|
||||
@@ -50,7 +50,7 @@ impl CompiledGraphicsPipeline for TextShader {
|
||||
/// This will explode when the shader does not want to compile
|
||||
fn new(filename: String,
|
||||
device: Arc<Device>,
|
||||
handle: Arc<CompiledGraphicsPipelineHandle>,
|
||||
handle: Arc<CompiledShaderHandle>,
|
||||
render_pass: Arc<dyn RenderPassAbstract + Send + Sync>) -> TextShader {
|
||||
|
||||
let compiled_vertex = GenericShader::compile(
|
||||
@@ -151,7 +151,7 @@ impl CompiledGraphicsPipeline for TextShader {
|
||||
self.name.clone()
|
||||
}
|
||||
|
||||
fn get_handle(&self) -> Arc<CompiledGraphicsPipelineHandle> {
|
||||
fn get_handle(&self) -> Arc<CompiledShaderHandle> {
|
||||
self.handle.clone()
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user