9c49e71216
- GLSL shader wasn't aware of alpha predivide option, always assuming alpha is straight. Gave wrong results when displaying transparent float buffers. - GLSL display wasn't aware of float buffers with number of channels different from 4, crashing when trying to display image with different number of channels. This required a bit larger changes, namely now it's possible to pass format (GL_RGB, GL_RGBAm GL_LUMINANCE) to glaDrawPixelsTex, This also implied adding format to glaDrawPixelsAuto and modifying all places where this functions are called. Now GLSL will handle both 3 and 4 channels buffers, single channel images are handled by CPU. - Replaced hack for render result displaying with a bit different hack. Namely CPU conversion will happen only during render, once render is done GLSL would be used for displaying render result on a screen. This is so because of the way renderer updates parts of the image -- it happens without respect to active render layer in image user. This is harmless because only display buffer is modifying, but this is tricky because we don't have original buffer opened during rendering. One more related fix here was about when rendering multiple layers, wrong image would be displaying when rendering is done. Added a signal to invalidate display buffer once rendering is done (only happens when using multiple layers). This solves issue with wrong buffer stuck on the display when using regular CPU display space transform and if GLSL is available it'll make image displayed with a GLSL shader. - As an additional change, byte buffers now also uses GLSL display transform. So now only dutehr and RGB curves are stoppers for using GLSL for all kind of display transforms.
300 lines
7.6 KiB
C++
300 lines
7.6 KiB
C++
/*
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
*
|
|
* 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.
|
|
*
|
|
* The Original Code is Copyright (C) 2012 Blender Foundation.
|
|
* All rights reserved.
|
|
*
|
|
* Contributor(s): Sergey Sharybin
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
#include "ocio_impl.h"
|
|
|
|
static IOCIOImpl *impl = NULL;
|
|
|
|
void OCIO_init(void)
|
|
{
|
|
#ifdef WITH_OCIO
|
|
impl = new OCIOImpl();
|
|
#else
|
|
impl = new FallbackImpl();
|
|
#endif
|
|
}
|
|
|
|
void OCIO_exit(void)
|
|
{
|
|
delete impl;
|
|
impl = NULL;
|
|
}
|
|
|
|
OCIO_ConstConfigRcPtr *OCIO_getCurrentConfig(void)
|
|
{
|
|
return impl->getCurrentConfig();
|
|
}
|
|
|
|
OCIO_ConstConfigRcPtr *OCIO_configCreateFallback(void)
|
|
{
|
|
delete impl;
|
|
impl = new FallbackImpl();
|
|
|
|
return impl->getCurrentConfig();
|
|
}
|
|
|
|
void OCIO_setCurrentConfig(const OCIO_ConstConfigRcPtr *config)
|
|
{
|
|
impl->setCurrentConfig(config);
|
|
}
|
|
|
|
OCIO_ConstConfigRcPtr *OCIO_configCreateFromEnv(void)
|
|
{
|
|
return impl->configCreateFromEnv();
|
|
}
|
|
|
|
OCIO_ConstConfigRcPtr *OCIO_configCreateFromFile(const char *filename)
|
|
{
|
|
return impl->configCreateFromFile(filename);
|
|
}
|
|
|
|
void OCIO_configRelease(OCIO_ConstConfigRcPtr *config)
|
|
{
|
|
impl->configRelease(config);
|
|
}
|
|
|
|
int OCIO_configGetNumColorSpaces(OCIO_ConstConfigRcPtr *config)
|
|
{
|
|
return impl->configGetNumColorSpaces(config);
|
|
}
|
|
|
|
const char *OCIO_configGetColorSpaceNameByIndex(OCIO_ConstConfigRcPtr *config, int index)
|
|
{
|
|
return impl->configGetColorSpaceNameByIndex(config, index);
|
|
}
|
|
|
|
OCIO_ConstColorSpaceRcPtr *OCIO_configGetColorSpace(OCIO_ConstConfigRcPtr *config, const char *name)
|
|
{
|
|
return impl->configGetColorSpace(config, name);
|
|
}
|
|
|
|
int OCIO_configGetIndexForColorSpace(OCIO_ConstConfigRcPtr *config, const char *name)
|
|
{
|
|
return impl->configGetIndexForColorSpace(config, name);
|
|
}
|
|
|
|
const char *OCIO_configGetDefaultDisplay(OCIO_ConstConfigRcPtr *config)
|
|
{
|
|
return impl->configGetDefaultDisplay(config);
|
|
}
|
|
|
|
int OCIO_configGetNumDisplays(OCIO_ConstConfigRcPtr* config)
|
|
{
|
|
return impl->configGetNumDisplays(config);
|
|
}
|
|
|
|
const char *OCIO_configGetDisplay(OCIO_ConstConfigRcPtr *config, int index)
|
|
{
|
|
return impl->configGetDisplay(config, index);
|
|
}
|
|
|
|
const char *OCIO_configGetDefaultView(OCIO_ConstConfigRcPtr *config, const char *display)
|
|
{
|
|
return impl->configGetDefaultView(config, display);
|
|
}
|
|
|
|
int OCIO_configGetNumViews(OCIO_ConstConfigRcPtr *config, const char *display)
|
|
{
|
|
return impl->configGetNumViews(config, display);
|
|
}
|
|
|
|
const char *OCIO_configGetView(OCIO_ConstConfigRcPtr *config, const char *display, int index)
|
|
{
|
|
return impl->configGetView(config, display, index);
|
|
}
|
|
|
|
const char *OCIO_configGetDisplayColorSpaceName(OCIO_ConstConfigRcPtr *config, const char *display, const char *view)
|
|
{
|
|
return impl->configGetDisplayColorSpaceName(config, display, view);
|
|
}
|
|
|
|
int OCIO_colorSpaceIsInvertible(OCIO_ConstColorSpaceRcPtr *cs)
|
|
{
|
|
return impl->colorSpaceIsInvertible(cs);
|
|
}
|
|
|
|
int OCIO_colorSpaceIsData(OCIO_ConstColorSpaceRcPtr *cs)
|
|
{
|
|
return impl->colorSpaceIsData(cs);
|
|
}
|
|
|
|
void OCIO_colorSpaceRelease(OCIO_ConstColorSpaceRcPtr *cs)
|
|
{
|
|
impl->colorSpaceRelease(cs);
|
|
}
|
|
|
|
OCIO_ConstProcessorRcPtr *OCIO_configGetProcessorWithNames(OCIO_ConstConfigRcPtr *config, const char *srcName, const char *dstName)
|
|
{
|
|
return impl->configGetProcessorWithNames(config, srcName, dstName);
|
|
}
|
|
|
|
OCIO_ConstProcessorRcPtr *OCIO_configGetProcessor(OCIO_ConstConfigRcPtr *config, OCIO_ConstTransformRcPtr *transform)
|
|
{
|
|
return impl->configGetProcessor(config, transform);
|
|
}
|
|
|
|
void OCIO_processorApply(OCIO_ConstProcessorRcPtr *processor, OCIO_PackedImageDesc *img)
|
|
{
|
|
impl->processorApply(processor, img);
|
|
}
|
|
|
|
void OCIO_processorApply_predivide(OCIO_ConstProcessorRcPtr *processor, OCIO_PackedImageDesc *img)
|
|
{
|
|
impl->processorApply_predivide(processor, img);
|
|
}
|
|
|
|
void OCIO_processorApplyRGB(OCIO_ConstProcessorRcPtr *processor, float *pixel)
|
|
{
|
|
impl->processorApplyRGB(processor, pixel);
|
|
}
|
|
|
|
void OCIO_processorApplyRGBA(OCIO_ConstProcessorRcPtr *processor, float *pixel)
|
|
{
|
|
impl->processorApplyRGBA(processor, pixel);
|
|
}
|
|
|
|
void OCIO_processorApplyRGBA_predivide(OCIO_ConstProcessorRcPtr *processor, float *pixel)
|
|
{
|
|
impl->processorApplyRGBA_predivide(processor, pixel);
|
|
}
|
|
|
|
void OCIO_processorRelease(OCIO_ConstProcessorRcPtr *p)
|
|
{
|
|
impl->processorRelease(p);
|
|
}
|
|
|
|
const char *OCIO_colorSpaceGetName(OCIO_ConstColorSpaceRcPtr *cs)
|
|
{
|
|
return impl->colorSpaceGetName(cs);
|
|
}
|
|
|
|
const char *OCIO_colorSpaceGetDescription(OCIO_ConstColorSpaceRcPtr *cs)
|
|
{
|
|
return impl->colorSpaceGetDescription(cs);
|
|
}
|
|
|
|
const char *OCIO_colorSpaceGetFamily(OCIO_ConstColorSpaceRcPtr *cs)
|
|
{
|
|
return impl->colorSpaceGetFamily(cs);
|
|
}
|
|
|
|
OCIO_DisplayTransformRcPtr *OCIO_createDisplayTransform(void)
|
|
{
|
|
return impl->createDisplayTransform();
|
|
}
|
|
|
|
void OCIO_displayTransformSetInputColorSpaceName(OCIO_DisplayTransformRcPtr *dt, const char *name)
|
|
{
|
|
impl->displayTransformSetInputColorSpaceName(dt, name);
|
|
}
|
|
|
|
void OCIO_displayTransformSetDisplay(OCIO_DisplayTransformRcPtr *dt, const char *name)
|
|
{
|
|
impl->displayTransformSetDisplay(dt, name);
|
|
}
|
|
|
|
void OCIO_displayTransformSetView(OCIO_DisplayTransformRcPtr *dt, const char *name)
|
|
{
|
|
impl->displayTransformSetView(dt, name);
|
|
}
|
|
|
|
void OCIO_displayTransformSetDisplayCC(OCIO_DisplayTransformRcPtr *dt, OCIO_ConstTransformRcPtr *t)
|
|
{
|
|
impl->displayTransformSetDisplayCC(dt, t);
|
|
}
|
|
|
|
void OCIO_displayTransformSetLinearCC(OCIO_DisplayTransformRcPtr *dt, OCIO_ConstTransformRcPtr *t)
|
|
{
|
|
impl->displayTransformSetLinearCC(dt, t);
|
|
}
|
|
|
|
void OCIO_displayTransformRelease(OCIO_DisplayTransformRcPtr *dt)
|
|
{
|
|
impl->displayTransformRelease(dt);
|
|
}
|
|
|
|
OCIO_PackedImageDesc *OCIO_createOCIO_PackedImageDesc(float *data, long width, long height, long numChannels,
|
|
long chanStrideBytes, long xStrideBytes, long yStrideBytes)
|
|
{
|
|
return impl->createOCIO_PackedImageDesc(data, width, height, numChannels, chanStrideBytes, xStrideBytes, yStrideBytes);
|
|
}
|
|
|
|
void OCIO_PackedImageDescRelease(OCIO_PackedImageDesc* id)
|
|
{
|
|
impl->OCIO_PackedImageDescRelease(id);
|
|
}
|
|
|
|
OCIO_ExponentTransformRcPtr *OCIO_createExponentTransform(void)
|
|
{
|
|
return impl->createExponentTransform();
|
|
}
|
|
|
|
void OCIO_exponentTransformSetValue(OCIO_ExponentTransformRcPtr *et, const float *exponent)
|
|
{
|
|
impl->exponentTransformSetValue(et, exponent);
|
|
}
|
|
|
|
void OCIO_exponentTransformRelease(OCIO_ExponentTransformRcPtr *et)
|
|
{
|
|
impl->exponentTransformRelease(et);
|
|
}
|
|
|
|
OCIO_MatrixTransformRcPtr *OCIO_createMatrixTransform(void)
|
|
{
|
|
return impl->createMatrixTransform();
|
|
}
|
|
|
|
void OCIO_matrixTransformSetValue(OCIO_MatrixTransformRcPtr *mt, const float *m44, const float *offset4)
|
|
{
|
|
impl->matrixTransformSetValue(mt, m44, offset4);
|
|
}
|
|
|
|
void OCIO_matrixTransformRelease(OCIO_MatrixTransformRcPtr *mt)
|
|
{
|
|
impl->matrixTransformRelease(mt);
|
|
}
|
|
|
|
void OCIO_matrixTransformScale(float * m44, float * offset4, const float *scale4f)
|
|
{
|
|
impl->matrixTransformScale(m44, offset4, scale4f);
|
|
}
|
|
|
|
int OCIO_setupGLSLDraw(struct OCIO_GLSLDrawState **state_r, OCIO_ConstProcessorRcPtr *processor, int predivide)
|
|
{
|
|
return (int) impl->setupGLSLDraw(state_r, processor, (bool) predivide);
|
|
}
|
|
|
|
void OCIO_finishGLSLDraw(struct OCIO_GLSLDrawState *state)
|
|
{
|
|
impl->finishGLSLDraw(state);
|
|
}
|
|
|
|
void OCIO_freeOGLState(struct OCIO_GLSLDrawState *state)
|
|
{
|
|
impl->freeGLState(state);
|
|
}
|