diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-11 11:08:11 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-11 12:00:31 +0100 |
commit | 7c9497a6d47a02d961baef3993ba4cf4267ec607 (patch) | |
tree | 335fae3e9e3a84d33310efca23f1d6993265805b /examples/quick/scenegraph/graph/linenode.cpp | |
parent | 67ba88947f57ab2d1859bbeb96c6dcba020561b1 (diff) | |
parent | 6c840c70d61c3ae277b60a024a086215c743e5b3 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/qml/compiler/qv4ssa.cpp
src/qml/jsruntime/qv4arrayobject.cpp
src/qml/jsruntime/qv4context.cpp
Change-Id: Ied5b23bec4dc14abe51127c507aed668f855c1e1
Diffstat (limited to 'examples/quick/scenegraph/graph/linenode.cpp')
-rw-r--r-- | examples/quick/scenegraph/graph/linenode.cpp | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/examples/quick/scenegraph/graph/linenode.cpp b/examples/quick/scenegraph/graph/linenode.cpp index 0d1229cf1d..015aa4f0ee 100644 --- a/examples/quick/scenegraph/graph/linenode.cpp +++ b/examples/quick/scenegraph/graph/linenode.cpp @@ -58,17 +58,14 @@ class LineShader : public QSGSimpleMaterialShader<LineMaterial> QSG_DECLARE_SIMPLE_SHADER(LineShader, LineMaterial) public: - const char *vertexShader() const { - QResource r(":/scenegraph/graph/shaders/line.vsh"); - Q_ASSERT(r.isValid()); - return (const char *) r.data(); - } + LineShader() + : vsh(readResource(":/scenegraph/graph/shaders/line.vsh")), + fsh(readResource(":/scenegraph/graph/shaders/line.fsh")) + {} - const char *fragmentShader() const { - QResource r(":/scenegraph/graph/shaders/line.fsh"); - Q_ASSERT(r.isValid()); - return (const char *) r.data(); - } + const char *vertexShader() const { return vsh.constData(); } + + const char *fragmentShader() const { return fsh.constData(); } QList<QByteArray> attributes() const { return QList<QByteArray>() << "pos" << "t"; } @@ -84,7 +81,15 @@ public: id_color = program()->uniformLocation("color"); } + static QByteArray readResource(const char *path) { + QResource r(path); + Q_ASSERT(r.isValid()); + return QByteArray((const char *)r.data(), r.size()); + } + private: + QByteArray vsh; + QByteArray fsh; int id_color; int id_spread; int id_size; |