diff options
| author | Andy Nichols <andy.nichols@theqtcompany.com> | 2016-06-29 14:24:39 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-07-14 13:04:53 +0000 |
| commit | f091351e5d4c116ffdd16768fec60bb07efa049f (patch) | |
| tree | 95d093c3f4d527e77f1181ab7b78610ebb0ce2c6 /src/quick/items/qquickanimatedsprite.cpp | |
| parent | cc7cf5f5705553b625c1b28b49c41587b587bb38 (diff) | |
Enable building Qt Quick Sprite classes with QT_NO_OPENGL
Change-Id: Iaea1fa3bd17acee326ae8e299cb0c60d371ffb5b
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/quick/items/qquickanimatedsprite.cpp')
| -rw-r--r-- | src/quick/items/qquickanimatedsprite.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/quick/items/qquickanimatedsprite.cpp b/src/quick/items/qquickanimatedsprite.cpp index 77c7ae106b..aaa0487afd 100644 --- a/src/quick/items/qquickanimatedsprite.cpp +++ b/src/quick/items/qquickanimatedsprite.cpp @@ -96,6 +96,7 @@ QQuickAnimatedSpriteMaterial::~QQuickAnimatedSpriteMaterial() delete texture; } +#ifndef QT_NO_OPENGL class AnimatedSpriteMaterialData : public QSGMaterialShader { public: @@ -140,10 +141,15 @@ public: int m_animData_id; int m_animPos_id; }; +#endif QSGMaterialShader *QQuickAnimatedSpriteMaterial::createShader() const { +#ifndef QT_NO_OPENGL return new AnimatedSpriteMaterialData; +#else + return nullptr; +#endif } struct AnimatedSpriteVertex { @@ -448,8 +454,8 @@ void QQuickAnimatedSprite::createEngine() } static QSGGeometry::Attribute AnimatedSprite_Attributes[] = { - QSGGeometry::Attribute::create(0, 2, GL_FLOAT, true), // pos - QSGGeometry::Attribute::create(1, 2, GL_FLOAT), // tex + QSGGeometry::Attribute::create(0, 2, QSGGeometry::TypeFloat, true), // pos + QSGGeometry::Attribute::create(1, 2, QSGGeometry::TypeFloat), // tex }; static QSGGeometry::AttributeSet AnimatedSprite_AttributeSet = @@ -508,7 +514,7 @@ QSGGeometryNode* QQuickAnimatedSprite::buildNode() int vCount = 4; int iCount = 6; QSGGeometry *g = new QSGGeometry(AnimatedSprite_AttributeSet, vCount, iCount); - g->setDrawingMode(GL_TRIANGLES); + g->setDrawingMode(QSGGeometry::DrawTriangles); AnimatedSpriteVertices *p = (AnimatedSpriteVertices *) g->vertexData(); |