qt: Fix loading of shaders using GL_ARB_shading_language_420pack extension
This commit is contained in:
@@ -183,10 +183,10 @@ OpenGLOptions::addShader(const QString &path)
|
|||||||
.toStdString());
|
.toStdString());
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!shader->addShaderFromSourceCode(QOpenGLShader::Vertex, version_line % "\n#define VERTEX\n" % shader_text))
|
if (!shader->addShaderFromSourceCode(QOpenGLShader::Vertex, version_line % "\n#extension GL_ARB_shading_language_420pack : enable\n" % "\n#define VERTEX\n" % shader_text))
|
||||||
throw_shader_error(tr("Error compiling vertex shader in file \"%1\""));
|
throw_shader_error(tr("Error compiling vertex shader in file \"%1\""));
|
||||||
|
|
||||||
if (!shader->addShaderFromSourceCode(QOpenGLShader::Fragment, version_line % "\n#define FRAGMENT\n" % shader_text))
|
if (!shader->addShaderFromSourceCode(QOpenGLShader::Fragment, version_line % "\n#extension GL_ARB_shading_language_420pack : enable\n" "\n#define FRAGMENT\n" % shader_text))
|
||||||
throw_shader_error(tr("Error compiling fragment shader in file \"%1\""));
|
throw_shader_error(tr("Error compiling fragment shader in file \"%1\""));
|
||||||
|
|
||||||
if (!shader->link())
|
if (!shader->link())
|
||||||
|
|||||||
Reference in New Issue
Block a user