diff options
| author | Andy Nichols <andy.nichols@theqtcompany.com> | 2016-05-08 20:17:35 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-05-08 20:04:37 +0000 |
| commit | ddbe4ec52b747b3504180a15c7e5a2da3a6332c8 (patch) | |
| tree | aa8c9aa421856db1fdebd5817f665f892bc37440 /src/quick/scenegraph/qsgbasicimagenode.cpp | |
| parent | 92da3afdb69c52b955f3828ec10574031f094c7d (diff) | |
Fix build with QT_NO_OPENGL after rebase
Change-Id: Ia4243de07ec75030bb98f4f6d95f70d88e29fdba
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src/quick/scenegraph/qsgbasicimagenode.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgbasicimagenode.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/scenegraph/qsgbasicimagenode.cpp b/src/quick/scenegraph/qsgbasicimagenode.cpp index 36a43b754a..24077cc947 100644 --- a/src/quick/scenegraph/qsgbasicimagenode.cpp +++ b/src/quick/scenegraph/qsgbasicimagenode.cpp @@ -314,7 +314,7 @@ QSGGeometry *QSGBasicImageNode::updateGeometry(const QRectF &targetRect, g->allocate(hCells * vCells * 4 + (hCells + vCells - 1) * 4, hCells * vCells * 6 + (hCells + vCells) * 12); - g->setDrawingMode(GL_TRIANGLES); + g->setDrawingMode(QSGGeometry::DrawTriangles); SmoothVertex *vertices = reinterpret_cast<SmoothVertex *>(g->vertexData()); memset(vertices, 0, g->vertexCount() * g->sizeOfVertex()); quint16 *indices = g->indexDataAsUShort(); @@ -427,11 +427,11 @@ QSGGeometry *QSGBasicImageNode::updateGeometry(const QRectF &targetRect, if (!geometry) { geometry = new QSGGeometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), hCells * vCells * 4, hCells * vCells * 6, - GL_UNSIGNED_SHORT); + QSGGeometry::TypeUnsignedShort); } else { geometry->allocate(hCells * vCells * 4, hCells * vCells * 6); } - geometry->setDrawingMode(GL_TRIANGLES); + geometry->setDrawingMode(QSGGeometry::DrawTriangles); QSGGeometry::TexturedPoint2D *vertices = geometry->vertexDataAsTexturedPoint2D(); ys = yData.data(); for (int j = 0; j < vCells; ++j, ys += 2) { |