oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix Ubuntu and Windows CI

Browse Source
This commit is contained in:
Mike-Solar
2026-05-28 21:43:33 +08:00
parent 6b94ceea14
commit 9cae5d9c5f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+2 -2
View File
@@ -176,8 +176,8 @@ jobs:
shell: msys2 {0} shell: msys2 {0}
run: | run: |
cd openfx-misc cd openfx-misc
make -j4 mingw32-make -j4
make install mingw32-make install
PLUGIN_FILE=$(find /usr/OFX/Plugins /usr/local/OFX/Plugins . -name "*.ofx.bundle" -print -quit 2>/dev/null | head -1) 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 if [ -n "$PLUGIN_FILE" ]; then
PLUGIN_DIR=$(dirname "$PLUGIN_FILE") PLUGIN_DIR=$(dirname "$PLUGIN_FILE")
app/render/renderer.cpp
+5
View File
@@ -284,10 +284,15 @@ bool Renderer::GetColorContext(const ColorTransformJob &color_job,
OCIO::GpuShaderDesc::TextureType channel = OCIO::GpuShaderDesc::TextureType channel =
OCIO::GpuShaderDesc::TEXTURE_RGB_CHANNEL; OCIO::GpuShaderDesc::TEXTURE_RGB_CHANNEL;
OCIO::Interpolation interpolation = OCIO::INTERP_LINEAR; 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::TextureDimensions dimensions =
OCIO::GpuShaderDesc::TEXTURE_2D; OCIO::GpuShaderDesc::TEXTURE_2D;
shader_desc->getTexture(i, tex_name, sampler_name, width, height, shader_desc->getTexture(i, tex_name, sampler_name, width, height,
channel, dimensions, interpolation); 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 || if (!tex_name || !*tex_name || !sampler_name || !*sampler_name ||
!width) { !width) {