Sergey Sharybin
d0f67e498e
- Made color management cache safe for situations when one area requested a display buffer, then some changes were done which invalidated cache, other area requested display buffer which changed cached buffer. Suck case could be fatal for first used of display buffer, which didn't happen yet because cache is being accessed from main thread only, but better to keep this things completely thread save to avoid headache in the future. - Baked RRT transformations, which gives ~3-4 times boost hopefully without visible artifacts. - Added support of partial updates to display buffers. This would create special context which hols display buffer which imbuf had to the time of creating this context and later this context would allow to run a color correction from given linear buffer within given region. This is being used by compositor to enable more realtime display update when compositing. - Added support of color management backdrop for nodes editor. There's now special menu called display properties in N-panel of nodes editor. Probably this better be de-duplicated somehow, but not sure yet how. Currently it's not so harmful to have panel for two spaces which contains only 2 properties. There's currently one unsolved issue with backdrop: it's not being updated progressively when just loading the file -- it's simply because there's no color managed display buffer for backdrop yet, and compositor doesn't actually know which color space to use here to generate preview to.
111 lines
2.9 KiB
C++
111 lines
2.9 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"
|
|
#include "IMB_colormanagement.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()) {
|
|
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;
|
|
}
|
|
|
|
this->m_partialBufferUpdate = IMB_partial_buffer_update_context_new(ibuf);
|
|
|
|
/* 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)
|
|
{
|
|
IMB_partial_buffer_update_rect(this->m_partialBufferUpdate, this->m_outputBuffer, rect);
|
|
|
|
WM_main_add_notifier(NC_WINDOW | ND_DRAW, NULL);
|
|
}
|
|
|
|
void ViewerBaseOperation::deinitExecution()
|
|
{
|
|
ImBuf *ibuf = BKE_image_acquire_ibuf(this->m_image, this->m_imageUser, &this->m_lock);
|
|
|
|
IMB_partial_buffer_update_free(this->m_partialBufferUpdate, ibuf);
|
|
|
|
BKE_image_release_ibuf(this->m_image, this->m_lock);
|
|
|
|
this->m_outputBuffer = NULL;
|
|
}
|
|
|
|
const CompositorPriority ViewerBaseOperation::getRenderPriority() const
|
|
{
|
|
if (this->isActiveViewerOutput()) {
|
|
return COM_PRIORITY_HIGH;
|
|
}
|
|
else {
|
|
return COM_PRIORITY_LOW;
|
|
}
|
|
}
|