Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2022-02-21 09:48:49 +0300
committerJeroen Bakker <jeroen@blender.org>2022-02-21 09:48:49 +0300
commitbce810f05763b3ccf9f7331e96541be2df38f29b (patch)
tree623bea68f60aac1103fb52aeda20f64bd6d50449
parent1a0a22f95a22496dec2791441249265d553dc2d7 (diff)
Fix T95871: Non-float textures report as float.
Althought the float buffers are only used as cache, current code paths don't look at the flags to identify which kind of image it is. Actual fix would be to check flags, but that wouldn't be something to add one week before release. This commit fixes it by removing the buffers after use in the image engine.
-rw-r--r--source/blender/draw/engines/image/image_drawing_mode.hh11
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/draw/engines/image/image_drawing_mode.hh b/source/blender/draw/engines/image/image_drawing_mode.hh
index 124f8057cfe..ccb0f3e963a 100644
--- a/source/blender/draw/engines/image/image_drawing_mode.hh
+++ b/source/blender/draw/engines/image/image_drawing_mode.hh
@@ -223,7 +223,7 @@ template<typename TextureMethod> class ScreenSpaceDrawingMode : public AbstractD
if (iterator.tile_data.tile_buffer == nullptr) {
continue;
}
- ensure_float_buffer(*iterator.tile_data.tile_buffer);
+ const bool do_free_float_buffer = ensure_float_buffer(*iterator.tile_data.tile_buffer);
const float tile_width = static_cast<float>(iterator.tile_data.tile_buffer->x);
const float tile_height = static_cast<float>(iterator.tile_data.tile_buffer->y);
@@ -330,6 +330,10 @@ template<typename TextureMethod> class ScreenSpaceDrawingMode : public AbstractD
0);
imb_freerectImbuf_all(&extracted_buffer);
}
+
+ if (do_free_float_buffer) {
+ imb_freerectfloatImBuf(iterator.tile_data.tile_buffer);
+ }
}
}
@@ -405,10 +409,7 @@ template<typename TextureMethod> class ScreenSpaceDrawingMode : public AbstractD
{
const int texture_width = texture_buffer.x;
const int texture_height = texture_buffer.y;
- const bool float_buffer_created = ensure_float_buffer(tile_buffer);
- /* TODO(jbakker): Find leak when rendering VSE and don't free here. */
- const bool do_free_float_buffer = float_buffer_created &&
- instance_data.image->type == IMA_TYPE_R_RESULT;
+ const bool do_free_float_buffer = ensure_float_buffer(tile_buffer);
/* IMB_transform works in a non-consistent space. This should be documented or fixed!.
* Construct a variant of the info_uv_to_texture that adds the texel space