From c554677c9523a2ab9d25630450e06bfea06f5db9 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Fri, 27 Mar 2020 13:57:20 +0100 Subject: [PATCH] Fix various -Wmaybe-uninitialized (#37352). --- modules/csg/csg_shape.cpp | 4 +-- scene/resources/mesh.cpp | 2 +- scene/resources/mesh_data_tool.cpp | 28 +++++++++---------- .../rasterizer_scene_high_end_rd.cpp | 4 +-- servers/visual_server.cpp | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp index 54635ae32079..746c66bdf1e2 100644 --- a/modules/csg/csg_shape.cpp +++ b/modules/csg/csg_shape.cpp @@ -741,7 +741,7 @@ CSGBrush *CSGMesh::_build_brush() { const Vector3 *vr = avertices.ptr(); Vector anormals = arrays[Mesh::ARRAY_NORMAL]; - const Vector3 *nr; + const Vector3 *nr = NULL; bool nr_used = false; if (anormals.size()) { nr = anormals.ptr(); @@ -749,7 +749,7 @@ CSGBrush *CSGMesh::_build_brush() { } Vector auvs = arrays[Mesh::ARRAY_TEX_UV]; - const Vector2 *uvr; + const Vector2 *uvr = NULL; bool uvr_used = false; if (auvs.size()) { uvr = auvs.ptr(); diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp index f93b7ced9815..9f3433be0fdc 100644 --- a/scene/resources/mesh.cpp +++ b/scene/resources/mesh.cpp @@ -372,7 +372,7 @@ Ref Mesh::create_outline(float p_margin) const { ERR_FAIL_COND_V(arrays.size() != ARRAY_MAX, Ref()); { - int *ir; + int *ir = NULL; Vector indices = arrays[ARRAY_INDEX]; bool has_indices = false; Vector vertices = arrays[ARRAY_VERTEX]; diff --git a/scene/resources/mesh_data_tool.cpp b/scene/resources/mesh_data_tool.cpp index 675cfc6d6474..8b7f8288b853 100644 --- a/scene/resources/mesh_data_tool.cpp +++ b/scene/resources/mesh_data_tool.cpp @@ -58,30 +58,30 @@ Error MeshDataTool::create_from_surface(const Ref &p_mesh, int p_surf const Vector3 *vr = varray.ptr(); - const Vector3 *nr; + const Vector3 *nr = NULL; if (arrays[Mesh::ARRAY_NORMAL].get_type() != Variant::NIL) nr = arrays[Mesh::ARRAY_NORMAL].operator Vector().ptr(); - const real_t *ta; + const real_t *ta = NULL; if (arrays[Mesh::ARRAY_TANGENT].get_type() != Variant::NIL) ta = arrays[Mesh::ARRAY_TANGENT].operator Vector().ptr(); - const Vector2 *uv; + const Vector2 *uv = NULL; if (arrays[Mesh::ARRAY_TEX_UV].get_type() != Variant::NIL) uv = arrays[Mesh::ARRAY_TEX_UV].operator Vector().ptr(); - const Vector2 *uv2; + const Vector2 *uv2 = NULL; if (arrays[Mesh::ARRAY_TEX_UV2].get_type() != Variant::NIL) uv2 = arrays[Mesh::ARRAY_TEX_UV2].operator Vector().ptr(); - const Color *col; + const Color *col = NULL; if (arrays[Mesh::ARRAY_COLOR].get_type() != Variant::NIL) col = arrays[Mesh::ARRAY_COLOR].operator Vector().ptr(); - const int *bo; + const int *bo = NULL; if (arrays[Mesh::ARRAY_BONES].get_type() != Variant::NIL) bo = arrays[Mesh::ARRAY_BONES].operator Vector().ptr(); - const real_t *we; + const real_t *we = NULL; if (arrays[Mesh::ARRAY_WEIGHTS].get_type() != Variant::NIL) we = arrays[Mesh::ARRAY_WEIGHTS].operator Vector().ptr(); @@ -202,43 +202,43 @@ Error MeshDataTool::commit_to_surface(const Ref &p_mesh) { v.resize(vcount); Vector3 *vr = v.ptrw(); - Vector3 *nr; + Vector3 *nr = NULL; if (format & Mesh::ARRAY_FORMAT_NORMAL) { n.resize(vcount); nr = n.ptrw(); } - real_t *ta; + real_t *ta = NULL; if (format & Mesh::ARRAY_FORMAT_TANGENT) { t.resize(vcount * 4); ta = t.ptrw(); } - Vector2 *uv; + Vector2 *uv = NULL; if (format & Mesh::ARRAY_FORMAT_TEX_UV) { u.resize(vcount); uv = u.ptrw(); } - Vector2 *uv2; + Vector2 *uv2 = NULL; if (format & Mesh::ARRAY_FORMAT_TEX_UV2) { u2.resize(vcount); uv2 = u2.ptrw(); } - Color *col; + Color *col = NULL; if (format & Mesh::ARRAY_FORMAT_COLOR) { c.resize(vcount); col = c.ptrw(); } - int *bo; + int *bo = NULL; if (format & Mesh::ARRAY_FORMAT_BONES) { b.resize(vcount * 4); bo = b.ptrw(); } - real_t *we; + real_t *we = NULL; if (format & Mesh::ARRAY_FORMAT_WEIGHTS) { w.resize(vcount * 4); we = w.ptrw(); diff --git a/servers/visual/rasterizer_rd/rasterizer_scene_high_end_rd.cpp b/servers/visual/rasterizer_rd/rasterizer_scene_high_end_rd.cpp index 1bc181bea399..113f225c4790 100644 --- a/servers/visual/rasterizer_rd/rasterizer_scene_high_end_rd.cpp +++ b/servers/visual/rasterizer_rd/rasterizer_scene_high_end_rd.cpp @@ -809,7 +809,7 @@ void RasterizerSceneHighEndRD::_render_list(RenderingDevice::DrawListID p_draw_l } } - ShaderVersion shader_version; + ShaderVersion shader_version = SHADER_VERSION_MAX; switch (p_pass_mode) { case PASS_MODE_COLOR: @@ -855,7 +855,7 @@ void RasterizerSceneHighEndRD::_render_list(RenderingDevice::DrawListID p_draw_l pipeline = &shader->pipelines[cull_variant][primitive][shader_version]; - RD::VertexFormatID vertex_format; + RD::VertexFormatID vertex_format = -1; RID vertex_array_rd; RID index_array_rd; diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp index 1e4ee5cb504e..da1f3efbab0f 100644 --- a/servers/visual_server.cpp +++ b/servers/visual_server.cpp @@ -333,7 +333,7 @@ Error VisualServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint32_ uint8_t *vw = r_vertex_array.ptrw(); - uint8_t *iw; + uint8_t *iw = NULL; if (r_index_array.size()) { iw = r_index_array.ptrw(); }