[Bf-blender-cvs] [0c3b215e7d5] blender-v3.0-release: Images: refactor how failed image load attempts are remembered
Jacques Lucke
noreply at git.blender.org
Tue Nov 2 11:17:25 CET 2021
Commit: 0c3b215e7d5456878b155d13440864f49ad1f230
Author: Jacques Lucke
Date: Tue Nov 2 11:15:05 2021 +0100
Branches: blender-v3.0-release
https://developer.blender.org/rB0c3b215e7d5456878b155d13440864f49ad1f230
Images: refactor how failed image load attempts are remembered
Previously, `ImageTile->ok` and `ImageUser->ok` were used to indicate
whether an image failed to load. There were three possible values
which (probably) had the following meanings:
* `0`: There was an error while loading the image. Don't try to load again.
* `1`: Default value. Try to load the image.
* `2`: The image was loaded successfully.
This image-wide flag did not make sense unfortunately, because loading
may work for some frames of an image sequence but not for others.
Remember than an image data block can also contain a movie.
The purpose of the `->ok` flag was to serve as an optimization to avoid
trying to load a file over and over again when there is an error (e.g. the
file does not exist or is invalid). To get the optimization back, the patch
is changing `MovieCache` so that it can also cache failed load attempts.
As a consequence, `ibuf` is allowed to be `NULL` in a few more places.
I added the appropriate null checks.
This also solves issues when image sequences are used with the
Image Texture node in Geometry nodes (also see D12827).
Differential Revision: https://developer.blender.org/D12957
===================================================================
M source/blender/blenkernel/BKE_image.h
M source/blender/blenkernel/intern/camera.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/image_gpu.c
M source/blender/blenkernel/intern/movieclip.c
M source/blender/blenkernel/intern/node.cc
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/screen.c
M source/blender/blenkernel/intern/texture.c
M source/blender/blenloader/intern/versioning_260.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/intern/versioning_legacy.c
M source/blender/compositor/operations/COM_ViewerOperation.cc
M source/blender/draw/engines/gpencil/gpencil_draw_data.c
M source/blender/editors/object/object_bake_api.c
M source/blender/editors/render/render_internal.c
M source/blender/editors/render/render_opengl.c
M source/blender/editors/render/render_preview.c
M source/blender/editors/sculpt_paint/paint_image_2d.c
M source/blender/editors/space_image/image_buttons.c
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_image/image_undo.c
M source/blender/imbuf/IMB_moviecache.h
M source/blender/imbuf/intern/colormanagement.c
M source/blender/imbuf/intern/moviecache.c
M source/blender/makesdna/DNA_image_types.h
M source/blender/makesrna/intern/rna_image_api.c
M source/blender/nodes/composite/nodes/node_composite_image.cc
M source/blender/nodes/composite/nodes/node_composite_splitViewer.cc
M source/blender/nodes/composite/nodes/node_composite_viewer.cc
M source/blender/nodes/texture/nodes/node_texture_image.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h
index 82d1f299b4b..7a8c55071df 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -153,10 +153,6 @@ struct RenderData;
struct RenderPass;
struct RenderResult;
-/* ima->ok */
-#define IMA_OK 1
-#define IMA_OK_LOADED 2
-
/* signals */
/* reload only frees, doesn't read until image_get_ibuf() called */
#define IMA_SIGNAL_RELOAD 0
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index 9455eed7f3f..d355de73170 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -140,7 +140,6 @@ static void camera_blend_read_data(BlendDataReader *reader, ID *id)
BLO_read_list(reader, &ca->bg_images);
LISTBASE_FOREACH (CameraBGImage *, bgpic, &ca->bg_images) {
- bgpic->iuser.ok = 1;
bgpic->iuser.scene = NULL;
}
}
@@ -1128,7 +1127,6 @@ CameraBGImage *BKE_camera_background_image_new(Camera *cam)
bgpic->scale = 1.0f;
bgpic->alpha = 0.5f;
- bgpic->iuser.ok = 1;
bgpic->iuser.flag |= IMA_ANIM_ALWAYS;
bgpic->flag |= CAM_BGIMG_FLAG_EXPANDED;
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 3800cbec94b..c9ac1f32804 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -321,9 +321,7 @@ static void image_blend_read_data(BlendDataReader *reader, ID *id)
BLO_read_data_address(reader, &ima->preview);
BKE_previewimg_blend_read(reader, ima->preview);
BLO_read_data_address(reader, &ima->stereo3d_format);
- LISTBASE_FOREACH (ImageTile *, tile, &ima->tiles) {
- tile->ok = IMA_OK;
- }
+
ima->lastused = 0;
ima->gpuflag = 0;
BLI_listbase_clear(&ima->gpu_refresh_areas);
@@ -443,12 +441,12 @@ static void imagecache_remove(Image *image, int index)
IMB_moviecache_remove(image->cache, &key);
}
-static struct ImBuf *imagecache_get(Image *image, int index)
+static struct ImBuf *imagecache_get(Image *image, int index, bool *r_is_cached_empty)
{
if (image->cache) {
ImageCacheKey key;
key.index = index;
- return IMB_moviecache_get(image->cache, &key);
+ return IMB_moviecache_get(image->cache, &key, r_is_cached_empty);
}
return NULL;
@@ -529,10 +527,6 @@ void BKE_image_free_buffers_ex(Image *ima, bool do_lock)
BKE_image_free_gputextures(ima);
- LISTBASE_FOREACH (ImageTile *, tile, &ima->tiles) {
- tile->ok = IMA_OK;
- }
-
if (do_lock) {
BLI_mutex_unlock(image_mutex);
}
@@ -564,7 +558,6 @@ static void image_init(Image *ima, short source, short type)
}
ImageTile *tile = MEM_callocN(sizeof(ImageTile), "Image Tiles");
- tile->ok = IMA_OK;
tile->tile_number = 1001;
BLI_addtail(&ima->tiles, tile);
@@ -597,25 +590,25 @@ static Image *image_alloc(Main *bmain, const char *name, short source, short typ
* call IMB_freeImBuf to de-reference the image buffer after
* it's done handling it.
*/
-static ImBuf *image_get_cached_ibuf_for_index_entry(Image *ima, int index, int entry)
+static ImBuf *image_get_cached_ibuf_for_index_entry(Image *ima,
+ int index,
+ int entry,
+ bool *r_is_cached_empty)
{
if (index != IMA_NO_INDEX) {
index = IMA_MAKE_INDEX(entry, index);
}
- return imagecache_get(ima, index);
+ return imagecache_get(ima, index, r_is_cached_empty);
}
-/* no ima->ibuf anymore, but listbase */
static void image_assign_ibuf(Image *ima, ImBuf *ibuf, int index, int entry)
{
- if (ibuf) {
- if (index != IMA_NO_INDEX) {
- index = IMA_MAKE_INDEX(entry, index);
- }
-
- imagecache_put(ima, index, ibuf);
+ if (index != IMA_NO_INDEX) {
+ index = IMA_MAKE_INDEX(entry, index);
}
+
+ imagecache_put(ima, index, ibuf);
}
static void image_remove_ibuf(Image *ima, int index, int entry)
@@ -888,11 +881,6 @@ Image *BKE_image_load_exists_ex(Main *bmain, const char *filepath, bool *r_exist
if (BLI_path_cmp(strtest, str) == 0) {
if ((BKE_image_has_anim(ima) == false) || (ima->id.us == 0)) {
id_us_plus(&ima->id); /* officially should not, it doesn't link here! */
- LISTBASE_FOREACH (ImageTile *, tile, &ima->tiles) {
- if (tile->ok == 0) {
- tile->ok = IMA_OK;
- }
- }
if (r_exists) {
*r_exists = true;
}
@@ -1080,9 +1068,6 @@ Image *BKE_image_add_generated(Main *bmain,
image_add_view(ima, names[view_id], "");
}
- ImageTile *tile = BKE_image_get_tile(ima, 0);
- tile->ok = IMA_OK_LOADED;
-
return ima;
}
@@ -1105,8 +1090,6 @@ Image *BKE_image_add_from_imbuf(Main *bmain, ImBuf *ibuf, const char *name)
if (ima) {
STRNCPY(ima->filepath, ibuf->name);
image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
- ImageTile *tile = BKE_image_get_tile(ima, 0);
- tile->ok = IMA_OK_LOADED;
}
return ima;
@@ -1157,7 +1140,7 @@ bool BKE_image_memorypack(Image *ima)
int i;
for (i = 0, iv = ima->views.first; iv; iv = iv->next, i++) {
- ImBuf *ibuf = image_get_cached_ibuf_for_index_entry(ima, i, 0);
+ ImBuf *ibuf = image_get_cached_ibuf_for_index_entry(ima, i, 0, NULL);
if (!ibuf) {
ok = false;
@@ -1177,7 +1160,7 @@ bool BKE_image_memorypack(Image *ima)
ima->views_format = R_IMF_VIEWS_INDIVIDUAL;
}
else {
- ImBuf *ibuf = image_get_cached_ibuf_for_index_entry(ima, IMA_NO_INDEX, 0);
+ ImBuf *ibuf = image_get_cached_ibuf_for_index_entry(ima, IMA_NO_INDEX, 0, NULL);
if (ibuf) {
ok = ok && image_memorypack_imbuf(ima, ibuf, ibuf->name);
@@ -1266,6 +1249,10 @@ static uintptr_t image_mem_size(Image *image)
while (!IMB_moviecacheIter_done(iter)) {
ImBuf *ibuf = IMB_moviecacheIter_getImBuf(iter);
+ IMB_moviecacheIter_step(iter);
+ if (ibuf == NULL) {
+ continue;
+ }
ImBuf *ibufm;
int level;
@@ -1287,8 +1274,6 @@ static uintptr_t image_mem_size(Image *image)
}
}
}
-
- IMB_moviecacheIter_step(iter);
}
IMB_moviecacheIter_free(iter);
}
@@ -3487,7 +3472,6 @@ static void image_tag_frame_recalc(Image *ima, ID *iuser_id, ImageUser *iuser, v
if (ima == changed_image && BKE_image_is_animated(ima)) {
iuser->flag |= IMA_NEED_FRAME_RECALC;
- iuser->ok = 1;
if (iuser_id) {
/* Must copy image user changes to CoW datablock. */
@@ -3501,7 +3485,6 @@ static void image_tag_reload(Image *ima, ID *iuser_id, ImageUser *iuser, void *c
Image *changed_image = customdata;
if (ima == changed_image) {
- iuser->ok = 1;
if (iuser->scene) {
image_update_views_format(ima, iuser);
}
@@ -3515,7 +3498,6 @@ static void image_tag_reload(Image *ima, ID *iuser_id, ImageUser *iuser, void *c
void BKE_imageuser_default(ImageUser *iuser)
{
memset(iuser, 0, sizeof(ImageUser));
- iuser->ok = 1;
iuser->frames = 100;
iuser->sfra = 1;
}
@@ -3575,7 +3557,6 @@ void BKE_image_signal(Main *bmain, Image *ima, ImageUser *iuser, int signal)
BKE_image_free_buffers(ima);
if (iuser) {
- iuser->ok = 1;
if (iuser->scene) {
image_update_views_format(ima, iuser);
}
@@ -3590,7 +3571,7 @@ void BKE_image_signal(Main *bmain, Image *ima, ImageUser *iuser, int signal)
if (ima->source == IMA_SRC_GENERATED) {
if (ima->gen_x == 0 || ima->gen_y == 0) {
- ImBuf *ibuf = image_get_cached_ibuf_for_index_entry(ima, IMA_NO_INDEX, 0);
+ ImBuf *ibuf = image_get_cached_ibuf_for_index_entry(ima, IMA_NO_INDEX, 0, NULL);
if (ibuf) {
ima->gen_x = ibuf->x;
ima->gen_y = ibuf->y;
@@ -3630,10 +3611,6 @@ void BKE_image_signal(Main *bmain, Image *ima, ImageUser *iuser, int signal)
*/
BKE_image_free_buffers(ima);
- LISTBASE_FOREACH (ImageTile *, tile, &ima->tiles) {
- tile->ok = 1;
- }
-
if (iuser) {
image_tag_frame_recalc(ima, NULL, iuser, ima);
}
@@ -3681,7 +3658,6 @@ void BKE_image_signal(Main *bmain, Image *ima, ImageUser *iuser, int signal)
break;
case IMA_SIGNAL_USER_NEW_IMAGE:
if (iuser) {
- iuser->ok = 1;
if (ELEM(ima->source, IMA_SRC_FILE, IMA_SRC_SEQUENCE, IMA_SRC_TILED)) {
if (ima->type == IMA_TYPE_MULTILAYER) {
BKE_image_init_imageuser(ima, iuser);
@@ -3691,15 +3667,6 @@ void BKE_image_signal(Main *bmain, Image *ima, ImageUser *iuser, int signal)
break;
case IMA_SIGNAL_COLORMANAGE:
BKE_image_free_buffers(ima);
-
- LISTBASE_FOREACH (ImageTile *, tile, &ima->tiles) {
- tile->ok = 1;
- }
-
- if (iuser) {
- iuser->ok = 1;
- }
-
break;
}
@@ -3799,7 +3766,6 @@ ImageTile *BKE_image_add_tile(struct Image *ima, int tile_number, const char *la
}
ImageTile *tile = MEM_callocN(sizeof(ImageTile), "image new tile");
- tile->ok = IMA_OK;
tile->tile_number = tile_number;
if (next_tile) {
@@ -3864,14 +3830,14 @@ void BKE_image_reassign_tile(struct Image *ima, ImageTile *tile, int new_tile_nu
if (BKE_image_is_multiview(ima)) {
const int totviews = BLI_listbase_count(&ima->views);
for (int i = 0; i < totviews; i++) {
- ImBuf *ibuf = image_get_cached_ibuf_for_index_entry(ima, i, old_tile_number);
+ ImBuf *ibuf = image_get_cached_ibuf_for_index_entry(ima, i, old_tile_number, NULL);
image_remove_ibuf(ima, i, old_tile_number);
image_assign_ibuf(ima, ibuf, i, new_tile_number);
IMB_freeImBuf(ibuf);
}
}
else {
- ImBuf *ibuf = image_get_cached_ibuf_for_index_entry(ima, 0, old_tile_number);
+ ImBuf *ibuf = image_get_cached_ibuf_for_index_entry(ima, 0, old_tile_number, NULL);
image_remove_ibuf(ima, 0, old_tile_number);
image_assign_ibuf(ima, ibuf, 0, new_tile_number);
IMB_freeImBuf(ibuf);
@@ -3930,7 +3896,6 @@ bool BKE_image_fill_tile(struct Image *ima,
if (tile_ibuf != NULL) {
image_assign_ibuf(ima, tile_ibuf, 0,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list