diff --git a/src/develop/pixelpipe_hb.c b/src/develop/pixelpipe_hb.c index 0a588b2958d8..f2c4d178198b 100644 --- a/src/develop/pixelpipe_hb.c +++ b/src/develop/pixelpipe_hb.c @@ -1436,7 +1436,8 @@ static gboolean _dev_pixelpipe_process_rec( module->modify_roi_in(module, piece, roi_out, &roi_in); if((darktable.unmuted & DT_DEBUG_PIPE) && memcmp(roi_out, &roi_in, sizeof(dt_iop_roi_t))) dt_print_pipe(DT_DEBUG_PIPE, - "modify roi IN", piece->pipe, module, DT_DEVICE_NONE, &roi_in, roi_out, "\n"); + "modify roi IN", piece->pipe, module, DT_DEVICE_NONE, &roi_in, roi_out, "ID=%i\n", + pipe->image.id); // recurse to get actual data of input buffer dt_iop_buffer_dsc_t _input_format = { 0 }; @@ -2606,12 +2607,12 @@ gboolean dt_dev_pixelpipe_process( #ifdef HAVE_OPENCL if(pipe->devid > DT_DEVICE_CPU) - dt_print_pipe(DT_DEBUG_PIPE, "pipe starting", pipe, NULL, pipe->devid, &roi, &roi, "ID %i, %s\n", + dt_print_pipe(DT_DEBUG_PIPE, "pipe starting", pipe, NULL, pipe->devid, &roi, &roi, "ID=%i, %s\n", pipe->image.id, darktable.opencl->dev[pipe->devid].cname); else #endif - dt_print_pipe(DT_DEBUG_PIPE, "pipe starting", pipe, NULL, pipe->devid, &roi, &roi, "ID %i\n", + dt_print_pipe(DT_DEBUG_PIPE, "pipe starting", pipe, NULL, pipe->devid, &roi, &roi, "ID=%i\n", pipe->image.id); // run pixelpipe recursively and get error status @@ -2667,7 +2668,8 @@ gboolean dt_dev_pixelpipe_process( dt_dev_pixelpipe_change(pipe, dev); dt_print_pipe(DT_DEBUG_PIPE | DT_DEBUG_OPENCL, - "pipe restarting on CPU", pipe, NULL, old_devid, &roi, &roi, "\n"); + "pipe restarting on CPU", pipe, NULL, old_devid, &roi, &roi, "ID=%i\n", + pipe->image.id); goto restart; // try again (this time without opencl) } @@ -2725,7 +2727,8 @@ gboolean dt_dev_pixelpipe_process( if(!claimed) dt_dev_pixelpipe_cache_report(pipe); - dt_print_pipe(DT_DEBUG_PIPE, "pipe finished", pipe, NULL, old_devid, &roi, &roi, "\n\n"); + dt_print_pipe(DT_DEBUG_PIPE, "pipe finished", pipe, NULL, old_devid, &roi, &roi, "ID=%i\n\n", + pipe->image.id); pipe->processing = FALSE; return FALSE; @@ -2756,7 +2759,8 @@ void dt_dev_pixelpipe_get_dimensions(dt_dev_pixelpipe_t *pipe, module->modify_roi_out(module, piece, &roi_out, &roi_in); if((darktable.unmuted & DT_DEBUG_PIPE) && memcmp(&roi_out, &roi_in, sizeof(dt_iop_roi_t))) dt_print_pipe(DT_DEBUG_PIPE, - "modify roi OUT", piece->pipe, module, DT_DEVICE_NONE, &roi_in, &roi_out, "\n"); + "modify roi OUT", piece->pipe, module, DT_DEVICE_NONE, &roi_in, &roi_out, "ID=%i\n", + pipe->image.id); } else { diff --git a/src/iop/channelmixerrgb.c b/src/iop/channelmixerrgb.c index e7a3dda77332..dd4b5eee31a6 100644 --- a/src/iop/channelmixerrgb.c +++ b/src/iop/channelmixerrgb.c @@ -2031,7 +2031,7 @@ static void _set_trouble_messages(struct dt_iop_module_t *self) dt_print_pipe(DT_DEBUG_ALWAYS, anyproblem ? "chroma trouble" : "chroma data", NULL, self, DT_DEVICE_NONE, NULL, NULL, - "%s (%i) %s%s%s%sD65=%s. NOW %.3f %.3f %.3f, D65 %.3f %.3f %.3f, AS-SHOT %.3f %.3f %.3f\n", + "%s ID=%i %s%s%s%sD65=%s. NOW %.3f %.3f %.3f, D65 %.3f %.3f %.3f, AS-SHOT %.3f %.3f %.3f\n", img->filename, img->id, anyproblem ? "" : "NO problem, ",