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

reflect: fix some refs

Browse source
This commit is contained in:
chyyran 2024-02-11 10:21:31 -05:00 committed by Ronny Chan
parent a495b693a6
commit 528dd1b53c
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
librashader-capi/src/reflect/mod.rs
View file

@ -6,7 +6,8 @@ use librashader::reflect::targets::SPIRV;
use librashader::reflect::{CompileShader, ReflectShader, ShaderCompilerOutput, ShaderReflection}; use librashader::reflect::{CompileShader, ReflectShader, ShaderCompilerOutput, ShaderReflection};
use librashader::{FilterMode, WrapMode}; use librashader::{FilterMode, WrapMode};
use librashader::reflect::cross::GlslangCompilation; use librashader::reflect::SpirvCompilation;
use librashader::reflect::f
use librashader::reflect::helper::image::{Image, UVDirection, RGBA8}; use librashader::reflect::helper::image::{Image, UVDirection, RGBA8};
pub(crate) struct LookupTexture { pub(crate) struct LookupTexture {
@ -38,8 +39,9 @@ impl FilterReflection {
let (passes, textures) = (preset.shaders, preset.textures); let (passes, textures) = (preset.shaders, preset.textures);
let (passes, semantics) = librashader::reflect::helper::compile_preset_passes::< let (passes, semantics) = librashader::reflect::helper::compile_preset_passes::<
Glslang,
SPIRV, SPIRV,
GlslangCompilation, SpirvCompilation,
error::LibrashaderError, error::LibrashaderError,
>(passes, &textures)?; >(passes, &textures)?;

2
librashader-reflect/src/front/mod.rs
View file

@ -14,7 +14,9 @@ pub trait ShaderInputCompiler<O: ShaderReflectObject>: Sized {
fn compile(source: &ShaderSource) -> Result<O, ShaderCompileError>; fn compile(source: &ShaderSource) -> Result<O, ShaderCompileError>;
} }
/// Marker trait for types that are the reflectable outputs of a shader compilation.
impl ShaderReflectObject for SpirvCompilation {} impl ShaderReflectObject for SpirvCompilation {}
/// A reflectable shader compilation via glslang. /// A reflectable shader compilation via glslang.
#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))] #[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
#[derive(Debug, Clone)] #[derive(Debug, Clone)]

2
librashader/src/lib.rs
View file

@ -150,7 +150,7 @@ pub mod reflect {
FromCompilation, ShaderCompilerOutput, FromCompilation, ShaderCompilerOutput,
}; };
pub use librashader_reflect::front::SpirvCompilation; pub use librashader_reflect::front::{SpirvCompilation, Glslang, ShaderReflectObject };
/// Reflection via SPIRV-Cross. /// Reflection via SPIRV-Cross.
#[cfg(feature = "reflect-cross")] #[cfg(feature = "reflect-cross")]