render: Use correct length when creating Material resources from Rust

caseif · Dec 6, 2024 · 92ab515 · 92ab515
1 parent 903ae28
commit 92ab515
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/engine/auxiliary/render_rustabi/src/argus/render/common/material.rs b/engine/auxiliary/render_rustabi/src/argus/render/common/material.rs
@@ -22,14 +22,16 @@ use lowlevel_rustabi::argus::lowlevel::FfiWrapper;
 use crate::render_cabi::*;
 
 pub struct Material {
-    handle: argus_material_t,
+    pub handle: argus_material_t,
+    pub len: usize,
     must_delete: bool,
 }
 
 impl FfiWrapper for Material {
     fn of(handle: argus_material_t) -> Self {
         Self {
             handle,
+            len: unsafe { argus_material_len() },
             must_delete: false,
         }
     }
@@ -49,6 +51,7 @@ impl Material {
             );
             Self {
                 handle,
+                len: argus_material_len(),
                 must_delete: true,
             }
         }

diff --git a/engine/auxiliary/render_rustabi/src/render_cabi/bindings.rs b/engine/auxiliary/render_rustabi/src/render_cabi/bindings.rs
@@ -642,6 +642,7 @@ extern "C" {
         canvas: argus_canvas_t,
         id: *const ::std::os::raw::c_char,
     );
+    pub fn argus_material_len() -> usize;
     pub fn argus_material_new(
         texture_uid: *const ::std::os::raw::c_char,
         shader_uids_count: usize,

diff --git a/engine/static/render/include/argus/render/cabi/common/material.h b/engine/static/render/include/argus/render/cabi/common/material.h
@@ -26,6 +26,8 @@ extern "C" {
 
 typedef void *argus_material_t;
 
+size_t argus_material_len(void);
+
 argus_material_t argus_material_new(const char *texture_uid, size_t shader_uids_count, const char *const *shader_uids);
 
 void argus_material_delete(argus_material_t material);

diff --git a/engine/static/render/src/cabi/common/material.cpp b/engine/static/render/src/cabi/common/material.cpp
@@ -34,6 +34,10 @@ static inline const argus::Material &_as_ref(argus_material_t material) {
 
 extern "C" {
 
+size_t argus_material_len(void) {
+    return sizeof(argus::Material);
+}
+
 argus_material_t argus_material_new(const char *texture_uid, size_t shader_uids_count, const char *const *shader_uids) {
     std::vector<std::string> shader_uids_vec;
     shader_uids_vec.reserve(shader_uids_count);