Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid division by zero in the fix surface compatibility routine #85138

Merged
merged 1 commit into from
Nov 20, 2023
Merged

Avoid division by zero in the fix surface compatibility routine #85138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 34 additions & 32 deletions servers/rendering_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2148,45 +2148,47 @@ void RenderingServer::fix_surface_compatibility(SurfaceData &p_surface, const St
// The only difference for now is that Version 1 uses interleaved vertex positions while version 2 does not.
// I.e. PNTPNTPNT -> PPPNTNTNT.

int vertex_size = 0;
int normal_size = 0;
int tangent_size = 0;
if (p_surface.format & ARRAY_FORMAT_VERTEX) {
if (p_surface.format & ARRAY_FLAG_USE_2D_VERTICES) {
vertex_size = sizeof(float) * 2;
} else {
vertex_size = sizeof(float) * 3;
if (p_surface.vertex_data.size() > 0 && p_surface.vertex_count > 0) {
int vertex_size = 0;
int normal_size = 0;
int tangent_size = 0;
if (p_surface.format & ARRAY_FORMAT_VERTEX) {
if (p_surface.format & ARRAY_FLAG_USE_2D_VERTICES) {
vertex_size = sizeof(float) * 2;
} else {
vertex_size = sizeof(float) * 3;
}
}
}
if (p_surface.format & ARRAY_FORMAT_NORMAL) {
normal_size += sizeof(uint16_t) * 2;
}
if (p_surface.format & ARRAY_FORMAT_TANGENT) {
tangent_size = sizeof(uint16_t) * 2;
}
int stride = p_surface.vertex_data.size() / p_surface.vertex_count;
int position_stride = vertex_size;
int normal_tangent_stride = normal_size + tangent_size;
if (p_surface.format & ARRAY_FORMAT_NORMAL) {
normal_size += sizeof(uint16_t) * 2;
}
if (p_surface.format & ARRAY_FORMAT_TANGENT) {
tangent_size = sizeof(uint16_t) * 2;
}
int stride = p_surface.vertex_data.size() / p_surface.vertex_count;
int position_stride = vertex_size;
int normal_tangent_stride = normal_size + tangent_size;

p_surface.vertex_data = _convert_surface_version_1_to_surface_version_2(p_surface.format, p_surface.vertex_data, p_surface.vertex_count, stride, vertex_size, normal_size, position_stride, normal_tangent_stride);
p_surface.vertex_data = _convert_surface_version_1_to_surface_version_2(p_surface.format, p_surface.vertex_data, p_surface.vertex_count, stride, vertex_size, normal_size, position_stride, normal_tangent_stride);

if (p_surface.blend_shape_data.size() > 0) {
// The size of one blend shape.
int divisor = (vertex_size + normal_size + tangent_size) * p_surface.vertex_count;
ERR_FAIL_COND((p_surface.blend_shape_data.size() % divisor) != 0);
if (p_surface.blend_shape_data.size() > 0) {
// The size of one blend shape.
int divisor = (vertex_size + normal_size + tangent_size) * p_surface.vertex_count;
ERR_FAIL_COND((p_surface.blend_shape_data.size() % divisor) != 0);

uint32_t blend_shape_count = p_surface.blend_shape_data.size() / divisor;
uint32_t blend_shape_count = p_surface.blend_shape_data.size() / divisor;

Vector<uint8_t> new_blend_shape_data;
for (uint32_t i = 0; i < blend_shape_count; i++) {
Vector<uint8_t> bs_data = p_surface.blend_shape_data.slice(i * divisor, (i + 1) * divisor);
Vector<uint8_t> blend_shape = _convert_surface_version_1_to_surface_version_2(p_surface.format, bs_data, p_surface.vertex_count, stride, vertex_size, normal_size, position_stride, normal_tangent_stride);
new_blend_shape_data.append_array(blend_shape);
}
Vector<uint8_t> new_blend_shape_data;
for (uint32_t i = 0; i < blend_shape_count; i++) {
Vector<uint8_t> bs_data = p_surface.blend_shape_data.slice(i * divisor, (i + 1) * divisor);
Vector<uint8_t> blend_shape = _convert_surface_version_1_to_surface_version_2(p_surface.format, bs_data, p_surface.vertex_count, stride, vertex_size, normal_size, position_stride, normal_tangent_stride);
new_blend_shape_data.append_array(blend_shape);
}

ERR_FAIL_COND(p_surface.blend_shape_data.size() != new_blend_shape_data.size());
ERR_FAIL_COND(p_surface.blend_shape_data.size() != new_blend_shape_data.size());

p_surface.blend_shape_data = new_blend_shape_data;
p_surface.blend_shape_data = new_blend_shape_data;
}
}
}
p_surface.format &= ~(ARRAY_FLAG_FORMAT_VERSION_MASK << ARRAY_FLAG_FORMAT_VERSION_SHIFT);
Expand Down
Loading