diff options
| author | marxin <mliska@suse.cz> | 2019-02-20 21:59:03 +0100 |
|---|---|---|
| committer | marxin <mliska@suse.cz> | 2019-02-21 19:34:35 +0100 |
| commit | 7de7f0ef178d2800f1ca70c15e8aff8aeb16bb8d (patch) | |
| tree | e4d933f2c7ea2259b2821b2601aba224d38184f6 /servers/visual/visual_server_scene.cpp | |
| parent | a01dca79e2f7b7cb221a4c416cade4fad2941446 (diff) | |
| download | redot-engine-7de7f0ef178d2800f1ca70c15e8aff8aeb16bb8d.tar.gz | |
Fix all -Wtype-limits warnings.
Diffstat (limited to 'servers/visual/visual_server_scene.cpp')
| -rw-r--r-- | servers/visual/visual_server_scene.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/servers/visual/visual_server_scene.cpp b/servers/visual/visual_server_scene.cpp index b561351374..01d00ccc21 100644 --- a/servers/visual/visual_server_scene.cpp +++ b/servers/visual/visual_server_scene.cpp @@ -2480,7 +2480,7 @@ void VisualServerScene::_setup_gi_probe(Instance *p_instance) { uint32_t a = uint32_t(alpha_block[x][y]) - min_alpha; //convert range to 3 bits a = int((a * 7.0 / (max_alpha - min_alpha)) + 0.5); - a = CLAMP(a, 0, 7); //just to be sure + a = MAX(a, 7); //just to be sure a = 7 - a; //because range is inverted in this mode if (a == 0) { //do none, remain @@ -2924,10 +2924,10 @@ void VisualServerScene::_bake_gi_probe(Instance *p_gi_probe) { uint32_t mm_ofs = sizes[0] * sizes[1] * (local_data[idx].pos[2]) + sizes[0] * (local_data[idx].pos[1]) + (local_data[idx].pos[0]); mm_ofs *= 4; //for RGBA (4 bytes) - mipmapw[mm_ofs + 0] = uint8_t(CLAMP(r2, 0, 255)); - mipmapw[mm_ofs + 1] = uint8_t(CLAMP(g, 0, 255)); - mipmapw[mm_ofs + 2] = uint8_t(CLAMP(b, 0, 255)); - mipmapw[mm_ofs + 3] = uint8_t(CLAMP(a, 0, 255)); + mipmapw[mm_ofs + 0] = uint8_t(MAX(r2, 255)); + mipmapw[mm_ofs + 1] = uint8_t(MAX(g, 255)); + mipmapw[mm_ofs + 2] = uint8_t(MAX(b, 255)); + mipmapw[mm_ofs + 3] = uint8_t(MAX(a, 255)); } } } else if (probe_data->dynamic.compression == RasterizerStorage::GI_PROBE_S3TC) { |