godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #60772 from MightiestGoat/multimesh-uniform-set

Browse Source 
Fix the uniform set creation of multimesh with a invalidated buffer
This commit is contained in:
Rémi Verschelde 2022-05-05 16:55:48 +02:00 committed by GitHub
commit 8fb02635d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
servers/rendering/renderer_rd/storage_rd/mesh_storage.h
View File

@ -614,7 +614,13 @@ public:
_FORCE_INLINE_ RID multimesh_get_3d_uniform_set(RID p_multimesh, RID p_shader, uint32_t p_set) const { _FORCE_INLINE_ RID multimesh_get_3d_uniform_set(RID p_multimesh, RID p_shader, uint32_t p_set) const {
MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh); MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
if (multimesh == nullptr) {
return RID();
}
if (!multimesh->uniform_set_3d.is_valid()) { if (!multimesh->uniform_set_3d.is_valid()) {
if (!multimesh->buffer.is_valid()) {
return RID();
}
Vector<RD::Uniform> uniforms; Vector<RD::Uniform> uniforms;
RD::Uniform u; RD::Uniform u;
u.uniform_type = RD::UNIFORM_TYPE_STORAGE_BUFFER; u.uniform_type = RD::UNIFORM_TYPE_STORAGE_BUFFER;
@ -629,7 +635,13 @@ public:
_FORCE_INLINE_ RID multimesh_get_2d_uniform_set(RID p_multimesh, RID p_shader, uint32_t p_set) const { _FORCE_INLINE_ RID multimesh_get_2d_uniform_set(RID p_multimesh, RID p_shader, uint32_t p_set) const {
MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh); MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh);
if (multimesh == nullptr) {
return RID();
}
if (!multimesh->uniform_set_2d.is_valid()) { if (!multimesh->uniform_set_2d.is_valid()) {
if (!multimesh->buffer.is_valid()) {
return RID();
}
Vector<RD::Uniform> uniforms; Vector<RD::Uniform> uniforms;
RD::Uniform u; RD::Uniform u;
u.uniform_type = RD::UNIFORM_TYPE_STORAGE_BUFFER; u.uniform_type = RD::UNIFORM_TYPE_STORAGE_BUFFER;