diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2020-06-29 16:46:59 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2020-07-03 14:05:35 +0200 |
| commit | 914752257634dede18cc5079f2a506b699744058 (patch) | |
| tree | 00ea67c3d0fc11b9688472061b7d870f9860534e /tests/auto/render/opengl/graphicshelpergl3_2/tst_graphicshelpergl3_2.cpp | |
| parent | 7beecb9913b25c4e7629cffad3389faea5608762 (diff) | |
GraphicsHelpers/GLShader: switch to std::vector
Change-Id: I8be6695e0c52dfbe353cd381d94548aba1c7da82
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'tests/auto/render/opengl/graphicshelpergl3_2/tst_graphicshelpergl3_2.cpp')
| -rw-r--r-- | tests/auto/render/opengl/graphicshelpergl3_2/tst_graphicshelpergl3_2.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/render/opengl/graphicshelpergl3_2/tst_graphicshelpergl3_2.cpp b/tests/auto/render/opengl/graphicshelpergl3_2/tst_graphicshelpergl3_2.cpp index e784e5b9a..8b810ddb6 100644 --- a/tests/auto/render/opengl/graphicshelpergl3_2/tst_graphicshelpergl3_2.cpp +++ b/tests/auto/render/opengl/graphicshelpergl3_2/tst_graphicshelpergl3_2.cpp @@ -970,11 +970,11 @@ private Q_SLOTS: QVERIFY(shaderProgram.link()); // WHEN - const QVector<ShaderUniformBlock> activeUniformBlocks = m_glHelper.programUniformBlocks(shaderProgram.programId()); + const std::vector<ShaderUniformBlock> activeUniformBlocks = m_glHelper.programUniformBlocks(shaderProgram.programId()); // THEN QCOMPARE(activeUniformBlocks.size(), 1); - const ShaderUniformBlock uniformBlock = activeUniformBlocks.first(); + const ShaderUniformBlock uniformBlock = activeUniformBlocks.front(); QCOMPARE(uniformBlock.m_activeUniformsCount, 1); QCOMPARE(uniformBlock.m_name, QStringLiteral("ColorArray")); @@ -998,7 +998,7 @@ private Q_SLOTS: QVERIFY(shaderProgram.link()); // WHEN - QVector<ShaderAttribute> activeAttributes = m_glHelper.programAttributesAndLocations(shaderProgram.programId()); + std::vector<ShaderAttribute> activeAttributes = m_glHelper.programAttributesAndLocations(shaderProgram.programId()); // THEN QCOMPARE(activeAttributes.size(), 2); @@ -1029,7 +1029,7 @@ private Q_SLOTS: QVERIFY(shaderProgram.link()); // WHEN - QVector<ShaderUniform> activeUniforms = m_glHelper.programUniformsAndLocations(shaderProgram.programId()); + std::vector<ShaderUniform> activeUniforms = m_glHelper.programUniformsAndLocations(shaderProgram.programId()); // THEN QCOMPARE(activeUniforms.size(), 4); @@ -1288,7 +1288,7 @@ private Q_SLOTS: GLint location = shaderProgram.uniformLocation(name); // WHEN - const QVector<ShaderUniform> activeUniforms = m_glHelper.programUniformsAndLocations(shaderProgram.programId()); + const std::vector<ShaderUniform> activeUniforms = m_glHelper.programUniformsAndLocations(shaderProgram.programId()); ShaderUniform matchingUniform; for (const ShaderUniform &u : activeUniforms) { if (u.m_location == location) { |