alex/librashader
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

reflect: rename non_uniforms to texture_semantics

Browse source
This commit is contained in:
chyyran 2022-11-27 23:11:21 -05:00
parent 4e242bf25e
commit 964da02c39
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
librashader-reflect/src/reflect/cross.rs
View file

@ -477,7 +477,7 @@ where
semantics: &ReflectSemantics, semantics: &ReflectSemantics,
meta: &mut ReflectMeta, meta: &mut ReflectMeta,
) -> Result<(), ShaderReflectError> { ) -> Result<(), ShaderReflectError> {
let Some(semantic) = semantics.non_uniform_semantics.get_texture_semantic(texture.name) else { let Some(semantic) = semantics.texture_semantics.get_texture_semantic(texture.name) else {
return Err(SemanticErrorBlame::Fragment.error(SemanticsErrorKind::UnknownSemantics(texture.name.to_string()))) return Err(SemanticErrorBlame::Fragment.error(SemanticsErrorKind::UnknownSemantics(texture.name.to_string())))
}; };
@ -873,7 +873,7 @@ mod test {
0, 0,
&ReflectSemantics { &ReflectSemantics {
uniform_semantics, uniform_semantics,
non_uniform_semantics: Default::default(), texture_semantics: Default::default(),
}, },
) )
.unwrap(); .unwrap();

2
librashader-reflect/src/reflect/semantics.rs
View file

@ -325,7 +325,7 @@ pub enum UniformSemantic {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct ReflectSemantics { pub struct ReflectSemantics {
pub uniform_semantics: FxHashMap<String, UniformSemantic>, pub uniform_semantics: FxHashMap<String, UniformSemantic>,
pub non_uniform_semantics: FxHashMap<String, SemanticMap<TextureSemantics>>, pub texture_semantics: FxHashMap<String, SemanticMap<TextureSemantics>>,
} }