Skip to content

Commit a2ad8bf

Browse files
Get rid of dt_dev_pixelpipe_t obsolete
We had `obsolete` in dt_dev_pixelpipe_t for brute-force invalidation of all pipe cachelines while not being fully sure about piece hashes and input OpenCL cachelines not written back if changed. Not necessary any more, **if** we would want further help for cache efficiency that would go via testing for DT_DEV_PIPE_REMOVE and/or DT_DEV_PIPE_SYNCH
1 parent db17559 commit a2ad8bf

5 files changed

Lines changed: 0 additions & 17 deletions

File tree

src/develop/develop.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2799,7 +2799,6 @@ void dt_dev_reprocess_center(dt_develop_t *dev)
27992799
if(dev && dev->gui_attached)
28002800
{
28012801
dev->full.pipe->changed |= DT_DEV_PIPE_SYNCH;
2802-
dev->full.pipe->cache_obsolete = TRUE;
28032802

28042803
// invalidate buffers and force redraw of darkroom
28052804
dt_dev_invalidate_all(dev);
@@ -2815,7 +2814,6 @@ void dt_dev_reprocess_preview(dt_develop_t *dev)
28152814
return;
28162815

28172816
dev->preview_pipe->changed |= DT_DEV_PIPE_SYNCH;
2818-
dev->preview_pipe->cache_obsolete = TRUE;
28192817

28202818
dt_dev_invalidate_preview(dev);
28212819
dt_control_queue_redraw_center();

src/develop/pixelpipe_hb.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ gboolean dt_dev_pixelpipe_init_cached(dt_dev_pixelpipe_t *pipe,
276276
pipe->processed_height = pipe->backbuf_height = pipe->iheight = pipe->final_height = 0;
277277
pipe->nodes = NULL;
278278
pipe->backbuf_size = size;
279-
pipe->cache_obsolete = FALSE;
280279
pipe->backbuf = NULL;
281280
pipe->backbuf_scale = 0.0f;
282281
memset(pipe->backbuf_zoom_pos, 0, sizeof(dt_dev_zoom_pos_t));
@@ -473,10 +472,6 @@ void dt_dev_pixelpipe_rebuild(dt_develop_t *dev)
473472
dev->preview_pipe->changed |= DT_DEV_PIPE_REMOVE;
474473
dev->preview2.pipe->changed |= DT_DEV_PIPE_REMOVE;
475474

476-
dev->full.pipe->cache_obsolete = TRUE;
477-
dev->preview_pipe->cache_obsolete = TRUE;
478-
dev->preview2.pipe->cache_obsolete = TRUE;
479-
480475
// invalidate buffers and force redraw of darkroom
481476
dt_dev_invalidate_all(dev);
482477
}
@@ -3107,11 +3102,6 @@ gboolean dt_dev_pixelpipe_process(dt_dev_pixelpipe_t *pipe,
31073102
// re-entry point: in case of late opencl errors we start all over
31083103
// again with opencl-support disabled
31093104
restart:
3110-
3111-
// check if we should obsolete caches
3112-
if(pipe->cache_obsolete) dt_dev_pixelpipe_cache_flush(pipe);
3113-
pipe->cache_obsolete = FALSE;
3114-
31153105
// mask display off as a starting point
31163106
pipe->mask_display = DT_DEV_PIXELPIPE_DISPLAY_NONE;
31173107
// and blendif active

src/develop/pixelpipe_hb.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,6 @@ typedef struct dt_dev_pixelpipe_t
165165
{
166166
// store history/zoom caches
167167
dt_dev_pixelpipe_cache_t cache;
168-
// set to TRUE in order to obsolete old cache entries on next pixelpipe run
169-
gboolean cache_obsolete;
170168
uint64_t runs; // used only for pixelpipe cache statistics
171169
// input buffer
172170
float *input;

src/gui/color_picker_proxy.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@ static void _iop_color_picker_pickerdata_ready_callback(gpointer instance,
300300
// will set the work_profile if needed.
301301
// FIXME: is this overdoing it? see #14812
302302
pipe->changed |= DT_DEV_PIPE_REMOVE;
303-
pipe->cache_obsolete = TRUE;
304303

305304
// iops only need new picker data if the pointer has moved
306305
if(_record_point_area(picker))

src/views/darkroom.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4661,7 +4661,6 @@ static gboolean _second_window_configure_callback(GtkWidget *da,
46614661
// pipe needs to be reconstructed
46624662
dev->preview2.pipe->status = DT_DEV_PIXELPIPE_DIRTY;
46634663
dev->preview2.pipe->changed |= DT_DEV_PIPE_REMOVE;
4664-
dev->preview2.pipe->cache_obsolete = TRUE;
46654664

46664665
// If we have a pinned image, update its viewport dimensions too
46674666
dt_develop_t *pinned_dev = dev->preview2_pinned ? dev->preview2_pinned_dev : NULL;
@@ -4674,7 +4673,6 @@ static gboolean _second_window_configure_callback(GtkWidget *da,
46744673
pinned_port->orig_height = event->height;
46754674
pinned_port->pipe->status = DT_DEV_PIXELPIPE_DIRTY;
46764675
pinned_port->pipe->changed |= DT_DEV_PIPE_REMOVE;
4677-
pinned_port->pipe->cache_obsolete = TRUE;
46784676
}
46794677
}
46804678

0 commit comments

Comments
 (0)