diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2024-03-06 13:17:09 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-03-06 13:17:09 +0100 |
commit | ec55028f2621e4e34344af9adec646a3685b8291 (patch) | |
tree | 0b9b627fb5793058977695745b2616d3ef58b858 /servers/rendering/rendering_device_commons.cpp | |
parent | 362a0880880b487a0b5aa84dbbd56fd0e3d62351 (diff) | |
parent | f77b4d155b5900f6b10bdb14cd7f56aa20e27e5c (diff) | |
download | redot-engine-ec55028f2621e4e34344af9adec646a3685b8291.tar.gz |
Merge pull request #89209 from RandomShaper/padding_for_dummies
Make shader binary alignment handling simpler and more robust
Diffstat (limited to 'servers/rendering/rendering_device_commons.cpp')
-rw-r--r-- | servers/rendering/rendering_device_commons.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/servers/rendering/rendering_device_commons.cpp b/servers/rendering/rendering_device_commons.cpp index c8b7980633..4dbd0e3964 100644 --- a/servers/rendering/rendering_device_commons.cpp +++ b/servers/rendering/rendering_device_commons.cpp @@ -711,12 +711,13 @@ uint32_t RenderingDeviceCommons::get_image_format_required_size(DataFormat p_for uint32_t pixel_size = get_image_format_pixel_size(p_format); uint32_t pixel_rshift = get_compressed_image_format_pixel_rshift(p_format); - uint32_t blockw, blockh; + uint32_t blockw = 0; + uint32_t blockh = 0; get_compressed_image_format_block_dimensions(p_format, blockw, blockh); for (uint32_t i = 0; i < p_mipmaps; i++) { - uint32_t bw = w % blockw != 0 ? w + (blockw - w % blockw) : w; - uint32_t bh = h % blockh != 0 ? h + (blockh - h % blockh) : h; + uint32_t bw = STEPIFY(w, blockw); + uint32_t bh = STEPIFY(h, blockh); uint32_t s = bw * bh; |