diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-11-30 13:25:32 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2021-01-11 14:20:35 +0000 |
| commit | 9424b886d7ad0006b2ae9ce65c31613174bf3ae8 (patch) | |
| tree | 449cb7094c5d32b1e058a0463777f1c3427b28a5 | |
| parent | 8a6b7a377d7cada0f4d98b35d2ac28f7e70aff83 (diff) | |
Clean up use to QVector vs QList
Change-Id: I797f52d7cf4f55b5991448c0498e0b149a3dd7c6
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| -rw-r--r-- | src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp b/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp index 1121c7041..c6fb0437b 100644 --- a/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp +++ b/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp @@ -1484,29 +1484,29 @@ SubmissionContext::ShaderCreationInfo SubmissionContext::createShaderProgram(RHI // Compile shaders const auto &shaderCode = shader->shaderCode(); QShaderBaker b; - QVector<QShaderBaker::GeneratedShader> generatedShaders; + QList<QShaderBaker::GeneratedShader> generatedShaders; #if QT_FEATURE_vulkan if (m_rhi->backend() == QRhi::Vulkan) - generatedShaders.push_back({ QShader::SpirvShader, 100 }); + generatedShaders.emplace_back(QShader::SpirvShader, 100); #endif #ifndef QT_NO_OPENGL if (m_rhi->backend() == QRhi::OpenGLES2) - generatedShaders.push_back({ QShader::GlslShader, glslVersionForFormat(format()) }); + generatedShaders.emplace_back(QShader::GlslShader, glslVersionForFormat(format())); #endif #ifdef Q_OS_WIN if (m_rhi->backend() == QRhi::D3D11) - generatedShaders.push_back({ QShader::HlslShader, QShaderVersion(50) }); + generatedShaders.emplace_back(QShader::HlslShader, QShaderVersion(50)); #endif #ifdef Q_OS_MACOS if (m_rhi->backend() == QRhi::Metal) - generatedShaders.push_back({ QShader::MslShader, QShaderVersion(12) }); + generatedShaders.emplace_back(QShader::MslShader, QShaderVersion(12)); #endif - QVector<QShader::Variant> generatedShaderVariants(generatedShaders.size()); + QList<QShader::Variant> generatedShaderVariants(generatedShaders.size()); b.setGeneratedShaders(generatedShaders); b.setGeneratedShaderVariants(generatedShaderVariants); @@ -1514,7 +1514,7 @@ SubmissionContext::ShaderCreationInfo SubmissionContext::createShaderProgram(RHI // TODO handle caching as QShader does not have a built-in mechanism for that QString logs; bool success = true; - for (int i = QShaderProgram::Vertex; i <= QShaderProgram::Compute; ++i) { + for (size_t i = QShaderProgram::Vertex; i <= QShaderProgram::Compute; ++i) { const QShaderProgram::ShaderType type = static_cast<QShaderProgram::ShaderType>(i); if (!shaderCode.at(i).isEmpty()) { // Note: logs only return the error but not all the shader code |