diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-18 13:36:42 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-18 14:59:55 +0300 |
commit | 96f0d22e3b8a2c50cdb96e82146489f26628c127 (patch) | |
tree | 2ecef745ab89b30f8ce3c59e6c85acf568a5ae8b /source/blender/imbuf | |
parent | 8c40bbb15f10601737bcd6652f0358d51102d045 (diff) |
Cleanup: remove unused render buffers
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/IMB_colormanagement.h | 6 | ||||
-rw-r--r-- | source/blender/imbuf/intern/colormanagement.c | 27 |
2 files changed, 5 insertions, 28 deletions
diff --git a/source/blender/imbuf/IMB_colormanagement.h b/source/blender/imbuf/IMB_colormanagement.h index b12339aef6d..a8434932018 100644 --- a/source/blender/imbuf/IMB_colormanagement.h +++ b/source/blender/imbuf/IMB_colormanagement.h @@ -269,8 +269,7 @@ void IMB_partial_display_buffer_update(struct ImBuf *ibuf, int xmin, int ymin, int xmax, - int ymax, - bool copy_display_to_byte_buffer); + int ymax); void IMB_partial_display_buffer_update_threaded( struct ImBuf *ibuf, @@ -284,8 +283,7 @@ void IMB_partial_display_buffer_update_threaded( int xmin, int ymin, int xmax, - int ymax, - bool copy_display_to_byte_buffer); + int ymax); void IMB_partial_display_buffer_update_delayed( struct ImBuf *ibuf, int xmin, int ymin, int xmax, int ymax); diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c index 02277a7953c..4509daac81f 100644 --- a/source/blender/imbuf/intern/colormanagement.c +++ b/source/blender/imbuf/intern/colormanagement.c @@ -2667,8 +2667,7 @@ unsigned char *IMB_display_buffer_acquire(ImBuf *ibuf, ibuf->invalid_rect.xmin, ibuf->invalid_rect.ymin, ibuf->invalid_rect.xmax, - ibuf->invalid_rect.ymax, - false); + ibuf->invalid_rect.ymax); } BLI_rcti_init(&ibuf->invalid_rect, 0, 0, 0, 0); @@ -3526,7 +3525,6 @@ static void imb_partial_display_buffer_update_ex( int ymin, int xmax, int ymax, - bool copy_display_to_byte_buffer, bool do_threads) { ColormanageCacheViewSettings cache_view_settings; @@ -3564,12 +3562,6 @@ static void imb_partial_display_buffer_update_ex( BLI_thread_unlock(LOCK_COLORMANAGE); } - if (display_buffer == NULL) { - if (copy_display_to_byte_buffer) { - display_buffer = (unsigned char *)ibuf->rect; - } - } - if (display_buffer) { ColormanageProcessor *cm_processor = NULL; bool skip_transform = false; @@ -3628,15 +3620,6 @@ static void imb_partial_display_buffer_update_ex( IMB_display_buffer_release(cache_handle); } - - if (copy_display_to_byte_buffer && (unsigned char *)ibuf->rect != display_buffer) { - int y; - for (y = ymin; y < ymax; y++) { - size_t index = (size_t)y * buffer_width * 4; - memcpy( - (unsigned char *)ibuf->rect + index, display_buffer + index, (size_t)(xmax - xmin) * 4); - } - } } void IMB_partial_display_buffer_update(ImBuf *ibuf, @@ -3650,8 +3633,7 @@ void IMB_partial_display_buffer_update(ImBuf *ibuf, int xmin, int ymin, int xmax, - int ymax, - bool copy_display_to_byte_buffer) + int ymax) { imb_partial_display_buffer_update_ex(ibuf, linear_buffer, @@ -3665,7 +3647,6 @@ void IMB_partial_display_buffer_update(ImBuf *ibuf, ymin, xmax, ymax, - copy_display_to_byte_buffer, false); } @@ -3681,8 +3662,7 @@ void IMB_partial_display_buffer_update_threaded( int xmin, int ymin, int xmax, - int ymax, - bool copy_display_to_byte_buffer) + int ymax) { int width = xmax - xmin; int height = ymax - ymin; @@ -3699,7 +3679,6 @@ void IMB_partial_display_buffer_update_threaded( ymin, xmax, ymax, - copy_display_to_byte_buffer, do_threads); } |