From 9cae5d9c5fe606f1ede7d969773404020b6fad2e Mon Sep 17 00:00:00 2001 From: Mike Solar Date: Thu, 28 May 2026 21:43:33 +0800 Subject: [PATCH] fix Ubuntu and Windows CI --- .github/workflows/ci.yml | 4 ++-- app/render/renderer.cpp | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d11a1ad8..bbf7a9bf4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -176,8 +176,8 @@ jobs: shell: msys2 {0} run: | cd openfx-misc - make -j4 - make install + mingw32-make -j4 + mingw32-make install PLUGIN_FILE=$(find /usr/OFX/Plugins /usr/local/OFX/Plugins . -name "*.ofx.bundle" -print -quit 2>/dev/null | head -1) if [ -n "$PLUGIN_FILE" ]; then PLUGIN_DIR=$(dirname "$PLUGIN_FILE") diff --git a/app/render/renderer.cpp b/app/render/renderer.cpp index 02001526a..891bdc4fa 100644 --- a/app/render/renderer.cpp +++ b/app/render/renderer.cpp @@ -284,10 +284,15 @@ bool Renderer::GetColorContext(const ColorTransformJob &color_job, OCIO::GpuShaderDesc::TextureType channel = OCIO::GpuShaderDesc::TEXTURE_RGB_CHANNEL; OCIO::Interpolation interpolation = OCIO::INTERP_LINEAR; +#if OCIO_VERSION_MAJOR > 2 || (OCIO_VERSION_MAJOR == 2 && OCIO_VERSION_MINOR >= 3) OCIO::GpuShaderDesc::TextureDimensions dimensions = OCIO::GpuShaderDesc::TEXTURE_2D; shader_desc->getTexture(i, tex_name, sampler_name, width, height, channel, dimensions, interpolation); +#else + shader_desc->getTexture(i, tex_name, sampler_name, width, height, + channel, interpolation); +#endif if (!tex_name || !*tex_name || !sampler_name || !*sampler_name || !width) {