diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-22 03:03:16 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-22 03:03:17 +0200 |
commit | 9a0cbcc53c16e36ac161b04fdd1fe3d843951ed9 (patch) | |
tree | f7a6df4db699251496fd7e9f66f0a9c2a44cbe93 /tests/auto | |
parent | c9610b6891cacb3758dc2312a7b5325e17bfac26 (diff) | |
parent | 9486a8a4b60a678280db2c625064ca78b3aaf489 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I1a1c178055502b1cd37ad1be30dcb2f5409ed7a8
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/render/graphicshelpergl4/tst_graphicshelpergl4.cpp | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/tests/auto/render/graphicshelpergl4/tst_graphicshelpergl4.cpp b/tests/auto/render/graphicshelpergl4/tst_graphicshelpergl4.cpp index 5a96cf116..39bd15021 100644 --- a/tests/auto/render/graphicshelpergl4/tst_graphicshelpergl4.cpp +++ b/tests/auto/render/graphicshelpergl4/tst_graphicshelpergl4.cpp @@ -185,7 +185,7 @@ const QByteArray computeShader = QByteArrayLiteral( " vec4 direction;\n" \ " vec4 color;\n" \ "};\n" \ - "layout (std140, binding = 0) coherent buffer Particles\n" \ + "layout (std140, binding = 6) coherent buffer Particles\n" \ "{\n" \ " ParticleData particles[];\n" \ "} data;\n" \ @@ -508,11 +508,29 @@ private Q_SLOTS: GLint index = m_func->glGetProgramResourceIndex(shaderProgram.programId(), GL_SHADER_STORAGE_BLOCK, "Particles"); + // THEN + GLint binding = -1; + GLenum prop = GL_BUFFER_BINDING; + m_func->glGetProgramResourceiv(shaderProgram.programId(), + GL_SHADER_STORAGE_BLOCK, + index, + 1, &prop, + 4, NULL, &binding); + QCOMPARE(binding, 6); + + // WHEN m_glHelper.bindShaderStorageBlock(shaderProgram.programId(), index, 1); // THEN const GLint error = m_func->glGetError(); QVERIFY(error == 0); + + m_func->glGetProgramResourceiv(shaderProgram.programId(), + GL_SHADER_STORAGE_BLOCK, + index, + 1, &prop, + 4, NULL, &binding); + QCOMPARE(binding, 1); } void bindUniformBlock() @@ -1286,6 +1304,7 @@ private Q_SLOTS: QCOMPARE(block.m_name, QStringLiteral("Particles")); QCOMPARE(block.m_activeVariablesCount, 3); QCOMPARE(block.m_index, 0); + QCOMPARE(block.m_binding, 6); QCOMPARE(block.m_size, (4 + 4 + 4) * 4); } |