From 3eb966cb5b956a42657fd408ee4cb9d9f46a19c6 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Fri, 24 Apr 2020 00:19:25 +1000 Subject: [PATCH] openglshader: fixed ocio opengl incompatibility --- app/render/backend/opengl/openglshader.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/render/backend/opengl/openglshader.cpp b/app/render/backend/opengl/openglshader.cpp index 419df9449..8dd83549b 100644 --- a/app/render/backend/opengl/openglshader.cpp +++ b/app/render/backend/opengl/openglshader.cpp @@ -83,7 +83,14 @@ OpenGLShaderPtr OpenGLShader::CreateOCIO(QOpenGLContext* ctx, 0, GL_RGB, GL_FLOAT, ocio_lut_data); // Create OCIO shader code - QString shader_text(processor->getGpuShaderText(shaderDesc)); + QString shader_text; + + // Workaround since OCIO doesn't support the GLSL version we use + shader_text.append(QStringLiteral("#define texture2D texture\n" + "#define texture3D texture\n")); + + // Append OCIO shader code + shader_text.append(processor->getGpuShaderText(shaderDesc)); QString shader_call; @@ -101,8 +108,8 @@ OpenGLShaderPtr OpenGLShader::CreateOCIO(QOpenGLContext* ctx, // Make OCIO call pass through disassociate and reassociate function shader_call = QStringLiteral("%3(%1(%2(col), ove_ociolut));").arg(ocio_func_name, - disassociate_func_name, - reassociate_func_name); + disassociate_func_name, + reassociate_func_name); } else {