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

openglshader: fixed ocio opengl incompatibility

Browse Source
This commit is contained in:
itsmattkc
2020-04-24 00:19:25 +10:00
parent d3e7678c13
commit 3eb966cb5b
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/render/backend/opengl/openglshader.cpp
+10 -3
View File
@@ -83,7 +83,14 @@ OpenGLShaderPtr OpenGLShader::CreateOCIO(QOpenGLContext* ctx,
0, GL_RGB, GL_FLOAT, ocio_lut_data); 0, GL_RGB, GL_FLOAT, ocio_lut_data);
// Create OCIO shader code // 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; QString shader_call;
@@ -101,8 +108,8 @@ OpenGLShaderPtr OpenGLShader::CreateOCIO(QOpenGLContext* ctx,
// Make OCIO call pass through disassociate and reassociate function // Make OCIO call pass through disassociate and reassociate function
shader_call = QStringLiteral("%3(%1(%2(col), ove_ociolut));").arg(ocio_func_name, shader_call = QStringLiteral("%3(%1(%2(col), ove_ociolut));").arg(ocio_func_name,
disassociate_func_name, disassociate_func_name,
reassociate_func_name); reassociate_func_name);
} else { } else {