3b88a29abf
Just makes progressive refine :) This means the whole image would be refined gradually using as much threads as it's set in performance settings. Having enough tiles is required to have this option working as it's expected. Technically it's implemented by repeatedly computing next sample for all the tiles before switching to next sample. This works around 7-12% slower than regular tile-based rendering, so use this option only if you really need it. This commit also fixes progressive update of image when Save Buffers option is enabled. And one more thing this commit fixes is handling display buffer with Save Buffers option enabled. If this option is enabled image buffer wouldn't have neither byte nor float buffer until image is fully rendered which could backfire in missing image while rendering in cases color management cache became full. This issue solved by allocating byte buffer for image buffer from tile update callback. Patch was reviewed by Brecht. He also made some minor edits to original version to patch. Thanks, man!
129 lines
3.3 KiB
C++
129 lines
3.3 KiB
C++
/*
|
|
* Copyright 2011, Blender Foundation.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* Contributor:
|
|
* Jeroen Bakker
|
|
* Monique Dewanchand
|
|
*/
|
|
|
|
#include "COM_ViewerBaseOperation.h"
|
|
#include "COM_SocketConnection.h"
|
|
#include "BLI_listbase.h"
|
|
#include "BKE_image.h"
|
|
#include "WM_api.h"
|
|
#include "WM_types.h"
|
|
#include "PIL_time.h"
|
|
#include "BLI_utildefines.h"
|
|
#include "BLI_math_color.h"
|
|
|
|
extern "C" {
|
|
#include "MEM_guardedalloc.h"
|
|
#include "IMB_imbuf.h"
|
|
#include "IMB_imbuf_types.h"
|
|
#include "IMB_colormanagement.h"
|
|
}
|
|
|
|
|
|
ViewerBaseOperation::ViewerBaseOperation() : NodeOperation()
|
|
{
|
|
this->setImage(NULL);
|
|
this->setImageUser(NULL);
|
|
this->m_outputBuffer = NULL;
|
|
this->m_depthBuffer = NULL;
|
|
this->m_active = false;
|
|
this->m_doDepthBuffer = false;
|
|
this->m_viewSettings = NULL;
|
|
this->m_displaySettings = NULL;
|
|
}
|
|
|
|
void ViewerBaseOperation::initExecution()
|
|
{
|
|
if (isActiveViewerOutput()) {
|
|
initImage();
|
|
}
|
|
}
|
|
|
|
void ViewerBaseOperation::initImage()
|
|
{
|
|
Image *anImage = this->m_image;
|
|
ImBuf *ibuf = BKE_image_acquire_ibuf(anImage, this->m_imageUser, &this->m_lock);
|
|
|
|
if (!ibuf) return;
|
|
BLI_lock_thread(LOCK_DRAW_IMAGE);
|
|
if (ibuf->x != (int)getWidth() || ibuf->y != (int)getHeight()) {
|
|
|
|
imb_freerectImBuf(ibuf);
|
|
imb_freerectfloatImBuf(ibuf);
|
|
IMB_freezbuffloatImBuf(ibuf);
|
|
ibuf->x = getWidth();
|
|
ibuf->y = getHeight();
|
|
imb_addrectfloatImBuf(ibuf);
|
|
anImage->ok = IMA_OK_LOADED;
|
|
|
|
ibuf->userflags |= IB_DISPLAY_BUFFER_INVALID;
|
|
|
|
BLI_unlock_thread(LOCK_DRAW_IMAGE);
|
|
}
|
|
|
|
if (m_doDepthBuffer)
|
|
{
|
|
addzbuffloatImBuf(ibuf);
|
|
}
|
|
BLI_unlock_thread(LOCK_DRAW_IMAGE);
|
|
|
|
/* now we combine the input with ibuf */
|
|
this->m_outputBuffer = ibuf->rect_float;
|
|
|
|
/* needed for display buffer update
|
|
*
|
|
* no need to lock / reference the image buffer because it's seems
|
|
* to be the single place which changes buffers of viewer image
|
|
* which is this node
|
|
*/
|
|
this->m_ibuf = ibuf;
|
|
|
|
if (m_doDepthBuffer)
|
|
{
|
|
this->m_depthBuffer = ibuf->zbuf_float;
|
|
}
|
|
|
|
BKE_image_release_ibuf(this->m_image, this->m_lock);
|
|
}
|
|
void ViewerBaseOperation:: updateImage(rcti *rect)
|
|
{
|
|
IMB_partial_display_buffer_update(this->m_ibuf, this->m_outputBuffer, NULL, getWidth(), 0, 0,
|
|
this->m_viewSettings, this->m_displaySettings,
|
|
rect->xmin, rect->ymin, rect->xmax, rect->ymax, FALSE);
|
|
|
|
WM_main_add_notifier(NC_WINDOW | ND_DRAW, NULL);
|
|
}
|
|
|
|
void ViewerBaseOperation::deinitExecution()
|
|
{
|
|
this->m_outputBuffer = NULL;
|
|
}
|
|
|
|
const CompositorPriority ViewerBaseOperation::getRenderPriority() const
|
|
{
|
|
if (this->isActiveViewerOutput()) {
|
|
return COM_PRIORITY_HIGH;
|
|
}
|
|
else {
|
|
return COM_PRIORITY_LOW;
|
|
}
|
|
}
|