Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add OpenColorIO 2.3 compatibility #2294

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add OpenColorIO 2.3 compatibility #2294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion app/render/renderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,9 +240,17 @@ bool Renderer::GetColorContext(const ColorTransformJob &color_job, Renderer::Col
const char* sampler_name = nullptr;
unsigned int width = 0, height = 0;
OCIO::GpuShaderDesc::TextureType channel = OCIO::GpuShaderDesc::TEXTURE_RGB_CHANNEL;
#if OCIO_VERSION_HEX >= 0x02030000
OCIO::GpuShaderDesc::TextureDimensions dimensions = OCIO::GpuShaderDesc::TEXTURE_2D;
#endif
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,
Copy link

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 ;)

#if OCIO_VERSION_HEX >= 0x02030000
// OCIO::GpuShaderDesc::TextureDimensions
Copy link

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.

dimensions,
#endif
interpolation);

if (!tex_name || !*tex_name
|| !sampler_name || !*sampler_name
Expand Down