Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in sprite pipeline creation & misc other pipeline creation fixes

Browse Source
This commit is contained in:
Imbris 2021-04-25 15:53:36 -04:00 committed by Avi Weinstock
parent 604ea8ff18
commit 65946b6f4b
1 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
voxygen/src/render/renderer/pipeline_creation.rs
View File

@ -82,26 +82,6 @@ impl Pipelines {
} }
} }
// TODO: remove
/// For abstraction over types containing the pipelines necessary to render the
/// UI
/*pub trait HasInterfacePipelines {
fn ui(&self) -> &ui::Pipeline;
fn blit(&self) -> &blit::Pipeline;
}
impl HasInterfacePipelines for InterfacePipelines {
fn ui(&self) -> &ui::Pipeline { &self.ui }
fn blit(&self) -> &blit::Pipeline { &self.blit }
}
impl HasInterfacePipelines for Pipelines {
fn ui(&self) -> &ui::Pipeline { &self.ui }
fn blit(&self) -> &blit::Pipeline { &self.blit }
}*/
/// Processed shaders ready for use in pipeline creation /// Processed shaders ready for use in pipeline creation
struct ShaderModules { struct ShaderModules {
skybox_vert: wgpu::ShaderModule, skybox_vert: wgpu::ShaderModule,
@ -468,8 +448,8 @@ fn create_ingame_and_shadow_pipelines(
|| { || {
sprite::SpritePipeline::new( sprite::SpritePipeline::new(
device, device,
&shaders.sprite_frag,
&shaders.sprite_vert, &shaders.sprite_vert,
&shaders.sprite_frag,
&layouts.global, &layouts.global,
&layouts.sprite, &layouts.sprite,
&layouts.terrain, &layouts.terrain,
@ -808,7 +788,7 @@ struct Task<'a> {
/// Represents in-progress task, drop when complete /// Represents in-progress task, drop when complete
struct StartedTask<'a> { struct StartedTask<'a> {
span: common_base::ProfSpan, _span: common_base::ProfSpan,
task: Task<'a>, task: Task<'a>,
} }
@ -839,7 +819,7 @@ impl<'a> Task<'a> {
/// The name is used for profiling. /// The name is used for profiling.
fn start(self, name: &str) -> StartedTask<'a> { fn start(self, name: &str) -> StartedTask<'a> {
StartedTask { StartedTask {
span: { _span: {
prof_span!(guard, name); prof_span!(guard, name);
guard guard
}, },
@ -883,7 +863,7 @@ impl<T> PipelineCreation<T> {
use crossbeam::channel::TryRecvError; use crossbeam::channel::TryRecvError;
match self.recv.try_recv() { match self.recv.try_recv() {
// Yay! // Yay!
Ok(T) => Ok(T), Ok(t) => Ok(t),
// Normal error, we have not gotten anything yet // Normal error, we have not gotten anything yet
Err(TryRecvError::Empty) => Err(self), Err(TryRecvError::Empty) => Err(self),
// How rude! // How rude!