Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 07:53:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #103303 from aaronfranke/fix-compile-arm64-linux

Browse source 
Fix compiling on arm64 Linux with GCC
This commit is contained in:
Rémi Verschelde 2025-02-26 00:23:55 +01:00 • committed by GitHub
commit a398f4f893
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 47 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

84
modules/gltf/gltf_document.cpp
View file

@ -1198,10 +1198,11 @@ Error GLTFDocument::_encode_buffer_view(Ref<GLTFState> p_state, const double *p_
dst_i++; dst_i++;
} }
} }
int64_t old_size = gltf_buffer.size(); const int64_t old_size = gltf_buffer.size();
gltf_buffer.resize(old_size + (buffer.size() * sizeof(int8_t))); const size_t buffer_size = buffer.size() * sizeof(int8_t);
memcpy(gltf_buffer.ptrw() + old_size, buffer.ptrw(), buffer.size() * sizeof(int8_t)); gltf_buffer.resize(old_size + buffer_size);
bv->byte_length = buffer.size() * sizeof(int8_t); memcpy(gltf_buffer.ptrw() + old_size, buffer.ptrw(), buffer_size);
bv->byte_length = buffer_size;
} break; } break;
case GLTFAccessor::COMPONENT_TYPE_UNSIGNED_BYTE: { case GLTFAccessor::COMPONENT_TYPE_UNSIGNED_BYTE: {
Vector<uint8_t> buffer; Vector<uint8_t> buffer;
@ -1223,7 +1224,8 @@ Error GLTFDocument::_encode_buffer_view(Ref<GLTFState> p_state, const double *p_
} }
} }
gltf_buffer.append_array(buffer); gltf_buffer.append_array(buffer);
bv->byte_length = buffer.size() * sizeof(uint8_t); const size_t buffer_size = buffer.size() * sizeof(uint8_t);
bv->byte_length = buffer_size;
} break; } break;
case GLTFAccessor::COMPONENT_TYPE_SIGNED_SHORT: { case GLTFAccessor::COMPONENT_TYPE_SIGNED_SHORT: {
Vector<int16_t> buffer; Vector<int16_t> buffer;
@ -1244,10 +1246,11 @@ Error GLTFDocument::_encode_buffer_view(Ref<GLTFState> p_state, const double *p_
dst_i++; dst_i++;
} }
} }
int64_t old_size = gltf_buffer.size(); const int64_t old_size = gltf_buffer.size();
gltf_buffer.resize(old_size + (buffer.size() * sizeof(int16_t))); const size_t buffer_size = buffer.size() * sizeof(int16_t);
memcpy(gltf_buffer.ptrw() + old_size, buffer.ptrw(), buffer.size() * sizeof(int16_t)); gltf_buffer.resize(old_size + buffer_size);
bv->byte_length = buffer.size() * sizeof(int16_t); memcpy(gltf_buffer.ptrw() + old_size, buffer.ptrw(), buffer_size);
bv->byte_length = buffer_size;
} break; } break;
case GLTFAccessor::COMPONENT_TYPE_UNSIGNED_SHORT: { case GLTFAccessor::COMPONENT_TYPE_UNSIGNED_SHORT: {
Vector<uint16_t> buffer; Vector<uint16_t> buffer;
@ -1268,10 +1271,11 @@ Error GLTFDocument::_encode_buffer_view(Ref<GLTFState> p_state, const double *p_
dst_i++; dst_i++;
} }
} }
int64_t old_size = gltf_buffer.size(); const int64_t old_size = gltf_buffer.size();
gltf_buffer.resize(old_size + (buffer.size() * sizeof(uint16_t))); const size_t buffer_size = buffer.size() * sizeof(uint16_t);
memcpy(gltf_buffer.ptrw() + old_size, buffer.ptrw(), buffer.size() * sizeof(uint16_t)); gltf_buffer.resize(old_size + buffer_size);
bv->byte_length = buffer.size() * sizeof(uint16_t); memcpy(gltf_buffer.ptrw() + old_size, buffer.ptrw(), buffer_size);
bv->byte_length = buffer_size;
} break; } break;
case GLTFAccessor::COMPONENT_TYPE_SIGNED_INT: { case GLTFAccessor::COMPONENT_TYPE_SIGNED_INT: {
Vector<int32_t> buffer; Vector<int32_t> buffer;
@ -1288,10 +1292,11 @@ Error GLTFDocument::_encode_buffer_view(Ref<GLTFState> p_state, const double *p_
dst_i++; dst_i++;
} }
} }
int64_t old_size = gltf_buffer.size(); const int64_t old_size = gltf_buffer.size();
gltf_buffer.resize(old_size + (buffer.size() * sizeof(uint32_t))); const size_t buffer_size = buffer.size() * sizeof(int32_t);
memcpy(gltf_buffer.ptrw() + old_size, buffer.ptrw(), buffer.size() * sizeof(uint32_t)); gltf_buffer.resize(old_size + buffer_size);
bv->byte_length = buffer.size() * sizeof(uint32_t); memcpy(gltf_buffer.ptrw() + old_size, buffer.ptrw(), buffer_size);
bv->byte_length = buffer_size;
} break; } break;
case GLTFAccessor::COMPONENT_TYPE_UNSIGNED_INT: { case GLTFAccessor::COMPONENT_TYPE_UNSIGNED_INT: {
Vector<uint32_t> buffer; Vector<uint32_t> buffer;
@ -1308,10 +1313,11 @@ Error GLTFDocument::_encode_buffer_view(Ref<GLTFState> p_state, const double *p_
dst_i++; dst_i++;
} }
} }
int64_t old_size = gltf_buffer.size(); const int64_t old_size = gltf_buffer.size();
gltf_buffer.resize(old_size + (buffer.size() * sizeof(uint32_t))); const size_t buffer_size = buffer.size() * sizeof(uint32_t);
memcpy(gltf_buffer.ptrw() + old_size, buffer.ptrw(), buffer.size() * sizeof(uint32_t)); gltf_buffer.resize(old_size + buffer_size);
bv->byte_length = buffer.size() * sizeof(uint32_t); memcpy(gltf_buffer.ptrw() + old_size, buffer.ptrw(), buffer_size);
bv->byte_length = buffer_size;
} break; } break;
case GLTFAccessor::COMPONENT_TYPE_SINGLE_FLOAT: { case GLTFAccessor::COMPONENT_TYPE_SINGLE_FLOAT: {
Vector<float> buffer; Vector<float> buffer;
@ -1328,10 +1334,11 @@ Error GLTFDocument::_encode_buffer_view(Ref<GLTFState> p_state, const double *p_
dst_i++; dst_i++;
} }
} }
int64_t old_size = gltf_buffer.size(); const int64_t old_size = gltf_buffer.size();
gltf_buffer.resize(old_size + (buffer.size() * sizeof(float))); const size_t buffer_size = buffer.size() * sizeof(float);
memcpy(gltf_buffer.ptrw() + old_size, buffer.ptrw(), buffer.size() * sizeof(float)); gltf_buffer.resize(old_size + buffer_size);
bv->byte_length = buffer.size() * sizeof(float); memcpy(gltf_buffer.ptrw() + old_size, buffer.ptrw(), buffer_size);
bv->byte_length = buffer_size;
} break; } break;
case GLTFAccessor::COMPONENT_TYPE_DOUBLE_FLOAT: { case GLTFAccessor::COMPONENT_TYPE_DOUBLE_FLOAT: {
Vector<double> buffer; Vector<double> buffer;
@ -1348,10 +1355,11 @@ Error GLTFDocument::_encode_buffer_view(Ref<GLTFState> p_state, const double *p_
dst_i++; dst_i++;
} }
} }
int64_t old_size = gltf_buffer.size(); const int64_t old_size = gltf_buffer.size();
gltf_buffer.resize(old_size + (buffer.size() * sizeof(double))); const size_t buffer_size = buffer.size() * sizeof(double);
memcpy(gltf_buffer.ptrw() + old_size, buffer.ptrw(), buffer.size() * sizeof(double)); gltf_buffer.resize(old_size + buffer_size);
bv->byte_length = buffer.size() * sizeof(double); memcpy(gltf_buffer.ptrw() + old_size, buffer.ptrw(), buffer_size);
bv->byte_length = buffer_size;
} break; } break;
case GLTFAccessor::COMPONENT_TYPE_HALF_FLOAT: { case GLTFAccessor::COMPONENT_TYPE_HALF_FLOAT: {
ERR_FAIL_V_MSG(ERR_UNAVAILABLE, "glTF: Half float not supported yet."); ERR_FAIL_V_MSG(ERR_UNAVAILABLE, "glTF: Half float not supported yet.");
@ -1372,10 +1380,11 @@ Error GLTFDocument::_encode_buffer_view(Ref<GLTFState> p_state, const double *p_
dst_i++; dst_i++;
} }
} }
int64_t old_size = gltf_buffer.size(); const int64_t old_size = gltf_buffer.size();
gltf_buffer.resize(old_size + (buffer.size() * sizeof(int64_t))); const size_t buffer_size = buffer.size() * sizeof(int64_t);
memcpy(gltf_buffer.ptrw() + old_size, buffer.ptrw(), buffer.size() * sizeof(int64_t)); gltf_buffer.resize(old_size + buffer_size);
bv->byte_length = buffer.size() * sizeof(int64_t); memcpy(gltf_buffer.ptrw() + old_size, buffer.ptrw(), buffer_size);
bv->byte_length = buffer_size;
} break; } break;
case GLTFAccessor::COMPONENT_TYPE_UNSIGNED_LONG: { case GLTFAccessor::COMPONENT_TYPE_UNSIGNED_LONG: {
Vector<uint64_t> buffer; Vector<uint64_t> buffer;
@ -1393,10 +1402,11 @@ Error GLTFDocument::_encode_buffer_view(Ref<GLTFState> p_state, const double *p_
dst_i++; dst_i++;
} }
} }
int64_t old_size = gltf_buffer.size(); const int64_t old_size = gltf_buffer.size();
gltf_buffer.resize(old_size + (buffer.size() * sizeof(uint64_t))); const size_t buffer_size = buffer.size() * sizeof(uint64_t);
memcpy(gltf_buffer.ptrw() + old_size, buffer.ptrw(), buffer.size() * sizeof(uint64_t)); gltf_buffer.resize(old_size + buffer_size);
bv->byte_length = buffer.size() * sizeof(uint64_t); memcpy(gltf_buffer.ptrw() + old_size, buffer.ptrw(), buffer_size);
bv->byte_length = buffer_size;
} break; } break;
} }
ERR_FAIL_COND_V(buffer_end > bv->byte_length, ERR_INVALID_DATA); ERR_FAIL_COND_V(buffer_end > bv->byte_length, ERR_INVALID_DATA);