Sergey Sharybin
807ad1f0e0
Issue was caused by threading conflict between compositor output node which is freeing buffers used by render result image and image draw code which could use buffers at the same time as compositor frees this buffers. Solved by adding adding lock around viewer image invalidation and image drawing. Use renamed LOCK_PREVIEW mutex for this, which si not called LOCK_DRAW_IMAGE. With new compositor locking for preview is not needed so it could be removed. Added the same lock around viewer operation which also frees buffers used by viewer image. It's actually quite difficult to check whether this is indeed needed. This code seems to be using acquire/release technique, but somehow acquiring ImBuf before invalidating it in compositor operation doesn't resolve the issue, so probably it's not actually locking acquire and things should be checked deeper.
104 lines
2.6 KiB
C++
104 lines
2.6 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 "DNA_scene_types.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"
|
|
}
|
|
|
|
|
|
ViewerBaseOperation::ViewerBaseOperation() : NodeOperation()
|
|
{
|
|
this->setImage(NULL);
|
|
this->setImageUser(NULL);
|
|
this->m_outputBuffer = NULL;
|
|
this->m_outputBufferDisplay = NULL;
|
|
this->m_active = false;
|
|
this->m_doColorManagement = true;
|
|
}
|
|
|
|
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;
|
|
if (ibuf->x != (int)getWidth() || ibuf->y != (int)getHeight()) {
|
|
BLI_lock_thread(LOCK_DRAW_IMAGE);
|
|
|
|
imb_freerectImBuf(ibuf);
|
|
imb_freerectfloatImBuf(ibuf);
|
|
IMB_freezbuffloatImBuf(ibuf);
|
|
ibuf->x = getWidth();
|
|
ibuf->y = getHeight();
|
|
imb_addrectImBuf(ibuf);
|
|
imb_addrectfloatImBuf(ibuf);
|
|
anImage->ok = IMA_OK_LOADED;
|
|
|
|
BLI_unlock_thread(LOCK_DRAW_IMAGE);
|
|
}
|
|
|
|
/* now we combine the input with ibuf */
|
|
this->m_outputBuffer = ibuf->rect_float;
|
|
this->m_outputBufferDisplay = (unsigned char *)ibuf->rect;
|
|
|
|
BKE_image_release_ibuf(this->m_image, this->m_lock);
|
|
}
|
|
void ViewerBaseOperation:: updateImage(rcti *rect)
|
|
{
|
|
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;
|
|
}
|
|
}
|