openharmony/third_party_meshoptimizer
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_meshoptimizer.git synced 2026-07-19 12:03:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

extern: Improve EXT_mesh_gpu_instancing validation in cgltf

Browse Source 
With this change we validate that instanced meshes have a mesh, have
attributes and that all attributes agree on the number of elements.

This makes sure that using the instancing data is less error prone and
is unlikely to lead to memory safety issues. The same change was
submitted upstream: https://github.com/jkuhlmann/cgltf/pull/252
This commit is contained in:
Arseny Kapoulkine
2024-05-25 14:49:38 -07:00
parent 1f06f6864c
commit cbc2a595ec
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extern/cgltf.h
Vendored
+14 -1
View File
@@ -1697,7 +1697,20 @@ cgltf_result cgltf_validate(cgltf_data* data)
{
if (data->nodes[i].weights && data->nodes[i].mesh)
{
CGLTF_ASSERT_IF (data->nodes[i].mesh->primitives_count && data->nodes[i].mesh->primitives[0].targets_count != data->nodes[i].weights_count, cgltf_result_invalid_gltf);
CGLTF_ASSERT_IF(data->nodes[i].mesh->primitives_count && data->nodes[i].mesh->primitives[0].targets_count != data->nodes[i].weights_count, cgltf_result_invalid_gltf);
}
if (data->nodes[i].has_mesh_gpu_instancing)
{
CGLTF_ASSERT_IF(data->nodes[i].mesh == NULL, cgltf_result_invalid_gltf);
CGLTF_ASSERT_IF(data->nodes[i].mesh_gpu_instancing.attributes_count == 0, cgltf_result_invalid_gltf);
cgltf_accessor* first = data->nodes[i].mesh_gpu_instancing.attributes[0].data;
for (cgltf_size k = 0; k < data->nodes[i].mesh_gpu_instancing.attributes_count; ++k)
{
CGLTF_ASSERT_IF(data->nodes[i].mesh_gpu_instancing.attributes[k].data->count != first->count, cgltf_result_invalid_gltf);
}
}
}