Add OpenColorIO 2.3 compatibility#2294
Open
tobim wants to merge 1 commit into
Open
Conversation
The signature of the `getTexture` function changed and the calling code needs to be adapted. Signed-off-by: Tobias Mayer <tobim@fastmail.fm>
13 tasks
paulkocialkowski
suggested changes
Jan 15, 2024
paulkocialkowski
left a comment
paulkocialkowski
left a comment
There was a problem hiding this comment.
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.
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.
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. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The signature of the
getTexturefunction changed and the calling code needs to be adapted.resolves #2284