fix Ubuntu and Windows CI
This commit is contained in:
@@ -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")
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user