asuro/rust-engine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

One sampler per texture

Browse Source
This commit is contained in:
Asuro
2021-02-20 22:44:03 +01:00
parent ad6b0730d5
commit 277d284994
4 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/vulkan/pipelines.rs
View File

@@ -96,10 +96,13 @@ impl Drawcall for DefaultShader {
let descriptor_set: Arc<(dyn vulkano::descriptor::DescriptorSet + std::marker::Send + std::marker::Sync + 'static)>;
let builder = PersistentDescriptorSet::start(descriptor_set_layout.clone());
let diffuse = &renderer.game_data.textures[game_object.texture_index];
let normal_map = &renderer.game_data.textures[game_object.normal_map_index];
descriptor_set = Arc::new(builder
.add_buffer(uniform_buffer.clone()).unwrap()
.add_sampled_image(renderer.game_data.textures[game_object.texture_index].clone(), renderer.sampler.clone()).unwrap()
.add_sampled_image(renderer.game_data.textures[game_object.normal_map_index].clone(), renderer.sampler.clone()).unwrap()
.add_sampled_image(diffuse.image.clone(), diffuse.sampler.clone()).unwrap()
.add_sampled_image(normal_map.image.clone(), normal_map.sampler.clone()).unwrap()
.build().unwrap());
descriptor_set