From 370a83e1f2833322580c4fabe3981fee938edefe Mon Sep 17 00:00:00 2001 From: Jeff Cook Date: Fri, 26 Jan 2024 18:06:13 -0700 Subject: [PATCH] Fix build with OpenColorIO v2.3+. Taken from https://invent.kde.org/graphics/krita/-/merge_requests/1942/diffs. --- IOSupport/glsl.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/IOSupport/glsl.cpp b/IOSupport/glsl.cpp index f5a9ed3..61cbc63 100644 --- a/IOSupport/glsl.cpp +++ b/IOSupport/glsl.cpp @@ -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