summaryrefslogtreecommitdiffstats
path: root/src/render/materialsystem/qparameter_p.h
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-12-08 09:03:14 +0100
committerPaul Lemire <paul.lemire@kdab.com>2016-01-13 16:08:31 +0000
commitd7e9c7a9844b658d93c3f1ac47e96f069162de3d (patch)
treef8ae86fe21d07d59ef806296379c0355a0e4f00c /src/render/materialsystem/qparameter_p.h
parent71b4e8612e558115edd12e8ac19f8d6abe583475 (diff)
QParameter: only copy QNodeId when parameter value is a QNodeSubclass
This avoid doing useless clones and will be further improved to support UBO/SSBO when Buffer are used as a Parameter's value. QNode subclasses that can be used as the value of an attribute are: QAbstractTextureProvider -> default uniform block QShaderData -> UBO (could be made to work with SSBO as well) Buffer -> UBO / SSBO Change-Id: I4928b95107656afc64db1ef989dde5dde8a92df8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/materialsystem/qparameter_p.h')
-rw-r--r--src/render/materialsystem/qparameter_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/materialsystem/qparameter_p.h b/src/render/materialsystem/qparameter_p.h
index 96db66b7a..bc57a7ca0 100644
--- a/src/render/materialsystem/qparameter_p.h
+++ b/src/render/materialsystem/qparameter_p.h
@@ -68,7 +68,7 @@ public:
QString m_name;
QVariant m_value;
- QString m_meshName;
+ QVariant m_backendValue;
};
} // namespace Qt3DRender