Commit eb05ebe590cfa5f2cdf1d21719a294d1ec608e41

Test data again after QGLVertexArray removal.
  
4949#include "qglabstracteffect.h"
5050#include "qgloperation.h"
5151#include "qtest_helpers_p.h"
52#include "qgeometrydata.h"
5253
5354class tst_QGLDisplayList : public QObject
5455{
871871
872872 QCOMPARE(displayList.sections().count(), 0);
873873
874#if 0 // TODO: needs to check the vertex buffer instead
875874 QGeometryData *geom = node->geometry();
876
877 QGLVertexArray verts = geom->toVertexArray();
878875 QGLIndexArray ids = geom->indices();
879876
880 QCOMPARE(verts.vertexCount(), 13);
877 QCOMPARE(geom->count(QGL::Position), 13);
881878 QCOMPARE(ids.size(), 36);
882879
883880 // triangulated face
884881 int tf = ids[node->start()]; // beginning of triangulated face
885882 QCOMPARE(node->count(), 12);
886 QCOMPARE(verts.vector3DAt(tf, QGL::Position), center);
887 QCOMPARE(verts.vector3DAt(tf + 2, QGL::Position), b);
888 QCOMPARE(verts.vector3DAt(tf, QGL::Normal), n0);
889 QCOMPARE(verts.vector3DAt(tf + 2, QGL::Normal), n0);
883 QCOMPARE(geom->vertex(tf), center);
884 QCOMPARE(geom->vertex(tf + 2), b);
885 QCOMPARE(geom->normal(tf), n0);
886 QCOMPARE(geom->normal(tf + 2), n0);
890887
891888 int ext = ids[node2->start()]; // beginning of extrude
892889 int last = ids[node2->start() + (node2->count() - 1)];
893890 QCOMPARE(node2->count(), 24);
894 QCOMPARE(verts.vector3DAt(ext, QGL::Position), a - n);
895 QCOMPARE(verts.vector3DAt(ext, QGL::Normal), n1);
896 QCOMPARE(verts.vector3DAt(last, QGL::Position), d);
897 QCOMPARE(verts.vector3DAt(last, QGL::Normal), n4);
891 QCOMPARE(geom->vertex(ext), a - n);
892 QCOMPARE(geom->normal(ext), n1);
893 QCOMPARE(geom->vertex(last), d);
894 QCOMPARE(geom->normal(last), n4);
898895
899896#ifndef QT_NO_MEMBER_TEMPLATES
900897 QList<QGLSceneNode*> nodes = displayList.findChildren<QGLSceneNode*>();
910910 QVERIFY(node3->geometry() != geom);
911911
912912 geom = node3->geometry();
913 QGLVertexArray verts2 = geom->toVertexArray();
914913 QGLIndexArray ids2 = geom->indices();
915914
916915 int tri = ids2[node->start()];
917 QGLVertexDescription desc = verts2.fields();
918 QCOMPARE(verts2.vector3DAt(tri, desc.indexOf(QGL::Position)), e);
919 QCOMPARE(verts2.vector3DAt(tri, desc.indexOf(QGL::Normal)), n10);
920 QCOMPARE(verts2.vector2DAt(tri, desc.indexOf(QGL::TextureCoord0)), ta);
921#endif
916 QCOMPARE(geom->vertex(tri), e);
917 QCOMPARE(geom->normal(tri), n10);
918 QCOMPARE(geom->texCoord(tri), ta);
922919}
923920
924921QTEST_APPLESS_MAIN(tst_QGLDisplayList)