diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2017-07-12 14:01:31 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-08-02 17:34:30 +0000 |
| commit | 50775424beb886e1fa0c32982a46642a8e1fa888 (patch) | |
| tree | 4563ea0ae5f361c165b2bd168defd33443a66806 /tests/auto/gui/util | |
| parent | 3786411f7f8770f28ba2a97cb646a0eb7a5eaa99 (diff) | |
Extend the parameter support in QShaderNodeLoader for richer types
In particular, go through QMetaType/QMetaEnum to deal with enums.
Change-Id: Idbe16c913c1d471a4a91d219f77876e498c192d9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests/auto/gui/util')
| -rw-r--r-- | tests/auto/gui/util/qshadernodesloader/tst_qshadernodesloader.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/tests/auto/gui/util/qshadernodesloader/tst_qshadernodesloader.cpp b/tests/auto/gui/util/qshadernodesloader/tst_qshadernodesloader.cpp index ad76012e2f..4782e40ed8 100644 --- a/tests/auto/gui/util/qshadernodesloader/tst_qshadernodesloader.cpp +++ b/tests/auto/gui/util/qshadernodesloader/tst_qshadernodesloader.cpp @@ -32,6 +32,7 @@ #include <QtCore/qbuffer.h> #include <QtGui/private/qshadernodesloader_p.h> +#include <QtGui/private/qshaderlanguage_p.h> using QBufferPointer = QSharedPointer<QBuffer>; Q_DECLARE_METATYPE(QBufferPointer); @@ -131,7 +132,19 @@ void tst_QShaderNodesLoader::shouldLoadFromJsonStream_data() " \"value\"" " ]," " \"parameters\": {" - " \"name\": \"defaultName\"" + " \"name\": \"defaultName\"," + " \"qualifier\": {" + " \"type\": \"QShaderLanguage::StorageQualifier\"," + " \"value\": \"QShaderLanguage::Uniform\"" + " }," + " \"type\": {" + " \"type\": \"QShaderLanguage::VariableType\"," + " \"value\": \"QShaderLanguage::Vec3\"" + " }," + " \"defaultValue\": {" + " \"type\": \"float\"," + " \"value\": \"1.25\"" + " }" " }," " \"rules\": [" " {" @@ -225,6 +238,9 @@ void tst_QShaderNodesLoader::shouldLoadFromJsonStream_data() createPort(QShaderNodePort::Output, "value") }); inputValue.setParameter("name", "defaultName"); + inputValue.setParameter("qualifier", QVariant::fromValue<QShaderLanguage::StorageQualifier>(QShaderLanguage::Uniform)); + inputValue.setParameter("type", QVariant::fromValue<QShaderLanguage::VariableType>(QShaderLanguage::Vec3)); + inputValue.setParameter("defaultValue", QVariant(1.25f)); inputValue.addRule(openGLES2, QShaderNode::Rule("highp vec3 $value = $name;", QByteArrayList() << "varying highp vec3 $name;")); inputValue.addRule(openGL2, QShaderNode::Rule("vec3 $value = $name;", |