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

Fix build with OpenColorIO v2.3+. #42

Merged
merged 1 commit into from
Jan 28, 2024
Merged

Fix build with OpenColorIO v2.3+. #42

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions IOSupport/glsl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,12 @@ OpenGLBuilder::allocateAllTextures(unsigned startIndex)
unsigned height = 0;
GpuShaderDesc::TextureType channel = GpuShaderDesc::TEXTURE_RGB_CHANNEL;
Interpolation interpolation = INTERP_LINEAR;
# if OCIO_VERSION_HEX >= 0x2030000
GpuShaderCreator::TextureDimensions dimensions;
m_shaderDesc->getTexture(idx, textureName, samplerName, width, height, channel, dimensions, interpolation);
# else
m_shaderDesc->getTexture(idx, textureName, samplerName, width, height, channel, interpolation);
# endif

if (!textureName || !*textureName
|| !samplerName || !*samplerName
Expand Down
Loading