refactoring out shaders

This commit is contained in:
2019-10-07 19:25:47 -07:00
parent 77d30591e6
commit 2fa08bf99e
9 changed files with 109 additions and 65 deletions

View File

@@ -6,7 +6,7 @@ use vulkano::sampler::Sampler;
use vulkano::descriptor::DescriptorSet;
use vulkano::descriptor::descriptor_set::PersistentDescriptorSet;
use vulkano::buffer::CpuAccessibleBuffer;
use crate::canvas::canvas_text::{CanvasTextCacheHandle, CanvasTextHandle};
use crate::canvas::canvas_text::{CanvasTextCacheHandle, CanvasFontHandle};
use vulkano::pipeline::GraphicsPipelineAbstract;
#[derive(Clone)]
@@ -75,7 +75,7 @@ impl CanvasTextCache {
#[derive(Clone)]
pub struct CanvasText {
pub(crate) handle: Arc<CanvasTextHandle>,
pub(crate) handle: Arc<CanvasFontHandle>,
pub(crate) buffer: Arc<ImmutableImage<R8Unorm>>,
pub(crate) size: (u32, u32),
}