From 0d196b42683deb852c0df90ce76eb9cf98112fb9 Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Thu, 6 Jul 2017 16:58:36 +0200 Subject: Add support for parameters in QShaderGenerator Change-Id: Iff8fec51ddbf9b018cb5ec3aff357125134013eb Reviewed-by: Sean Harmer --- .../auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'tests/auto/gui/util') diff --git a/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp b/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp index 655bc94f2c..f64d9458f9 100644 --- a/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp +++ b/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp @@ -77,12 +77,13 @@ namespace auto graph = QShaderGraph(); auto worldPosition = createNode({ - createPort(QShaderNodePort::Output, "worldPosition") + createPort(QShaderNodePort::Output, "value") }); - worldPosition.addRule(openGLES2, QShaderNode::Rule("highp vec3 $worldPosition = worldPosition;", - QByteArrayList() << "varying highp vec3 worldPosition;")); - worldPosition.addRule(openGL3, QShaderNode::Rule("vec3 $worldPosition = worldPosition;", - QByteArrayList() << "in vec3 worldPosition;")); + worldPosition.setParameter("name", "worldPosition"); + worldPosition.addRule(openGLES2, QShaderNode::Rule("highp vec3 $value = $name;", + QByteArrayList() << "varying highp vec3 $name;")); + worldPosition.addRule(openGL3, QShaderNode::Rule("vec3 $value = $name;", + QByteArrayList() << "in vec3 $name;")); auto texture = createNode({ createPort(QShaderNodePort::Output, "texture") @@ -163,7 +164,7 @@ namespace graph.addEdge(createEdge(texture.uuid(), "texture", sampleTexture.uuid(), "sampler")); graph.addEdge(createEdge(texCoord.uuid(), "texCoord", sampleTexture.uuid(), "coord")); - graph.addEdge(createEdge(worldPosition.uuid(), "worldPosition", lightFunction.uuid(), "position")); + graph.addEdge(createEdge(worldPosition.uuid(), "value", lightFunction.uuid(), "position")); graph.addEdge(createEdge(sampleTexture.uuid(), "color", lightFunction.uuid(), "baseColor")); graph.addEdge(createEdge(lightIntensity.uuid(), "lightIntensity", lightFunction.uuid(), "lightIntensity")); -- cgit v1.2.3