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

Merge pull request #44683 from madmiraal/fix-etc-quality-3.2 

[3.2] Fix ETC quality setting
This commit is contained in:
Rémi Verschelde 2020-12-26 10:23:46 +01:00 committed by GitHub
parent 626ca08108 125032d8ee
commit 93172515de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/etc/image_etc.cpp
View File

@ -199,14 +199,15 @@ static void _compress_etc(Image *p_img, float p_lossy_quality, bool force_etc1_f
// prepare parameters to be passed to etc2comp // prepare parameters to be passed to etc2comp
int num_cpus = OS::get_singleton()->get_processor_count(); int num_cpus = OS::get_singleton()->get_processor_count();
int encoding_time = 0; int encoding_time = 0;
float effort = 0.0; //default, reasonable time float effort = 0.0; //default, reasonable time
if (p_lossy_quality > 0.75) if (p_lossy_quality > 0.95)
effort = 0.4; effort = 80;
else if (p_lossy_quality > 0.85) else if (p_lossy_quality > 0.85)
effort = 0.6; effort = 60;
else if (p_lossy_quality > 0.95) else if (p_lossy_quality > 0.75)
effort = 0.8; effort = 40;
Etc::ErrorMetric error_metric = Etc::ErrorMetric::RGBX; // NOTE: we can experiment with other error metrics Etc::ErrorMetric error_metric = Etc::ErrorMetric::RGBX; // NOTE: we can experiment with other error metrics
Etc::Image::Format etc2comp_etc_format = _image_format_to_etc2comp_format(etc_format); Etc::Image::Format etc2comp_etc_format = _image_format_to_etc2comp_format(etc_format);