summaryrefslogtreecommitdiffstats
path: root/tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp')
-rw-r--r--tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp76
1 files changed, 38 insertions, 38 deletions
diff --git a/tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp b/tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp
index 2e0dd0f96..bd4772045 100644
--- a/tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp
+++ b/tests/auto/render/opengl/qgraphicsutils/tst_qgraphicsutils.cpp
@@ -44,14 +44,14 @@ private slots:
void tst_QGraphicsUtils::fillScalarInDataArray()
{
- Qt3DRender::Render::ShaderUniform description;
+ Qt3DRender::Render::OpenGL::ShaderUniform description;
description.m_size = 1;
description.m_offset = 0;
description.m_arrayStride = 10;
QVector4D testVector(8.0f, 8.0f, 3.0f, 1.0f);
- const GLfloat *vectorData = Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(testVector, 1, 4);
+ const GLfloat *vectorData = Qt3DRender::Render::OpenGL::QGraphicsUtils::valueArrayFromVariant<GLfloat>(testVector, 1, 4);
for (int i = 0; i < 4; i++) {
if (i == 0)
@@ -68,7 +68,7 @@ void tst_QGraphicsUtils::fillScalarInDataArray()
char *innerData = data.data();
// Checked that we are not overflowing
- Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 2);
+ Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 2);
for (int i = 0; i < 4; ++i) {
if (i < 2)
QVERIFY(vectorData[i] == ((GLfloat*)innerData)[i]);
@@ -77,7 +77,7 @@ void tst_QGraphicsUtils::fillScalarInDataArray()
}
// Check that all values are copied
- Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 4);
+ Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 4);
for (int i = 0; i < 4; ++i)
QVERIFY(vectorData[i] == ((GLfloat*)innerData)[i]);
@@ -86,7 +86,7 @@ void tst_QGraphicsUtils::fillScalarInDataArray()
data = QByteArray(description.m_size * 8 * sizeof(GLfloat), 0);
innerData = data.data();
- Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 4);
+ Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 4);
for (int i = 0; i < 8; ++i) {
if (i < 4)
QVERIFY(((GLfloat*)innerData)[i] == 0.0f);
@@ -102,9 +102,9 @@ void tst_QGraphicsUtils::fillArray()
QVector4D testVector3(4.0f, 5.0f, 4.0f, 2.0f);
QVariantList variantList = QVariantList() << testVector << testVector2 << testVector3;
- const GLfloat *vectorData = Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant(variantList), 3, 4);
+ const GLfloat *vectorData = Qt3DRender::Render::OpenGL::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant(variantList), 3, 4);
- Qt3DRender::Render::ShaderUniform description;
+ Qt3DRender::Render::OpenGL::ShaderUniform description;
description.m_size = 3;
description.m_offset = 16;
@@ -112,7 +112,7 @@ void tst_QGraphicsUtils::fillArray()
QByteArray data(description.m_size * (4 + description.m_arrayStride) * sizeof(GLfloat) + description.m_offset, 0);
char *innerData = data.data();
- Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 4);
+ Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataArray(innerData, vectorData, description, 4);
int offset = description.m_offset / sizeof(GLfloat);
int stride = description.m_arrayStride / sizeof(GLfloat);
@@ -144,25 +144,25 @@ void tst_QGraphicsUtils::fillScalarWithOffsets()
QVector4D color(4.0f, 5.0f, 4.0f, 1.0f);
float intensity = 1.0f;
- Qt3DRender::Render::ShaderUniform posUniform;
+ Qt3DRender::Render::OpenGL::ShaderUniform posUniform;
posUniform.m_size = 1;
posUniform.m_arrayStride = 0;
posUniform.m_matrixStride = 0;
posUniform.m_offset = 0;
- Qt3DRender::Render::ShaderUniform dirUniform;
+ Qt3DRender::Render::OpenGL::ShaderUniform dirUniform;
dirUniform.m_size = 1;
dirUniform.m_arrayStride = 0;
dirUniform.m_matrixStride = 0;
dirUniform.m_offset = 16;
- Qt3DRender::Render::ShaderUniform colUniform;
+ Qt3DRender::Render::OpenGL::ShaderUniform colUniform;
colUniform.m_size = 1;
colUniform.m_arrayStride = 0;
colUniform.m_matrixStride = 0;
colUniform.m_offset = 32;
- Qt3DRender::Render::ShaderUniform intUniform;
+ Qt3DRender::Render::OpenGL::ShaderUniform intUniform;
intUniform.m_size = 1;
intUniform.m_arrayStride = 0;
intUniform.m_matrixStride = 0;
@@ -171,18 +171,18 @@ void tst_QGraphicsUtils::fillScalarWithOffsets()
QVector<GLfloat> data(16);
void *innerData = data.data();
- Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData,
- Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(position, 1, 3),
- posUniform, 3);
- Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData,
- Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(direction, 1, 3),
- dirUniform, 3);
- Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData,
- Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(color, 1, 4),
- colUniform, 4);
- Qt3DRender::Render::QGraphicsUtils::fillDataArray(innerData,
- Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(intensity, 1, 1),
- intUniform, 1);
+ Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataArray(innerData,
+ Qt3DRender::Render::OpenGL::QGraphicsUtils::valueArrayFromVariant<GLfloat>(position, 1, 3),
+ posUniform, 3);
+ Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataArray(innerData,
+ Qt3DRender::Render::OpenGL::QGraphicsUtils::valueArrayFromVariant<GLfloat>(direction, 1, 3),
+ dirUniform, 3);
+ Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataArray(innerData,
+ Qt3DRender::Render::OpenGL::QGraphicsUtils::valueArrayFromVariant<GLfloat>(color, 1, 4),
+ colUniform, 4);
+ Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataArray(innerData,
+ Qt3DRender::Render::OpenGL::QGraphicsUtils::valueArrayFromVariant<GLfloat>(intensity, 1, 1),
+ intUniform, 1);
GLfloat *floatData = (GLfloat*)innerData;
@@ -214,9 +214,9 @@ void tst_QGraphicsUtils::fillMatrix4x4()
QMatrix4x4 mat(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, 16.0f);
// column major
- const GLfloat *matData = Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(mat, 1, 16);
+ const GLfloat *matData = Qt3DRender::Render::OpenGL::QGraphicsUtils::valueArrayFromVariant<GLfloat>(mat, 1, 16);
- Qt3DRender::Render::ShaderUniform description;
+ Qt3DRender::Render::OpenGL::ShaderUniform description;
description.m_size = 1;
description.m_offset = 0;
@@ -226,7 +226,7 @@ void tst_QGraphicsUtils::fillMatrix4x4()
QByteArray data(description.m_size * 16 * sizeof(GLfloat), 0);
char *innerData = data.data();
- Qt3DRender::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 4);
+ Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 4);
// Check for no offset/no stride
for (int i = 0; i < 16; ++i)
QVERIFY((((GLfloat *)innerData)[i]) == matData[i]);
@@ -234,7 +234,7 @@ void tst_QGraphicsUtils::fillMatrix4x4()
description.m_offset = 12;
data = QByteArray((description.m_size * 16 + description.m_offset) * sizeof(GLfloat), 0);
innerData = data.data();
- Qt3DRender::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 4);
+ Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 4);
// Check with 12 offset/no stride
for (int i = 0; i < 16; ++i)
QVERIFY((((GLfloat *)innerData)[3 + i]) == matData[i]);
@@ -242,7 +242,7 @@ void tst_QGraphicsUtils::fillMatrix4x4()
description.m_matrixStride = 16;
data = QByteArray((description.m_size * 16 + 4 * description.m_matrixStride + description.m_offset) * sizeof(GLfloat), 0);
innerData = data.data();
- Qt3DRender::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 4);
+ Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 4);
// Check with 10 offset/ 16 stride
int offset = description.m_offset / sizeof(GLfloat);
int matrixStride = description.m_matrixStride / sizeof(GLfloat);
@@ -259,9 +259,9 @@ void tst_QGraphicsUtils::fillMatrix3x4()
QMatrix3x4 mat;
mat.fill(6.0f);
- const GLfloat *matData = Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant::fromValue(mat), 1, 12);
+ const GLfloat *matData = Qt3DRender::Render::OpenGL::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant::fromValue(mat), 1, 12);
- Qt3DRender::Render::ShaderUniform description;
+ Qt3DRender::Render::OpenGL::ShaderUniform description;
description.m_size = 1;
description.m_offset = 16;
@@ -270,7 +270,7 @@ void tst_QGraphicsUtils::fillMatrix3x4()
QByteArray data((description.m_size * 12 + 3 * description.m_matrixStride + description.m_offset) * sizeof(GLfloat), 0);
char *innerData = data.data();
- Qt3DRender::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 3, 4);
+ Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 3, 4);
// Check with 16 offset/ 12 stride
int offset = description.m_offset / sizeof(GLfloat);
int matrixStride = description.m_matrixStride / sizeof(GLfloat);
@@ -287,9 +287,9 @@ void tst_QGraphicsUtils::fillMatrix4x3()
QMatrix4x3 mat;
mat.fill(6.0f);
- const GLfloat *matData = Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant::fromValue(mat), 1, 12);
+ const GLfloat *matData = Qt3DRender::Render::OpenGL::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant::fromValue(mat), 1, 12);
- Qt3DRender::Render::ShaderUniform description;
+ Qt3DRender::Render::OpenGL::ShaderUniform description;
description.m_size = 1;
description.m_offset = 16;
@@ -298,7 +298,7 @@ void tst_QGraphicsUtils::fillMatrix4x3()
QByteArray data((description.m_size * 12 + 4 * description.m_matrixStride + description.m_offset) * sizeof(GLfloat), 0);
char *innerData = data.data();
- Qt3DRender::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 3);
+ Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 3);
// Check with 16 offset/ 16 stride
int offset = description.m_offset / sizeof(GLfloat);
int matrixStride = description.m_matrixStride / sizeof(GLfloat);
@@ -321,9 +321,9 @@ void tst_QGraphicsUtils::fillMatrixArray()
QVariantList matrices = QVariantList() << QVariant::fromValue(mat1) << QVariant::fromValue(mat2) << QVariant::fromValue(mat3);
- const GLfloat *matData = Qt3DRender::Render::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant::fromValue(matrices), 3, 12);
+ const GLfloat *matData = Qt3DRender::Render::OpenGL::QGraphicsUtils::valueArrayFromVariant<GLfloat>(QVariant::fromValue(matrices), 3, 12);
- Qt3DRender::Render::ShaderUniform description;
+ Qt3DRender::Render::OpenGL::ShaderUniform description;
description.m_size = 3;
description.m_offset = 12;
@@ -332,7 +332,7 @@ void tst_QGraphicsUtils::fillMatrixArray()
QByteArray data((description.m_size * (12 + 4 * description.m_matrixStride + description.m_arrayStride) + description.m_offset) * sizeof(GLfloat), 0);
char *innerData = data.data();
- Qt3DRender::Render::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 3);
+ Qt3DRender::Render::OpenGL::QGraphicsUtils::fillDataMatrixArray(innerData, matData, description, 4, 3);
// Check with 12 offset/ 4 array stride / 16 matrix stride
int offset = description.m_offset / sizeof(GLfloat);
int matrixStride = description.m_matrixStride / sizeof(GLfloat);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 13:16:00 +0000