godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Fix some warnings raised by GCC-11.1

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

18
scene/resources/texture.cpp
View File

@@ -490,7 +490,7 @@ Image::Format StreamTexture2D::get_format() const {
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();
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);
ERR_FAIL_V_MSG(ERR_FILE_CORRUPT, "Stream texture file is too new.");
}
tw_custom = f->get_32();
th_custom = f->get_32();
r_width = f->get_32();
r_height = f->get_32();
uint32_t df = f->get_32(); //data format
//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) {
int lw, lh, lwc, lhc;
int lw, lh;
Ref<Image> image;
image.instance();
@@ -560,7 +560,7 @@ Error StreamTexture2D::load(const String &p_path) {
bool request_roughness;
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) {
return err;
}
@@ -571,12 +571,12 @@ Error StreamTexture2D::load(const String &p_path) {
} else {
texture = RS::get_singleton()->texture_2d_create(image);
}
if (lwc || lhc) {
RS::get_singleton()->texture_set_size_override(texture, lwc, lhc);
if (lw || lh) {
RS::get_singleton()->texture_set_size_override(texture, lw, lh);
}
w = lwc ? lwc : lw;
h = lhc ? lhc : lh;
w = lw;
h = lh;
path_to_file = p_path;
format = image->get_format();