godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some warnings raised by GCC-11.1

This commit is contained in:
jfons 2021-05-25 17:03:12 +02:00
parent f164c00a94
commit f8e34209af
5 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gdscript/gdscript_compiler.cpp
View File

@ -2211,7 +2211,7 @@ Error GDScriptCompiler::_parse_class_level(GDScript *p_script, const GDScriptPar
if (err) { if (err) {
return err; return err;
} }
if (base.is_null() && !base->is_valid()) { if (base.is_null() || !base->is_valid()) {
return ERR_COMPILATION_FAILED; return ERR_COMPILATION_FAILED;
} }
} }

18
scene/resources/texture.cpp
View File

@ -490,7 +490,7 @@ Image::Format StreamTexture2D::get_format() const {
return format; return format;
} }
Error StreamTexture2D::_load_data(const String &p_path, int &tw, int &th, int &tw_custom, int &th_custom, Ref<Image> &image, bool &r_request_3d, bool &r_request_normal, bool &r_request_roughness, int &mipmap_limit, int p_size_limit) { Error StreamTexture2D::_load_data(const String &p_path, int &r_width, int &r_height, Ref<Image> &image, bool &r_request_3d, bool &r_request_normal, bool &r_request_roughness, int &mipmap_limit, int p_size_limit) {
alpha_cache.unref(); alpha_cache.unref();
ERR_FAIL_COND_V(image.is_null(), ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(image.is_null(), ERR_INVALID_PARAMETER);
@ -511,8 +511,8 @@ Error StreamTexture2D::_load_data(const String &p_path, int &tw, int &th, int &t
memdelete(f); memdelete(f);
ERR_FAIL_V_MSG(ERR_FILE_CORRUPT, "Stream texture file is too new."); ERR_FAIL_V_MSG(ERR_FILE_CORRUPT, "Stream texture file is too new.");
} }
tw_custom = f->get_32(); r_width = f->get_32();
th_custom = f->get_32(); r_height = f->get_32();
uint32_t df = f->get_32(); //data format uint32_t df = f->get_32(); //data format
//skip reserved //skip reserved
@ -551,7 +551,7 @@ Error StreamTexture2D::_load_data(const String &p_path, int &tw, int &th, int &t
} }
Error StreamTexture2D::load(const String &p_path) { Error StreamTexture2D::load(const String &p_path) {
int lw, lh, lwc, lhc; int lw, lh;
Ref<Image> image; Ref<Image> image;
image.instance(); image.instance();
@ -560,7 +560,7 @@ Error StreamTexture2D::load(const String &p_path) {
bool request_roughness; bool request_roughness;
int mipmap_limit; int mipmap_limit;
Error err = _load_data(p_path, lw, lh, lwc, lhc, image, request_3d, request_normal, request_roughness, mipmap_limit); Error err = _load_data(p_path, lw, lh, image, request_3d, request_normal, request_roughness, mipmap_limit);
if (err) { if (err) {
return err; return err;
} }
@ -571,12 +571,12 @@ Error StreamTexture2D::load(const String &p_path) {
} else { } else {
texture = RS::get_singleton()->texture_2d_create(image); texture = RS::get_singleton()->texture_2d_create(image);
} }
if (lwc || lhc) { if (lw || lh) {
RS::get_singleton()->texture_set_size_override(texture, lwc, lhc); RS::get_singleton()->texture_set_size_override(texture, lw, lh);
} }
w = lwc ? lwc : lw; w = lw;
h = lhc ? lhc : lh; h = lh;
path_to_file = p_path; path_to_file = p_path;
format = image->get_format(); format = image->get_format();

2
scene/resources/texture.h
View File

@ -158,7 +158,7 @@ public:
}; };
private: private:
Error _load_data(const String &p_path, int &tw, int &th, int &tw_custom, int &th_custom, Ref<Image> &image, bool &r_request_3d, bool &r_request_normal, bool &r_request_roughness, int &mipmap_limit, int p_size_limit = 0); Error _load_data(const String &p_path, int &r_width, int &r_height, Ref<Image> &image, bool &r_request_3d, bool &r_request_normal, bool &r_request_roughness, int &mipmap_limit, int p_size_limit = 0);
String path_to_file; String path_to_file;
mutable RID texture; mutable RID texture;
Image::Format format = Image::FORMAT_MAX; Image::Format format = Image::FORMAT_MAX;

3
servers/audio_server.cpp
View File

@ -1164,6 +1164,9 @@ void AudioServer::set_bus_layout(const Ref<AudioBusLayout> &p_bus_layout) {
Bus::Effect bfx; Bus::Effect bfx;
bfx.effect = fx; bfx.effect = fx;
bfx.enabled = p_bus_layout->buses[i].effects[j].enabled; bfx.enabled = p_bus_layout->buses[i].effects[j].enabled;
#if DEBUG_ENABLED
bfx.prof_time = 0;
#endif
bus->effects.push_back(bfx); bus->effects.push_back(bfx);
} }
} }

33
tests/test_main.cpp
View File

@ -121,24 +121,27 @@ int test_main(int argc, char *argv[]) {
test_args.push_back(arg); test_args.push_back(arg);
} }
} }
// Convert Godot command line arguments back to standard arguments.
char **doctest_args = new char *[test_args.size()];
for (int x = 0; x < test_args.size(); x++) {
// Operation to convert Godot string to non wchar string.
CharString cs = test_args[x].utf8();
const char *str = cs.get_data();
// Allocate the string copy.
doctest_args[x] = new char[strlen(str) + 1];
// Copy this into memory.
memcpy(doctest_args[x], str, strlen(str) + 1);
}
test_context.applyCommandLine(test_args.size(), doctest_args); if (test_args.size() > 0) {
// Convert Godot command line arguments back to standard arguments.
char **doctest_args = new char *[test_args.size()];
for (int x = 0; x < test_args.size(); x++) {
// Operation to convert Godot string to non wchar string.
CharString cs = test_args[x].utf8();
const char *str = cs.get_data();
// Allocate the string copy.
doctest_args[x] = new char[strlen(str) + 1];
// Copy this into memory.
memcpy(doctest_args[x], str, strlen(str) + 1);
}
for (int x = 0; x < test_args.size(); x++) { test_context.applyCommandLine(test_args.size(), doctest_args);
delete[] doctest_args[x];
for (int x = 0; x < test_args.size(); x++) {
delete[] doctest_args[x];
}
delete[] doctest_args;
} }
delete[] doctest_args;
return test_context.run(); return test_context.run();
} }