asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #85917 from akien-mga/3.x-fix-Wtype-limits-gcc-arm64

Browse source 
[3.x] Fix various GCC 13 warnings
This commit is contained in:
Rémi Verschelde 2023-12-11 20:02:09 +01:00
commit 1fe73d4feb
No known key found for this signature in database
GPG key ID: C3336907360768E1
7 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/ustring.cpp
View file

@ -1460,7 +1460,11 @@ bool String::parse_utf8(const char *p_utf8, int p_len, bool p_skip_cr) {
int skip = 0; int skip = 0;
while (ptrtmp != ptrtmp_limit && *ptrtmp) { while (ptrtmp != ptrtmp_limit && *ptrtmp) {
if (skip == 0) { if (skip == 0) {
#if CHAR_MIN == 0
uint8_t c = *ptrtmp;
#else
uint8_t c = *ptrtmp >= 0 ? *ptrtmp : uint8_t(256 + *ptrtmp); uint8_t c = *ptrtmp >= 0 ? *ptrtmp : uint8_t(256 + *ptrtmp);
#endif
if (p_skip_cr && c == '\r') { if (p_skip_cr && c == '\r') {
ptrtmp++; ptrtmp++;

8
drivers/gles2/rasterizer_storage_gles2.h
View file

@ -1214,10 +1214,10 @@ public:
struct MipMaps { struct MipMaps {
struct Size { struct Size {
GLuint fbo; GLuint fbo = 0;
GLuint color; GLuint color = 0;
int width; int width = 0;
int height; int height = 0;
}; };
Vector<Size> sizes; Vector<Size> sizes;

6
drivers/gles3/rasterizer_storage_gles3.h
View file

@ -1349,9 +1349,9 @@ public:
struct Effects { struct Effects {
struct MipMaps { struct MipMaps {
struct Size { struct Size {
GLuint fbo; GLuint fbo = 0;
int width; int width = 0;
int height; int height = 0;
}; };
Vector<Size> sizes; Vector<Size> sizes;

4
modules/csg/csg.h
View file

@ -160,7 +160,7 @@ struct CSGBrushOperation {
}; };
struct Face2D { struct Face2D {
int vertex_idx[3]; int vertex_idx[3] = {};
}; };
Vector<Vertex2D> vertices; Vector<Vertex2D> vertices;
@ -168,7 +168,7 @@ struct CSGBrushOperation {
Plane plane; Plane plane;
Transform to_2D; Transform to_2D;
Transform to_3D; Transform to_3D;
float vertex_snap2; float vertex_snap2 = 0.0;
inline int _get_point_idx(const Vector2 &p_point); inline int _get_point_idx(const Vector2 &p_point);
inline int _add_vertex(const Vertex2D &p_vertex); inline int _add_vertex(const Vertex2D &p_vertex);

6
modules/visual_script/visual_script.cpp
View file

@ -1696,11 +1696,7 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
} }
next = node->sequence_outputs[output]; next = node->sequence_outputs[output];
if (next) { VSDEBUG("GOT NEXT NODE - " + (next ? itos(next->get_id()) : "NULL"));
VSDEBUG("GOT NEXT NODE - " + itos(next->get_id()));
} else {
VSDEBUG("GOT NEXT NODE - NULL");
}
} }
if (flow_stack) { if (flow_stack) {

4
servers/physics/space_sw.cpp
View file

@ -115,8 +115,8 @@ bool PhysicsDirectSpaceStateSW::intersect_ray(const Vector3 &p_from, const Vecto
bool collided = false; bool collided = false;
Vector3 res_point, res_normal; Vector3 res_point, res_normal;
int res_shape; int res_shape = 0;
const CollisionObjectSW *res_obj; const CollisionObjectSW *res_obj = nullptr;
real_t min_d = 1e10; real_t min_d = 1e10;
for (int i = 0; i < amount; i++) { for (int i = 0; i < amount; i++) {

4
servers/physics_2d/space_2d_sw.cpp
View file

@ -137,8 +137,8 @@ bool Physics2DDirectSpaceStateSW::intersect_ray(const Vector2 &p_from, const Vec
bool collided = false; bool collided = false;
Vector2 res_point, res_normal; Vector2 res_point, res_normal;
int res_shape; int res_shape = 0;
const CollisionObject2DSW *res_obj; const CollisionObject2DSW *res_obj = nullptr;
real_t min_d = 1e10; real_t min_d = 1e10;
for (int i = 0; i < amount; i++) { for (int i = 0; i < amount; i++) {