summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@sletta.org>2016-04-27 13:06:02 +0200
committerGunnar Sletta <gunnar@sletta.org>2016-04-28 08:53:06 +0000
commitc2781d324915062a8575dd35ff0fc4a950a8c3d5 (patch)
tree3ea20287d90e759d7a4de956775224bda0502015
parent657d33acba8acc1fd6b000ec74da9f4f3a48b743 (diff)
Pick up stencilclip shaders from the qt-project subfolder
Change-Id: I6fbc08be9148c772423d9225921fc1b2b1bf7444 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
-rw-r--r--customcontext/renderer/qsgbasicclipmanager_p.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/customcontext/renderer/qsgbasicclipmanager_p.h b/customcontext/renderer/qsgbasicclipmanager_p.h
index 76c06d0..e9f28bc 100644
--- a/customcontext/renderer/qsgbasicclipmanager_p.h
+++ b/customcontext/renderer/qsgbasicclipmanager_p.h
@@ -184,8 +184,14 @@ void QSGBasicClipManager::activate(const QSGClipNode *clip,
m_program = new QOpenGLShaderProgram();
QSGShaderSourceBuilder::initializeProgramFromFiles(
m_program,
+#if QT_VERSION >= 0x050600
+ QStringLiteral(":/qt-project.org/scenegraph/shaders/stencilclip.vert"),
+ QStringLiteral(":/qt-project.org/scenegraph/shaders/stencilclip.frag")
+#else
QStringLiteral(":/scenegraph/shaders/stencilclip.vert"),
- QStringLiteral(":/scenegraph/shaders/stencilclip.frag"));
+ QStringLiteral(":/scenegraph/shaders/stencilclip.frag")
+#endif
+ );
m_program->bindAttributeLocation("vCoord", 0);
m_program->link();
m_clipMatrixId = m_program->uniformLocation("matrix");