-
-
Notifications
You must be signed in to change notification settings - Fork 563
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add OpenColorIO 2.3 compatibility #2294
base: master
Are you sure you want to change the base?
Conversation
The signature of the `getTexture` function changed and the calling code needs to be adapted. Signed-off-by: Tobias Mayer <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the fix! I had the same issue on Arch and this does it :)
See a few comments on the code.
OCIO::Interpolation interpolation = OCIO::INTERP_LINEAR; | ||
|
||
shader_desc->getTexture(i, tex_name, sampler_name, width, height, channel, interpolation); | ||
shader_desc->getTexture(i, tex_name, sampler_name, width, height, channel, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems a bit out of line with the coding style to break off the line for the preprocessor conditional.
I'd rather see two instances of the call, but maybe it's just my personal taste ;)
shader_desc->getTexture(i, tex_name, sampler_name, width, height, channel, interpolation); | ||
shader_desc->getTexture(i, tex_name, sampler_name, width, height, channel, | ||
#if OCIO_VERSION_HEX >= 0x02030000 | ||
// OCIO::GpuShaderDesc::TextureDimensions |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think it's necessary to mention the type here. It's also out of line with the coding style.
Could this be merged in some form? Running into the recently-closed issue while building from source. |
The signature of the
getTexture
function changed and the calling code needs to be adapted.resolves #2284