fix: variable id methods should take impl Into<VariableId>

SnowflakePowered · Sep 4, 2024 · ed50a6c · ed50a6c
1 parent f5c4a82
commit ed50a6c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/spirv-cross2/Cargo.toml b/spirv-cross2/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "spirv-cross2"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 
 license = "MIT OR Apache-2.0"

diff --git a/spirv-cross2/src/compile/glsl/mod.rs b/spirv-cross2/src/compile/glsl/mod.rs
@@ -190,7 +190,8 @@ impl Compiler<'_, Glsl> {
     /// mixing int and float is not.
     ///
     /// The name of the uniform array will be the same as the interface block name.
-    pub fn flatten_buffer_block(&mut self, block: Handle<VariableId>) -> error::Result<()> {
+    pub fn flatten_buffer_block(&mut self, block: impl Into<Handle<VariableId>>) -> error::Result<()> {
+        let block = block.into();
         let block = self.yield_id(block)?;
 
         unsafe { sys::spvc_compiler_flatten_buffer_block(self.ptr.as_ptr(), block).ok(self) }

diff --git a/spirv-cross2/src/reflect/types.rs b/spirv-cross2/src/reflect/types.rs
@@ -646,7 +646,8 @@ impl<T> Compiler<'_, T> {
     }
 
     /// Get the underlying type of the variable.
-    pub fn variable_type(&self, variable: Handle<VariableId>) -> error::Result<Handle<TypeId>> {
+    pub fn variable_type(&self, variable: impl Into<Handle<VariableId>>) -> error::Result<Handle<TypeId>> {
+        let variable = variable.into();
         let variable_id = self.yield_id(variable)?;
 
         unsafe {