From 2701d9404b384243f78c373644d0e58800e6eb98 Mon Sep 17 00:00:00 2001 From: chyyran Date: Fri, 6 Sep 2024 01:34:04 -0400 Subject: [PATCH] compile: more derives for output models --- spirv-cross2/src/compile/glsl/mod.rs | 3 +-- spirv-cross2/src/compile/hlsl/mod.rs | 2 +- spirv-cross2/src/compile/msl/mod.rs | 11 +++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/spirv-cross2/src/compile/glsl/mod.rs b/spirv-cross2/src/compile/glsl/mod.rs index 1a6845e..597ad4d 100644 --- a/spirv-cross2/src/compile/glsl/mod.rs +++ b/spirv-cross2/src/compile/glsl/mod.rs @@ -90,9 +90,8 @@ pub struct CompilerOptions { impl Sealed for GlslVersion {} /// GLSL language version. -#[derive(Debug)] #[non_exhaustive] -#[derive(Default)] +#[derive(Default, Debug, Copy, Clone, Eq, PartialEq)] pub enum GlslVersion { /// #version 110 Glsl110, diff --git a/spirv-cross2/src/compile/hlsl/mod.rs b/spirv-cross2/src/compile/hlsl/mod.rs index 82a49d6..fc2a6c3 100644 --- a/spirv-cross2/src/compile/hlsl/mod.rs +++ b/spirv-cross2/src/compile/hlsl/mod.rs @@ -118,7 +118,7 @@ pub struct CompilerOptions { } /// HLSL Shader model. -#[derive(Debug, Copy, Clone)] +#[derive(Debug, Copy, Clone, Eq, PartialEq)] #[non_exhaustive] #[derive(Default)] pub enum HlslShaderModel { diff --git a/spirv-cross2/src/compile/msl/mod.rs b/spirv-cross2/src/compile/msl/mod.rs index 0af21e1..ab58113 100644 --- a/spirv-cross2/src/compile/msl/mod.rs +++ b/spirv-cross2/src/compile/msl/mod.rs @@ -465,11 +465,14 @@ pub struct CompilerOptions { /// The version of Metal Shading Language to compile to. /// /// Defaults to MSL 1.2. -#[derive(Copy, Clone)] +#[derive(Copy, Clone, Eq, PartialEq)] pub struct MslVersion { - major: u32, - minor: u32, - patch: u32, + /// The major version of MSL. + pub major: u32, + /// The minor version of MSL. + pub minor: u32, + /// The patch version of MSL. + pub patch: u32, } impl MslVersion {