diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index e886540a7af..bb622edffe4 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -1020,7 +1020,9 @@ struct _OSCoreBindImg { }; void _OS::print_all_textures_by_size() { - + // HACK: This is broken, was fixed in 3.4+, we don't bother here. + // Just comment out to silence warnings. + /* List<_OSCoreBindImg> imgs; uint64_t total = 0; { @@ -1052,6 +1054,7 @@ void _OS::print_all_textures_by_size() { total -= E->get().vram; } + */ } void _OS::print_resources_by_type(const Vector &p_types) { diff --git a/core/compressed_translation.cpp b/core/compressed_translation.cpp index 9085802d56c..2b990532cde 100644 --- a/core/compressed_translation.cpp +++ b/core/compressed_translation.cpp @@ -63,7 +63,6 @@ void PHashTranslation::generate(const Ref &p_from) { int idx = 0; int total_compression_size = 0; - int total_string_size = 0; for (List::Element *E = keys.front(); E; E = E->next()) { @@ -102,7 +101,6 @@ void PHashTranslation::generate(const Ref &p_from) { compressed.write[idx] = ps; total_compression_size += ps.compressed.size(); - total_string_size += src_s.size(); idx++; } @@ -149,7 +147,6 @@ void PHashTranslation::generate(const Ref &p_from) { uint32_t *btw = (uint32_t *)&btwb[0]; int btindex = 0; - int collisions = 0; for (int i = 0; i < size; i++) { @@ -157,8 +154,6 @@ void PHashTranslation::generate(const Ref &p_from) { if (t.size() == 0) { htw[i] = 0xFFFFFFFF; //nothing continue; - } else if (t.size() > 1) { - collisions += t.size() - 1; } htw[i] = btindex; diff --git a/core/io/translation_loader_po.cpp b/core/io/translation_loader_po.cpp index e5823d906c1..cd72aa181e8 100644 --- a/core/io/translation_loader_po.cpp +++ b/core/io/translation_loader_po.cpp @@ -50,7 +50,9 @@ RES TranslationLoaderPO::load_translation(FileAccess *f, Error *r_error) { *r_error = ERR_FILE_CORRUPT; Ref translation = Ref(memnew(Translation)); +#ifdef DEBUG_ENABLED int line = 1; +#endif bool skip_this = false; bool skip_next = false; bool is_eof = false; @@ -108,7 +110,9 @@ RES TranslationLoaderPO::load_translation(FileAccess *f, Error *r_error) { if (l.find("fuzzy") != -1) { skip_next = true; } +#ifdef DEBUG_ENABLED line++; +#endif continue; //nothing to read or comment } @@ -141,7 +145,9 @@ RES TranslationLoaderPO::load_translation(FileAccess *f, Error *r_error) { else msg_str += l; +#ifdef DEBUG_ENABLED line++; +#endif } memdelete(f); diff --git a/drivers/gles2/rasterizer_scene_gles2.cpp b/drivers/gles2/rasterizer_scene_gles2.cpp index 79473221370..53836326483 100644 --- a/drivers/gles2/rasterizer_scene_gles2.cpp +++ b/drivers/gles2/rasterizer_scene_gles2.cpp @@ -2758,21 +2758,19 @@ void RasterizerSceneGLES2::_post_process(Environment *env, const CameraMatrix &p } use_post_process = use_post_process || storage->frame.current_rt->use_fxaa; - GLuint next_buffer; - - if (use_post_process) { - next_buffer = storage->frame.current_rt->mip_maps[0].sizes[0].fbo; - } else if (storage->frame.current_rt->external.fbo != 0) { - next_buffer = storage->frame.current_rt->external.fbo; - } else { - // set next_buffer to front buffer so multisample blit can happen if needed - next_buffer = storage->frame.current_rt->fbo; - } - // If using multisample buffer, resolve to post_process_effect buffer or to front buffer if (storage->frame.current_rt && storage->frame.current_rt->multisample_active) { -#ifdef GLES_OVER_GL + GLuint next_buffer; + if (use_post_process) { + next_buffer = storage->frame.current_rt->mip_maps[0].sizes[0].fbo; + } else if (storage->frame.current_rt->external.fbo != 0) { + next_buffer = storage->frame.current_rt->external.fbo; + } else { + // set next_buffer to front buffer so multisample blit can happen if needed + next_buffer = storage->frame.current_rt->fbo; + } +#ifdef GLES_OVER_GL glBindFramebuffer(GL_READ_FRAMEBUFFER, storage->frame.current_rt->multisample_fbo); glReadBuffer(GL_COLOR_ATTACHMENT0); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, next_buffer); @@ -2794,6 +2792,7 @@ void RasterizerSceneGLES2::_post_process(Environment *env, const CameraMatrix &p _copy_texture_to_buffer(storage->frame.current_rt->multisample_color, next_buffer); #else // TODO: any other platform not supported? this will fail.. maybe we should just call _copy_texture_to_buffer here as well? + (void)next_buffer; // Silence warning as it's unused. #endif } else if (use_post_process) { if (storage->frame.current_rt->external.fbo != 0) { diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index 9b34d652b94..165ddd5f632 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -7111,9 +7111,11 @@ GDScriptParser::DataType GDScriptParser::_reduce_function_call_type(const Operat DataType return_type; List arg_types; int default_args_count = 0; - int arg_count = p_call->arguments.size(); String callee_name; bool is_vararg = false; +#ifdef DEBUG_ENABLED + int arg_count = p_call->arguments.size(); +#endif switch (p_call->arguments[0]->type) { case GDScriptParser::Node::TYPE_TYPE: { @@ -7220,7 +7222,9 @@ GDScriptParser::DataType GDScriptParser::_reduce_function_call_type(const Operat default_args_count = mi.default_arguments.size(); callee_name = mi.name; +#ifdef DEBUG_ENABLED arg_count -= 1; +#endif // Check each argument type for (List::Element *E = mi.arguments.front(); E; E = E->next()) { @@ -7247,7 +7251,9 @@ GDScriptParser::DataType GDScriptParser::_reduce_function_call_type(const Operat IdentifierNode *func_id = static_cast(p_call->arguments[arg_id]); callee_name = func_id->name; +#ifdef DEBUG_ENABLED arg_count -= 1 + arg_id; +#endif DataType base_type; if (p_call->op == OperatorNode::OP_PARENT_CALL) { @@ -7426,7 +7432,6 @@ GDScriptParser::DataType GDScriptParser::_reduce_function_call_type(const Operat } } } - #endif // DEBUG_ENABLED return return_type; diff --git a/platform/iphone/export/export.cpp b/platform/iphone/export/export.cpp index ee49f491fc7..4c0fa0b0bb5 100644 --- a/platform/iphone/export/export.cpp +++ b/platform/iphone/export/export.cpp @@ -1500,7 +1500,6 @@ Error EditorExportPlatformIOS::export_project(const Ref &p_p pkg_name = "Unnamed"; bool found_library = false; - int total_size = 0; const String project_file = "godot_ios.xcodeproj/project.pbxproj"; Set files_to_parse; @@ -1596,7 +1595,6 @@ Error EditorExportPlatformIOS::export_project(const Ref &p_p file = file.replace("godot_ios", binary_name); print_line("ADDING: " + file + " size: " + itos(data.size())); - total_size += data.size(); /* write it into our folder structure */ file = dest_dir + file; diff --git a/platform/osx/export/export.cpp b/platform/osx/export/export.cpp index d3b43f6483e..0f32cc56d5a 100644 --- a/platform/osx/export/export.cpp +++ b/platform/osx/export/export.cpp @@ -574,7 +574,6 @@ Error EditorExportPlatformOSX::export_project(const Ref &p_p // Now process our template. bool found_binary = false; - int total_size = 0; Vector dylibs_found; while (ret == UNZ_OK && err == OK) { @@ -662,7 +661,6 @@ Error EditorExportPlatformOSX::export_project(const Ref &p_p } print_line("ADDING: " + file + " size: " + itos(data.size())); - total_size += data.size(); // Write it into our application bundle. file = tmp_app_path_name.plus_file(file); diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index 300aa8f597a..abc16312468 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -182,7 +182,6 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int & } int wofs = margin; - int spaces_size = 0; int align_ofs = 0; if (p_mode != PROCESS_CACHE && align != ALIGN_FILL) @@ -240,7 +239,6 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int & line_ascent = 0; \ line_descent = 0; \ spaces = 0; \ - spaces_size = 0; \ wofs = begin; \ align_ofs = 0; \ if (p_mode != PROCESS_CACHE) { \ @@ -444,9 +442,7 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int & fh = line_ascent + line_descent; if (end && c[end - 1] == ' ') { - if (p_mode == PROCESS_CACHE) { - spaces_size += font->get_char_size(' ').width; - } else if (align == ALIGN_FILL) { + if (align == ALIGN_FILL) { int ln = MIN(l.offset_caches.size() - 1, line); if (l.space_caches[ln]) { align_ofs = spaces * l.offset_caches[ln] / l.space_caches[ln];