diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-18 16:41:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-18 16:41:58 +0200 |
commit | 0cdbf7315b1ce7093f9c37eae2d9df3294cfb998 (patch) | |
tree | 3847a97791b023ff2110b6645ddeeace8b2b88cf | |
parent | 054ac5c8f5d07ef86f76664ec6b5c3b60b812240 (diff) | |
parent | e36e9fdb1c94d3fb27ce1b4b776322cbf3e67ee7 (diff) |
Merge pull request #29751 from lawnjelly/skin-fix
Fixes crash with rigged meshes on some OpenGLES2 devices
-rw-r--r-- | drivers/gles2/rasterizer_storage_gles2.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gles2/rasterizer_storage_gles2.cpp b/drivers/gles2/rasterizer_storage_gles2.cpp index 70f1173a7d..418be136b8 100644 --- a/drivers/gles2/rasterizer_storage_gles2.cpp +++ b/drivers/gles2/rasterizer_storage_gles2.cpp @@ -2427,6 +2427,18 @@ void RasterizerStorageGLES2::mesh_add_surface(RID p_mesh, uint32_t p_format, VS: } surface->data = array; surface->index_data = p_index_array; +#else + // Even on non-tools builds, a copy of the surface->data is needed in certain circumstances. + // Rigged meshes using the USE_SKELETON_SOFTWARE path need to read bone data + // from surface->data. + + // if USE_SKELETON_SOFTWARE is active + if (!config.float_texture_supported) { + // if this geometry is used specifically for skinning + if (p_format & (VS::ARRAY_FORMAT_BONES | VS::ARRAY_FORMAT_WEIGHTS)) + surface->data = array; + } + // An alternative is to always make a copy of surface->data. #endif surface->total_data_size += surface->array_byte_size + surface->index_array_byte_size; |