godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

CI: Sync configuration with 4.4 branch

Browse Source 
Includes cherry-pick of warning fixes from 8d1462c748
and template builds unit tests fixes from 17929a3443.

Also a Windows MSVC detection fix for SCons 4.6.0+ from f682406cf2.
This commit is contained in:
Rémi Verschelde
2025-04-24 18:14:03 +02:00
parent c8fe093a3a
commit 02d383bf94
33 changed files with 461 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
servers/rendering/renderer_rd/storage_rd/texture_storage.cpp
View File

@@ -176,12 +176,20 @@ TextureStorage::TextureStorage() {
tf.usage_bits = RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT | RD::TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
tf.texture_type = RD::TEXTURE_TYPE_2D;
// MinGW-GCC gets confused here, though it's clear it can't overflow unless `resize` hits OOM.
#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic warning "-Wstringop-overflow=0"
#endif
Vector<uint8_t> sv;
sv.resize(16 * 2);
uint16_t *ptr = (uint16_t *)sv.ptrw();
for (int i = 0; i < 16; i++) {
ptr[i] = Math::make_half_float(1.0f);
}
#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic pop
#endif
Vector<Vector<uint8_t>> vpv;
vpv.push_back(sv);
@@ -450,12 +458,19 @@ TextureStorage::TextureStorage() {
tformat.usage_bits = RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT | RD::TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
tformat.texture_type = RD::TEXTURE_TYPE_2D_ARRAY;
#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic warning "-Wstringop-overflow=0"
#endif
Vector<uint8_t> sv;
sv.resize(16 * 2);
uint16_t *ptr = (uint16_t *)sv.ptrw();
for (int i = 0; i < 16; i++) {
ptr[i] = Math::make_half_float(1.0f);
}
#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic pop
#endif
{
Vector<Vector<uint8_t>> vsv;