github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

glsl: reflect textures without samplers

Browse Source
This commit is contained in:
Dzmitry Malyshau
2021-12-04 12:13:53 -05:00
parent 6fbd668bd3
commit c69f676609
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/back/glsl/mod.rs
View File

@@ -2718,13 +2718,13 @@ impl<'a, W: Write> Writer<'a, W> {
fn collect_reflection_info(&self) -> Result<ReflectionInfo, Error> {
use std::collections::hash_map::Entry;
let info = self.info.get_entry_point(self.entry_point_idx as usize);
let mut mappings = crate::FastHashMap::default();
let mut texture_mapping = crate::FastHashMap::default();
let mut uniforms = crate::FastHashMap::default();
for sampling in info.sampling_set.iter() {
let tex_name = self.reflection_names_globals[&sampling.image].clone();
match mappings.entry(tex_name) {
match texture_mapping.entry(tex_name) {
Entry::Vacant(v) => {
v.insert(TextureMapping {
texture: sampling.image,
@@ -2752,12 +2752,26 @@ impl<'a, W: Write> Writer<'a, W> {
}
_ => (),
},
_ => continue,
crate::TypeInner::Image { .. } => {
let tex_name = self.reflection_names_globals[&handle].clone();
match texture_mapping.entry(tex_name) {
Entry::Vacant(v) => {
v.insert(TextureMapping {
texture: handle,
sampler: None,
});
}
Entry::Occupied(_) => {
// already used with a sampler, do nothing
}
}
}
_ => {}
}
}
Ok(ReflectionInfo {
texture_mapping: mappings,
texture_mapping,
uniforms,
})
}