From 5e4c2097648e94146da2ed790764f731659f1ced Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 8 Jul 2022 21:35:16 +0200 Subject: tests: fix a bunch of -Wsign-compare Pick-to: 6.4 6.3 Change-Id: I603612ecd55c8ac92fc28152a3cc0e192b8b67f1 Reviewed-by: Paul Lemire --- tests/auto/render/aspect/tst_aspect.cpp | 10 ++-- tests/auto/render/buffer/tst_buffer.cpp | 10 ++-- .../tst_filterentitybycomponent.cpp | 8 +-- .../framegraphvisitor/tst_framegraphvisitor.cpp | 2 +- .../render/layerfiltering/tst_layerfiltering.cpp | 4 +- .../opengl/glshadermanager/tst_glshadermanager.cpp | 12 ++--- .../gltexturemanager/tst_gltexturemanager.cpp | 2 +- .../graphicshelpergl2/tst_graphicshelpergl2.cpp | 4 +- .../tst_graphicshelpergl3_2.cpp | 6 +-- .../tst_graphicshelpergl3_3.cpp | 6 +-- .../graphicshelpergl4/tst_graphicshelpergl4.cpp | 6 +-- .../tst_materialparametergathererjob.cpp | 40 +++++++------- tests/auto/render/opengl/renderer/tst_renderer.cpp | 14 ++--- .../render/opengl/renderqueue/tst_renderqueue.cpp | 3 +- .../renderviewbuilder/tst_renderviewbuilder.cpp | 62 +++++++++++----------- .../opengl/renderviewutils/tst_renderviewutils.cpp | 3 +- .../tst_pickboundingvolumejob.cpp | 2 +- .../proximityfiltering/tst_proximityfiltering.cpp | 6 +-- tests/auto/render/technique/tst_technique.cpp | 8 +-- tests/auto/render/texture/tst_texture.cpp | 4 +- 20 files changed, 107 insertions(+), 105 deletions(-) diff --git a/tests/auto/render/aspect/tst_aspect.cpp b/tests/auto/render/aspect/tst_aspect.cpp index 5792747f7..7f4b151ae 100644 --- a/tests/auto/render/aspect/tst_aspect.cpp +++ b/tests/auto/render/aspect/tst_aspect.cpp @@ -88,7 +88,7 @@ private Q_SLOTS: 1 + // UpdateLayerEntity 1 + // PickBoundingVolume 1 + // RayCasting - 0 // No skeleton, no scene loading, no geometry, no buffers + 0U // No skeleton, no scene loading, no geometry, no buffers ); // WHEN @@ -102,7 +102,7 @@ private Q_SLOTS: 1 + // UpdateLevelOfDetail 1 + // PickBoundingVolume 1 + // RayCasting - 0 // No skeleton, no scene loading, no geometry, no buffers + 0U // No skeleton, no scene loading, no geometry, no buffers ); // WHEN @@ -122,7 +122,7 @@ private Q_SLOTS: 1 + // UpdateLevelOfDetail 1 + // PickBoundingVolume 1 + // RayCasting - 0 // No skeleton, no scene loading, no geometry, no buffers + 0U // No skeleton, no scene loading, no geometry, no buffers ); // WHEN @@ -140,7 +140,7 @@ private Q_SLOTS: 1 + // UpdateLevelOfDetail 1 + // PickBoundingVolume 1 + // RayCasting - 0 // No skeleton, no scene loading, no geometry, no buffers + 0U // No skeleton, no scene loading, no geometry, no buffers ); // WHEN @@ -157,7 +157,7 @@ private Q_SLOTS: 1 + // UpdateLevelOfDetail 1 + // PickBoundingVolume 1 + // RayCasting - 0 // No skeleton, no scene loading, no geometry, no buffers + 0U // No skeleton, no scene loading, no geometry, no buffers ); } }; diff --git a/tests/auto/render/buffer/tst_buffer.cpp b/tests/auto/render/buffer/tst_buffer.cpp index 03f44c797..1b140209a 100644 --- a/tests/auto/render/buffer/tst_buffer.cpp +++ b/tests/auto/render/buffer/tst_buffer.cpp @@ -37,7 +37,7 @@ private Q_SLOTS: QCOMPARE(renderBuffer.isDirty(), true); QCOMPARE(renderBuffer.usage(), buffer.usage()); QCOMPARE(renderBuffer.data(), buffer.data()); - QCOMPARE(renderBuffer.pendingBufferUpdates().size(), 1); + QCOMPARE(renderBuffer.pendingBufferUpdates().size(), 1U); QCOMPARE(renderBuffer.pendingBufferUpdates().front().offset, -1); } @@ -120,7 +120,7 @@ private Q_SLOTS: simulateInitializationSync(&frontendBuffer, &backendBuffer); // THEN - QCOMPARE(backendBuffer.pendingBufferUpdates().size(), 1); + QCOMPARE(backendBuffer.pendingBufferUpdates().size(), 1U); Qt3DCore::QBufferUpdate fullUpdate = backendBuffer.pendingBufferUpdates().front(); QCOMPARE(fullUpdate.offset, -1); QVERIFY(fullUpdate.data.isEmpty()); @@ -134,7 +134,7 @@ private Q_SLOTS: // THEN QCOMPARE(frontendBuffer.data(), QByteArray("100456789\0")); - QCOMPARE(backendBuffer.pendingBufferUpdates().size(), 1); + QCOMPARE(backendBuffer.pendingBufferUpdates().size(), 1U); fullUpdate = backendBuffer.pendingBufferUpdates().front(); QCOMPARE(fullUpdate.offset, 1); QCOMPARE(fullUpdate.data, QByteArray("00\0")); @@ -189,7 +189,7 @@ private Q_SLOTS: // THEN QCOMPARE(backendBuffer.data(), QByteArrayLiteral("LS9SL")); QVERIFY(backendBuffer.isDirty()); - QCOMPARE(backendBuffer.pendingBufferUpdates().size(), 1); + QCOMPARE(backendBuffer.pendingBufferUpdates().size(), 1U); QCOMPARE(backendBuffer.pendingBufferUpdates().front().offset, -1); backendBuffer.pendingBufferUpdates().clear(); @@ -289,7 +289,7 @@ private Q_SLOTS: renderBuffer.syncFromFrontEnd(&buffer, false); // THEN - QCOMPARE(renderBuffer.pendingBufferUpdates().size(), 2); + QCOMPARE(renderBuffer.pendingBufferUpdates().size(), 2U); QCOMPARE(renderBuffer.pendingBufferUpdates().front().offset, 0); QCOMPARE(renderBuffer.pendingBufferUpdates().front().data, QByteArray("012")); QCOMPARE(renderBuffer.pendingBufferUpdates().back().offset, 3); diff --git a/tests/auto/render/filterentitybycomponent/tst_filterentitybycomponent.cpp b/tests/auto/render/filterentitybycomponent/tst_filterentitybycomponent.cpp index fbca2203d..28b1bf47f 100644 --- a/tests/auto/render/filterentitybycomponent/tst_filterentitybycomponent.cpp +++ b/tests/auto/render/filterentitybycomponent/tst_filterentitybycomponent.cpp @@ -62,7 +62,7 @@ private Q_SLOTS: filterJob.run(); // THEN - QCOMPARE(filterJob.filteredEntities().size(), 2); + QCOMPARE(filterJob.filteredEntities().size(), 2U); QCOMPARE(filterJob.filteredEntities().front()->peerId(), childEntity1->id()); QCOMPARE(filterJob.filteredEntities().back()->peerId(), childEntity2->id()); } @@ -74,7 +74,7 @@ private Q_SLOTS: filterJob.run(); // THEN - QCOMPARE(filterJob.filteredEntities().size(), 1); + QCOMPARE(filterJob.filteredEntities().size(), 1U); QCOMPARE(filterJob.filteredEntities().front()->peerId(), childEntity1->id()); } @@ -85,7 +85,7 @@ private Q_SLOTS: filterJob.run(); // THEN - QCOMPARE(filterJob.filteredEntities().size(), 0); + QCOMPARE(filterJob.filteredEntities().size(), 0U); } { @@ -95,7 +95,7 @@ private Q_SLOTS: filterJob.run(); // THEN - QCOMPARE(filterJob.filteredEntities().size(), 1); + QCOMPARE(filterJob.filteredEntities().size(), 1U); QCOMPARE(filterJob.filteredEntities().front()->peerId(), childEntity3->id()); } } diff --git a/tests/auto/render/framegraphvisitor/tst_framegraphvisitor.cpp b/tests/auto/render/framegraphvisitor/tst_framegraphvisitor.cpp index 4ccdef6bc..48708aef7 100644 --- a/tests/auto/render/framegraphvisitor/tst_framegraphvisitor.cpp +++ b/tests/auto/render/framegraphvisitor/tst_framegraphvisitor.cpp @@ -112,7 +112,7 @@ private Q_SLOTS: const std::vector fgNodes = visitor.traverse(backendFGRoot); // THEN - QCOMPARE(fgNodeIdsPerBranch.size(), fgNodes.size()); + QCOMPARE(size_t(fgNodeIdsPerBranch.size()), fgNodes.size()); for (int i = 0; i < fgNodeIdsPerBranch.size(); ++i) { const BranchIdsAndTypes brandIdsAndTypes = fgNodeIdsPerBranch.at(i); diff --git a/tests/auto/render/layerfiltering/tst_layerfiltering.cpp b/tests/auto/render/layerfiltering/tst_layerfiltering.cpp index a695218eb..92705c8dc 100644 --- a/tests/auto/render/layerfiltering/tst_layerfiltering.cpp +++ b/tests/auto/render/layerfiltering/tst_layerfiltering.cpp @@ -28,8 +28,8 @@ private Q_SLOTS: // THEN QVERIFY(updateEntityLayerJob.manager() == nullptr); QCOMPARE(filterJob.hasLayerFilter(), false); - QCOMPARE(filterJob.filteredEntities().size(), 0); - QCOMPARE(filterJob.layerFilters().size(), 0); + QCOMPARE(filterJob.filteredEntities().size(), 0U); + QCOMPARE(filterJob.layerFilters().size(), 0U); QCOMPARE(frontendLayer.recursive(), false); } diff --git a/tests/auto/render/opengl/glshadermanager/tst_glshadermanager.cpp b/tests/auto/render/opengl/glshadermanager/tst_glshadermanager.cpp index 7ee26ae4e..d0f09b2eb 100644 --- a/tests/auto/render/opengl/glshadermanager/tst_glshadermanager.cpp +++ b/tests/auto/render/opengl/glshadermanager/tst_glshadermanager.cpp @@ -44,7 +44,7 @@ void tst_GLShaderManager::adopt() // THEN QVERIFY(glShader1 != nullptr); std::vector shaderNodeIds = cache.shaderIdsForProgram(glShader1); - QCOMPARE(shaderNodeIds.size(), 1); + QCOMPARE(shaderNodeIds.size(), 1U); QCOMPARE(shaderNodeIds.front(), backendShaderNode1.peerId()); // WHEN @@ -54,7 +54,7 @@ void tst_GLShaderManager::adopt() QCOMPARE(glShader1, glShader2); shaderNodeIds = cache.shaderIdsForProgram(glShader2); - QCOMPARE(shaderNodeIds.size(), 2); + QCOMPARE(shaderNodeIds.size(), 2U); QCOMPARE(shaderNodeIds.front(), backendShaderNode1.peerId()); QCOMPARE(shaderNodeIds.back(), backendShaderNode2.peerId()); } @@ -84,7 +84,7 @@ void tst_GLShaderManager::lookupResource() QVERIFY(glShader1 != nullptr); QCOMPARE(glShader1, glShader2); const std::vector shaderNodeIds = cache.shaderIdsForProgram(glShader1); - QCOMPARE(shaderNodeIds.size(), 2); + QCOMPARE(shaderNodeIds.size(), 2U); QVERIFY(std::find(shaderNodeIds.begin(), shaderNodeIds.end(), frontendShader1.id()) != shaderNodeIds.end()); @@ -117,7 +117,7 @@ void tst_GLShaderManager::abandon() // THEN std::vector shaderNodeIds = cache.shaderIdsForProgram(glShader); QVERIFY(cache.takeAbandonned().empty()); - QCOMPARE(shaderNodeIds.size(), 1); + QCOMPARE(shaderNodeIds.size(), 1U); QCOMPARE(shaderNodeIds.front(), backendShaderNode2.peerId()); // WHEN @@ -125,9 +125,9 @@ void tst_GLShaderManager::abandon() // THEN shaderNodeIds = cache.shaderIdsForProgram(glShader); - QCOMPARE(shaderNodeIds.size(), 0); + QCOMPARE(shaderNodeIds.size(), 0U); const std::vector releasedShaders = cache.takeAbandonned(); - QCOMPARE(releasedShaders.size(), 1); + QCOMPARE(releasedShaders.size(), 1U); QCOMPARE(releasedShaders.front(), glShader); } diff --git a/tests/auto/render/opengl/gltexturemanager/tst_gltexturemanager.cpp b/tests/auto/render/opengl/gltexturemanager/tst_gltexturemanager.cpp index 870f77a29..806e4580f 100644 --- a/tests/auto/render/opengl/gltexturemanager/tst_gltexturemanager.cpp +++ b/tests/auto/render/opengl/gltexturemanager/tst_gltexturemanager.cpp @@ -71,7 +71,7 @@ private Q_SLOTS: t->setImages({img}); // THEN - QCOMPARE(t->images().size(), 1); + QCOMPARE(t->images().size(), 1U); QCOMPARE(t->dirtyFlags(), Qt3DRender::Render::OpenGL::GLTexture::TextureImageData); // WHEN diff --git a/tests/auto/render/opengl/graphicshelpergl2/tst_graphicshelpergl2.cpp b/tests/auto/render/opengl/graphicshelpergl2/tst_graphicshelpergl2.cpp index f194764f5..3c60f6e89 100644 --- a/tests/auto/render/opengl/graphicshelpergl2/tst_graphicshelpergl2.cpp +++ b/tests/auto/render/opengl/graphicshelpergl2/tst_graphicshelpergl2.cpp @@ -705,7 +705,7 @@ private Q_SLOTS: std::vector activeAttributes = m_glHelper.programAttributesAndLocations(shaderProgram.programId()); // THEN - QCOMPARE(activeAttributes.size(), 2); + QCOMPARE(activeAttributes.size(), 2U); std::sort(activeAttributes.begin(), activeAttributes.end(), [] (const ShaderAttribute &a, const ShaderAttribute &b) { return a.m_name < b.m_name; }); const ShaderAttribute attribute1 = activeAttributes.at(0); @@ -736,7 +736,7 @@ private Q_SLOTS: std::vector activeUniforms = m_glHelper.programUniformsAndLocations(shaderProgram.programId()); // THEN - QCOMPARE(activeUniforms.size(), 4); + QCOMPARE(activeUniforms.size(), 4U); std::sort(activeUniforms.begin(), activeUniforms.end(), [] (const ShaderUniform &a, const ShaderUniform &b) { return a.m_name < b.m_name; }); const ShaderUniform uniform1 = activeUniforms.at(0); 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 6b97d2d27..70330a223 100644 --- a/tests/auto/render/opengl/graphicshelpergl3_2/tst_graphicshelpergl3_2.cpp +++ b/tests/auto/render/opengl/graphicshelpergl3_2/tst_graphicshelpergl3_2.cpp @@ -953,7 +953,7 @@ private Q_SLOTS: const std::vector activeUniformBlocks = m_glHelper.programUniformBlocks(shaderProgram.programId()); // THEN - QCOMPARE(activeUniformBlocks.size(), 1); + QCOMPARE(activeUniformBlocks.size(), 1U); const ShaderUniformBlock uniformBlock = activeUniformBlocks.front(); QCOMPARE(uniformBlock.m_activeUniformsCount, 1); @@ -981,7 +981,7 @@ private Q_SLOTS: std::vector activeAttributes = m_glHelper.programAttributesAndLocations(shaderProgram.programId()); // THEN - QCOMPARE(activeAttributes.size(), 2); + QCOMPARE(activeAttributes.size(), 2U); std::sort(activeAttributes.begin(), activeAttributes.end(), [] (const ShaderAttribute &a, const ShaderAttribute &b) { return a.m_name < b.m_name; }); const ShaderAttribute attribute1 = activeAttributes.at(0); @@ -1012,7 +1012,7 @@ private Q_SLOTS: std::vector activeUniforms = m_glHelper.programUniformsAndLocations(shaderProgram.programId()); // THEN - QCOMPARE(activeUniforms.size(), 4); + QCOMPARE(activeUniforms.size(), 4U); std::sort(activeUniforms.begin(), activeUniforms.end(), [] (const ShaderUniform &a, const ShaderUniform &b) { return a.m_name < b.m_name; }); const ShaderUniform uniform1 = activeUniforms.at(0); diff --git a/tests/auto/render/opengl/graphicshelpergl3_3/tst_graphicshelpergl3_3.cpp b/tests/auto/render/opengl/graphicshelpergl3_3/tst_graphicshelpergl3_3.cpp index 71e085b21..18d3aa803 100644 --- a/tests/auto/render/opengl/graphicshelpergl3_3/tst_graphicshelpergl3_3.cpp +++ b/tests/auto/render/opengl/graphicshelpergl3_3/tst_graphicshelpergl3_3.cpp @@ -1051,7 +1051,7 @@ private Q_SLOTS: const std::vector activeUniformBlocks = m_glHelper.programUniformBlocks(shaderProgram.programId()); // THEN - QCOMPARE(activeUniformBlocks.size(), 1); + QCOMPARE(activeUniformBlocks.size(), 1U); const ShaderUniformBlock uniformBlock = activeUniformBlocks.front(); QCOMPARE(uniformBlock.m_activeUniformsCount, 1); @@ -1079,7 +1079,7 @@ private Q_SLOTS: std::vector activeAttributes = m_glHelper.programAttributesAndLocations(shaderProgram.programId()); // THEN - QCOMPARE(activeAttributes.size(), 2); + QCOMPARE(activeAttributes.size(), 2U); std::sort(activeAttributes.begin(), activeAttributes.end(), [] (const ShaderAttribute &a, const ShaderAttribute &b) { return a.m_name < b.m_name; }); const ShaderAttribute attribute1 = activeAttributes.at(0); @@ -1110,7 +1110,7 @@ private Q_SLOTS: std::vector activeUniforms = m_glHelper.programUniformsAndLocations(shaderProgram.programId()); // THEN - QCOMPARE(activeUniforms.size(), 4); + QCOMPARE(activeUniforms.size(), 4U); std::sort(activeUniforms.begin(), activeUniforms.end(), [] (const ShaderUniform &a, const ShaderUniform &b) { return a.m_name < b.m_name; }); const ShaderUniform uniform1 = activeUniforms.at(0); diff --git a/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp b/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp index 31c732aee..cb7bcbaa8 100644 --- a/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp +++ b/tests/auto/render/opengl/graphicshelpergl4/tst_graphicshelpergl4.cpp @@ -1335,7 +1335,7 @@ private Q_SLOTS: const std::vector activeUniformBlocks = m_glHelper.programUniformBlocks(shaderProgram.programId()); // THEN - QCOMPARE(activeUniformBlocks.size(), 1); + QCOMPARE(activeUniformBlocks.size(), 1U); const ShaderUniformBlock uniformBlock = activeUniformBlocks.front(); QCOMPARE(uniformBlock.m_activeUniformsCount, 1); @@ -1358,7 +1358,7 @@ private Q_SLOTS: std::vector activeAttributes = m_glHelper.programAttributesAndLocations(shaderProgram.programId()); // THEN - QCOMPARE(activeAttributes.size(), 2); + QCOMPARE(activeAttributes.size(), 2U); std::sort(activeAttributes.begin(), activeAttributes.end(), [] (const ShaderAttribute &a, const ShaderAttribute &b) { return a.m_location < b.m_location; }); const ShaderAttribute attribute1 = activeAttributes.at(0); @@ -1389,7 +1389,7 @@ private Q_SLOTS: std::vector activeUniforms = m_glHelper.programUniformsAndLocations(shaderProgram.programId()); // THEN - QCOMPARE(activeUniforms.size(), 4); + QCOMPARE(activeUniforms.size(), 4U); std::sort(activeUniforms.begin(), activeUniforms.end(), [] (const ShaderUniform &a, const ShaderUniform &b) { return a.m_location < b.m_location; }); const ShaderUniform uniform1 = activeUniforms.at(0); diff --git a/tests/auto/render/opengl/materialparametergathererjob/tst_materialparametergathererjob.cpp b/tests/auto/render/opengl/materialparametergathererjob/tst_materialparametergathererjob.cpp index 8ae8ef35b..a5cb05e43 100644 --- a/tests/auto/render/opengl/materialparametergathererjob/tst_materialparametergathererjob.cpp +++ b/tests/auto/render/opengl/materialparametergathererjob/tst_materialparametergathererjob.cpp @@ -212,7 +212,7 @@ private Q_SLOTS: testAspect.initializeRenderer(); // THEN - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 0); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 0U); // WHEN gatherer->run(); @@ -232,7 +232,7 @@ private Q_SLOTS: testAspect.initializeRenderer(); // THEN - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); // WHEN gatherer->setHandles(testAspect.nodeManagers()->materialManager()->activeHandles()); @@ -254,7 +254,7 @@ private Q_SLOTS: testAspect.initializeRenderer(); // THEN - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); // WHEN gatherer->setHandles(testAspect.nodeManagers()->materialManager()->activeHandles()); @@ -286,7 +286,7 @@ private Q_SLOTS: testAspect.initializeRenderer(); // THEN - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::TechniqueFilter *backendTechniqueFilter = static_cast(testAspect.nodeManagers()->frameGraphManager()->lookupNode(frameGraphFilter->id())); QVERIFY(backendTechniqueFilter != nullptr); @@ -326,7 +326,7 @@ private Q_SLOTS: testAspect.initializeRenderer(); // THEN - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::TechniqueFilter *backendTechniqueFilter = static_cast(testAspect.nodeManagers()->frameGraphManager()->lookupNode(frameGraphFilter->id())); QVERIFY(backendTechniqueFilter != nullptr); @@ -362,7 +362,7 @@ private Q_SLOTS: testAspect.initializeRenderer(); // THEN - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::TechniqueFilter *backendTechniqueFilter = static_cast(testAspect.nodeManagers()->frameGraphManager()->lookupNode(frameGraphFilter->id())); QVERIFY(backendTechniqueFilter != nullptr); @@ -396,7 +396,7 @@ private Q_SLOTS: testAspect.initializeRenderer(); // THEN - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::RenderPassFilter *backendPassFilter = static_cast(testAspect.nodeManagers()->frameGraphManager()->lookupNode(frameGraphFilter->id())); QVERIFY(backendPassFilter != nullptr); @@ -436,7 +436,7 @@ private Q_SLOTS: testAspect.initializeRenderer(); // THEN - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::RenderPassFilter *backendPassFilter = static_cast(testAspect.nodeManagers()->frameGraphManager()->lookupNode(frameGraphFilter->id())); QVERIFY(backendPassFilter != nullptr); @@ -487,7 +487,7 @@ private Q_SLOTS: Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::TechniqueFilter *backendTechniqueFilter = static_cast(testAspect.nodeManagers()->frameGraphManager()->lookupNode(techniqueFilterFG->id())); Qt3DRender::Render::RenderPassFilter *backendRenderPassFilter = static_cast(testAspect.nodeManagers()->frameGraphManager()->lookupNode(renderPassFG->id())); QVERIFY(backendTechniqueFilter != nullptr); @@ -502,7 +502,7 @@ private Q_SLOTS: QCOMPARE(gatherer->materialToPassAndParameter().size(), 1); const std::vector passParameterData = gatherer->materialToPassAndParameter().begin().value(); - QCOMPARE(passParameterData.size(), 1); + QCOMPARE(passParameterData.size(), 1U); const Qt3DRender::Render::RenderPassParameterData data = passParameterData.front(); @@ -543,7 +543,7 @@ private Q_SLOTS: Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::TechniqueFilter *backendTechniqueFilter = static_cast(testAspect.nodeManagers()->frameGraphManager()->lookupNode(techniqueFilterFG->id())); Qt3DRender::Render::RenderPassFilter *backendRenderPassFilter = static_cast(testAspect.nodeManagers()->frameGraphManager()->lookupNode(renderPassFG->id())); QVERIFY(backendTechniqueFilter != nullptr); @@ -558,7 +558,7 @@ private Q_SLOTS: QCOMPARE(gatherer->materialToPassAndParameter().size(), 1); const std::vector passParameterData = gatherer->materialToPassAndParameter().begin().value(); - QCOMPARE(passParameterData.size(), 1); + QCOMPARE(passParameterData.size(), 1U); const Qt3DRender::Render::RenderPassParameterData data = passParameterData.front(); @@ -598,7 +598,7 @@ private Q_SLOTS: Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::TechniqueFilter *backendTechniqueFilter = static_cast(testAspect.nodeManagers()->frameGraphManager()->lookupNode(techniqueFilterFG->id())); Qt3DRender::Render::RenderPassFilter *backendRenderPassFilter = static_cast(testAspect.nodeManagers()->frameGraphManager()->lookupNode(renderPassFG->id())); QVERIFY(backendTechniqueFilter != nullptr); @@ -613,7 +613,7 @@ private Q_SLOTS: QCOMPARE(gatherer->materialToPassAndParameter().size(), 1); const std::vector passParameterData = gatherer->materialToPassAndParameter().begin().value(); - QCOMPARE(passParameterData.size(), 1); + QCOMPARE(passParameterData.size(), 1U); const Qt3DRender::Render::RenderPassParameterData data = passParameterData.front(); @@ -652,7 +652,7 @@ private Q_SLOTS: Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::TechniqueFilter *backendTechniqueFilter = static_cast(testAspect.nodeManagers()->frameGraphManager()->lookupNode(techniqueFilterFG->id())); Qt3DRender::Render::RenderPassFilter *backendRenderPassFilter = static_cast(testAspect.nodeManagers()->frameGraphManager()->lookupNode(renderPassFG->id())); QVERIFY(backendTechniqueFilter != nullptr); @@ -667,7 +667,7 @@ private Q_SLOTS: QCOMPARE(gatherer->materialToPassAndParameter().size(), 1); const std::vector passParameterData = gatherer->materialToPassAndParameter().begin().value(); - QCOMPARE(passParameterData.size(), 1); + QCOMPARE(passParameterData.size(), 1U); const Qt3DRender::Render::RenderPassParameterData data = passParameterData.front(); @@ -702,7 +702,7 @@ private Q_SLOTS: Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::TechniqueFilter *backendTechniqueFilter = static_cast(testAspect.nodeManagers()->frameGraphManager()->lookupNode(techniqueFilterFG->id())); Qt3DRender::Render::RenderPassFilter *backendRenderPassFilter = static_cast(testAspect.nodeManagers()->frameGraphManager()->lookupNode(renderPassFG->id())); QVERIFY(backendTechniqueFilter != nullptr); @@ -717,7 +717,7 @@ private Q_SLOTS: QCOMPARE(gatherer->materialToPassAndParameter().size(), 1); const std::vector passParameterData = gatherer->materialToPassAndParameter().begin().value(); - QCOMPARE(passParameterData.size(), 1); + QCOMPARE(passParameterData.size(), 1U); const Qt3DRender::Render::RenderPassParameterData data = passParameterData.front(); @@ -746,7 +746,7 @@ private Q_SLOTS: Qt3DRender::Render::MaterialParameterGathererJobPtr gatherer = testAspect.materialGathererJob(); testAspect.initializeRenderer(); - QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1); + QCOMPARE(testAspect.nodeManagers()->materialManager()->activeHandles().size(), 1U); Qt3DRender::Render::TechniqueFilter *backendTechniqueFilter = static_cast(testAspect.nodeManagers()->frameGraphManager()->lookupNode(techniqueFilterFG->id())); Qt3DRender::Render::RenderPassFilter *backendRenderPassFilter = static_cast(testAspect.nodeManagers()->frameGraphManager()->lookupNode(renderPassFG->id())); QVERIFY(backendTechniqueFilter != nullptr); @@ -761,7 +761,7 @@ private Q_SLOTS: QCOMPARE(gatherer->materialToPassAndParameter().size(), 1); const std::vector passParameterData = gatherer->materialToPassAndParameter().begin().value(); - QCOMPARE(passParameterData.size(), 1); + QCOMPARE(passParameterData.size(), 1U); const Qt3DRender::Render::RenderPassParameterData data = passParameterData.front(); diff --git a/tests/auto/render/opengl/renderer/tst_renderer.cpp b/tests/auto/render/opengl/renderer/tst_renderer.cpp index ac0ab828b..778b6060f 100644 --- a/tests/auto/render/opengl/renderer/tst_renderer.cpp +++ b/tests/auto/render/opengl/renderer/tst_renderer.cpp @@ -56,14 +56,14 @@ private Q_SLOTS: std::vector jobs = renderer.preRenderingJobs(); // THEN - QCOMPARE(jobs.size(), 0); + QCOMPARE(jobs.size(), 0U); // WHEN renderer.m_sendBufferCaptureJob->addRequest({Qt3DCore::QNodeId(), {}}); jobs = renderer.preRenderingJobs(); // THEN - QCOMPARE(jobs.size(), 1); // SendBufferCaptureJob + QCOMPARE(jobs.size(), 1U); // SendBufferCaptureJob // Note: pending render buffer captures are only cleared when the job is run // WHEN @@ -72,7 +72,7 @@ private Q_SLOTS: // THEN QCOMPARE(jobs.size(), - 1); // SendBufferCaptureJob´ + 1U); // SendBufferCaptureJob´ // Note: pending set fence handles are only cleared when the job is run // Properly shutdown command thread @@ -113,16 +113,16 @@ private Q_SLOTS: // NOTE: FilterCompatibleTechniqueJob and ShaderGathererJob cannot run because the context // is not initialized in this test - const int renderViewBuilderMaterialCacheJobCount = 1 + 1; + const uint renderViewBuilderMaterialCacheJobCount = 1 + 1; // syncMaterialGathererJob // n * materialGathererJob (where n depends on the numbers of available threads and the number of materials) - const int layerCacheJobCount = 2; + const uint layerCacheJobCount = 2; // filterEntityByLayerJob, // syncFilterEntityByLayerJob - const int singleRenderViewCommandRebuildJobCount = 1 + Qt3DCore::QAspectJobManager::idealThreadCount(); + const uint singleRenderViewCommandRebuildJobCount = 1 + Qt3DCore::QAspectJobManager::idealThreadCount(); - const int singleRenderViewJobCount = 8 + 1 * Qt3DCore::QAspectJobManager::idealThreadCount(); + const uint singleRenderViewJobCount = 8 + 1 * Qt3DCore::QAspectJobManager::idealThreadCount(); // RenderViewBuilder renderViewJob, // syncRenderViewInitializationJob, // syncFrustumCullingJob, diff --git a/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp b/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp index 289dfb61b..26af34488 100644 --- a/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp +++ b/tests/auto/render/opengl/renderqueue/tst_renderqueue.cpp @@ -174,7 +174,8 @@ void tst_RenderQueue::concurrentQueueAccess() // WHEN unlocked // THEN QVERIFY (renderQueue->isFrameQueueComplete()); - QCOMPARE(renderQueue->nextFrameQueue().size(), renderQueue->targetRenderViewCount()); + QCOMPARE(renderQueue->nextFrameQueue().size(), + size_t(renderQueue->targetRenderViewCount())); // reset queue for next frame renderQueue->reset(); diff --git a/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp b/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp index 4ba7a27d4..058b99e7e 100644 --- a/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp +++ b/tests/auto/render/opengl/renderviewbuilder/tst_renderviewbuilder.cpp @@ -226,8 +226,8 @@ private Q_SLOTS: QVERIFY(renderViewBuilder.syncRenderViewPostCommandUpdateJob().isNull()); QVERIFY(renderViewBuilder.syncRenderViewPostInitializationJob().isNull()); - QCOMPARE(renderViewBuilder.renderViewCommandUpdaterJobs().size(), 0); - QCOMPARE(renderViewBuilder.materialGathererJobs().size(), 0); + QCOMPARE(renderViewBuilder.renderViewCommandUpdaterJobs().size(), 0U); + QCOMPARE(renderViewBuilder.materialGathererJobs().size(), 0U); // WHEN renderViewBuilder.prepareJobs(); @@ -239,9 +239,9 @@ private Q_SLOTS: QVERIFY(renderViewBuilder.filterEntityByLayerJob().isNull()); QVERIFY(renderViewBuilder.syncFilterEntityByLayerJob().isNull()); - QCOMPARE(renderViewBuilder.renderViewCommandUpdaterJobs().size(), Qt3DCore::QAspectJobManager::idealThreadCount()); - QCOMPARE(renderViewBuilder.materialGathererJobs().size(), 0); - QCOMPARE(renderViewBuilder.buildJobHierachy().size(), 8 + 1 * Qt3DCore::QAspectJobManager::idealThreadCount()); + QCOMPARE(renderViewBuilder.renderViewCommandUpdaterJobs().size(), size_t(Qt3DCore::QAspectJobManager::idealThreadCount())); + QCOMPARE(renderViewBuilder.materialGathererJobs().size(), 0U); + QCOMPARE(renderViewBuilder.buildJobHierachy().size(), 8U + 1 * Qt3DCore::QAspectJobManager::idealThreadCount()); } { @@ -257,7 +257,7 @@ private Q_SLOTS: QVERIFY(!renderViewBuilder.syncFilterEntityByLayerJob().isNull()); // mark jobs dirty and recheck - QCOMPARE(renderViewBuilder.buildJobHierachy().size(), 10 + renderViewBuilder.optimalJobCount()); + QCOMPARE(renderViewBuilder.buildJobHierachy().size(), 10U + renderViewBuilder.optimalJobCount()); } { @@ -271,11 +271,11 @@ private Q_SLOTS: QCOMPARE(renderViewBuilder.materialGathererCacheNeedsToBeRebuilt(), true); // We have elementsPerJob = qMax(materialHandles.size() / m_optimalParallelJobCount, 1) // Given we have 2 materials -> 1 element per job -> so we need 2 jobs - QCOMPARE(renderViewBuilder.materialGathererJobs().size(), 2); + QCOMPARE(renderViewBuilder.materialGathererJobs().size(), 2U); QVERIFY(!renderViewBuilder.syncMaterialGathererJob().isNull()); // mark jobs dirty and recheck - QCOMPARE(renderViewBuilder.buildJobHierachy().size(), 13); + QCOMPARE(renderViewBuilder.buildJobHierachy().size(), 13U); } } @@ -303,10 +303,10 @@ private Q_SLOTS: // THEN // Step 1 - QCOMPARE(renderViewBuilder.renderViewJob()->dependencies().size(), 1); // Depends upon skinning palette update + QCOMPARE(renderViewBuilder.renderViewJob()->dependencies().size(), 1U); // Depends upon skinning palette update // Step 2 - QCOMPARE(renderViewBuilder.syncRenderViewPostInitializationJob()->dependencies().size(), 1); + QCOMPARE(renderViewBuilder.syncRenderViewPostInitializationJob()->dependencies().size(), 1U); QCOMPARE(renderViewBuilder.syncRenderViewPostInitializationJob()->dependencies().front().toStrongRef().data(), renderViewBuilder.renderViewJob().data()); @@ -314,21 +314,21 @@ private Q_SLOTS: QVERIFY(renderViewBuilder.filterEntityByLayerJob().isNull()); QVERIFY(renderViewBuilder.syncFilterEntityByLayerJob().isNull()); - QCOMPARE(renderViewBuilder.filterProximityJob()->dependencies().size(), 2); + QCOMPARE(renderViewBuilder.filterProximityJob()->dependencies().size(), 2U); QVERIFY(containsDependency(renderViewBuilder.filterProximityJob()->dependencies(), renderViewBuilder.syncRenderViewPostInitializationJob())); QVERIFY(containsDependency(renderViewBuilder.filterProximityJob()->dependencies(), expandBVJob)); - QCOMPARE(renderViewBuilder.setClearDrawBufferIndexJob()->dependencies().size(), 1); + QCOMPARE(renderViewBuilder.setClearDrawBufferIndexJob()->dependencies().size(), 1U); QCOMPARE(renderViewBuilder.setClearDrawBufferIndexJob()->dependencies().front().toStrongRef().data(), renderViewBuilder.syncRenderViewPostInitializationJob().data()); - QCOMPARE(renderViewBuilder.syncPreFrustumCullingJob()->dependencies().size(), 3); + QCOMPARE(renderViewBuilder.syncPreFrustumCullingJob()->dependencies().size(), 3U); QVERIFY(containsDependency(renderViewBuilder.syncPreFrustumCullingJob()->dependencies(), renderViewBuilder.syncRenderViewPostInitializationJob())); QVERIFY(containsDependency(renderViewBuilder.syncPreFrustumCullingJob()->dependencies(), wordTransformJob)); QVERIFY(containsDependency(renderViewBuilder.syncPreFrustumCullingJob()->dependencies(), testAspect.renderer()->updateShaderDataTransformJob())); // Step 4 - QCOMPARE(renderViewBuilder.frustumCullingJob()->dependencies().size(), 2); + QCOMPARE(renderViewBuilder.frustumCullingJob()->dependencies().size(), 2U); QVERIFY(containsDependency(renderViewBuilder.frustumCullingJob()->dependencies(), renderViewBuilder.syncPreFrustumCullingJob())); QVERIFY(containsDependency(renderViewBuilder.frustumCullingJob()->dependencies(), expandBVJob)); @@ -343,7 +343,7 @@ private Q_SLOTS: // Step 5 for (const auto &renderViewBuilderJob : renderViewBuilder.renderViewCommandUpdaterJobs()) { - QCOMPARE(renderViewBuilderJob->dependencies().size(), 1); + QCOMPARE(renderViewBuilderJob->dependencies().size(), 1U); QCOMPARE(renderViewBuilderJob->dependencies().front().toStrongRef().data(), renderViewBuilder.syncRenderViewPreCommandUpdateJob().data()); } @@ -364,44 +364,44 @@ private Q_SLOTS: // THEN // Step 1 - QCOMPARE(renderViewBuilder.renderViewJob()->dependencies().size(), 1); // Depends upon skinning palette update + QCOMPARE(renderViewBuilder.renderViewJob()->dependencies().size(), 1U); // Depends upon skinning palette update // Step 2 - QCOMPARE(renderViewBuilder.syncRenderViewPostInitializationJob()->dependencies().size(), 1); + QCOMPARE(renderViewBuilder.syncRenderViewPostInitializationJob()->dependencies().size(), 1U); QCOMPARE(renderViewBuilder.syncRenderViewPostInitializationJob()->dependencies().front().toStrongRef().data(), renderViewBuilder.renderViewJob().data()); // Step 3 - QCOMPARE(renderViewBuilder.filterEntityByLayerJob()->dependencies().size(), 3); + QCOMPARE(renderViewBuilder.filterEntityByLayerJob()->dependencies().size(), 3U); QVERIFY(containsDependency(renderViewBuilder.filterEntityByLayerJob()->dependencies(), updateEntityLayerJob)); QVERIFY(containsDependency(renderViewBuilder.filterEntityByLayerJob()->dependencies(), renderViewBuilder.syncRenderViewPostInitializationJob())); QVERIFY(containsDependency(renderViewBuilder.filterEntityByLayerJob()->dependencies(), updateTreeEnabledJob)); - QCOMPARE(renderViewBuilder.syncFilterEntityByLayerJob()->dependencies().size(), 1); + QCOMPARE(renderViewBuilder.syncFilterEntityByLayerJob()->dependencies().size(), 1U); QVERIFY(containsDependency(renderViewBuilder.syncFilterEntityByLayerJob()->dependencies(), renderViewBuilder.filterEntityByLayerJob())); - QCOMPARE(renderViewBuilder.filterProximityJob()->dependencies().size(), 2); + QCOMPARE(renderViewBuilder.filterProximityJob()->dependencies().size(), 2U); QVERIFY(containsDependency(renderViewBuilder.filterProximityJob()->dependencies(), renderViewBuilder.syncRenderViewPostInitializationJob())); QVERIFY(containsDependency(renderViewBuilder.filterProximityJob()->dependencies(), expandBVJob)); - QCOMPARE(renderViewBuilder.setClearDrawBufferIndexJob()->dependencies().size(), 1); + QCOMPARE(renderViewBuilder.setClearDrawBufferIndexJob()->dependencies().size(), 1U); QCOMPARE(renderViewBuilder.setClearDrawBufferIndexJob()->dependencies().front().toStrongRef().data(), renderViewBuilder.syncRenderViewPostInitializationJob().data()); - QCOMPARE(renderViewBuilder.syncPreFrustumCullingJob()->dependencies().size(), 3); + QCOMPARE(renderViewBuilder.syncPreFrustumCullingJob()->dependencies().size(), 3U); QVERIFY(containsDependency(renderViewBuilder.syncPreFrustumCullingJob()->dependencies(), renderViewBuilder.syncRenderViewPostInitializationJob())); QVERIFY(containsDependency(renderViewBuilder.syncPreFrustumCullingJob()->dependencies(), wordTransformJob)); QVERIFY(containsDependency(renderViewBuilder.syncPreFrustumCullingJob()->dependencies(), testAspect.renderer()->updateShaderDataTransformJob())); for (const auto &materialGatherer : renderViewBuilder.materialGathererJobs()) { - QCOMPARE(materialGatherer->dependencies().size(), 3); + QCOMPARE(materialGatherer->dependencies().size(), 3U); QVERIFY(containsDependency(materialGatherer->dependencies(), renderViewBuilder.syncRenderViewPostInitializationJob())); QVERIFY(containsDependency(materialGatherer->dependencies(), testAspect.renderer()->introspectShadersJob())); QVERIFY(containsDependency(materialGatherer->dependencies(), testAspect.renderer()->filterCompatibleTechniqueJob())); } // Step 4 - QCOMPARE(renderViewBuilder.frustumCullingJob()->dependencies().size(), 2); + QCOMPARE(renderViewBuilder.frustumCullingJob()->dependencies().size(), 2U); QVERIFY(containsDependency(renderViewBuilder.frustumCullingJob()->dependencies(), renderViewBuilder.syncPreFrustumCullingJob())); QVERIFY(containsDependency(renderViewBuilder.frustumCullingJob()->dependencies(), expandBVJob)); @@ -415,7 +415,7 @@ private Q_SLOTS: // Step 5 for (const auto &renderViewBuilderJob : renderViewBuilder.renderViewCommandUpdaterJobs()) { - QCOMPARE(renderViewBuilderJob->dependencies().size(), 1); + QCOMPARE(renderViewBuilderJob->dependencies().size(), 1U); QCOMPARE(renderViewBuilderJob->dependencies().front().toStrongRef().data(), renderViewBuilder.syncRenderViewPreCommandUpdateJob().data()); } @@ -466,7 +466,7 @@ private Q_SLOTS: // THEN Qt3DRender::Render::RendererCache *cache = renderer->cache(); - QCOMPARE(cache->gatheredLights.size(), 2); + QCOMPARE(cache->gatheredLights.size(), 2U); QVERIFY(cache->environmentLight != nullptr); } @@ -487,7 +487,7 @@ private Q_SLOTS: // THEN Qt3DRender::Render::RendererCache *cache = renderer->cache(); - QCOMPARE(cache->renderableEntities.size(), 1); + QCOMPARE(cache->renderableEntities.size(), 1U); } void checkComputableEntitiesFilteringExecution() @@ -507,7 +507,7 @@ private Q_SLOTS: // THEN Qt3DRender::Render::RendererCache *cache = renderer->cache(); - QCOMPARE(cache->computeEntities.size(), 1); + QCOMPARE(cache->computeEntities.size(), 1U); } void checkSyncRenderViewInitializationExecution() @@ -650,8 +650,8 @@ private Q_SLOTS: std::vector filteredEntity = renderViewBuilder.filterEntityByLayerJob()->filteredEntities(); // THEN - QCOMPARE(renderableEntity.size(), 200); - QCOMPARE(filteredEntity.size(), 100); + QCOMPARE(renderableEntity.size(), 200U); + QCOMPARE(filteredEntity.size(), 100U); std::sort(renderableEntity.begin(), renderableEntity.end()); @@ -659,7 +659,7 @@ private Q_SLOTS: renderableEntity = Qt3DRender::Render::entitiesInSubset(renderableEntity, filteredEntity); // THEN - QCOMPARE(renderableEntity.size(), 100); + QCOMPARE(renderableEntity.size(), 100U); for (const auto entity : renderableEntity) { QVERIFY(std::find(filteredEntity.begin(), filteredEntity.end(), diff --git a/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.cpp b/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.cpp index 1a7e640b8..e08e4b2c7 100644 --- a/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.cpp +++ b/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.cpp @@ -696,7 +696,8 @@ void tst_RenderViewUtils::topLevelStructValue() blockBuilder.buildActiveUniformNameValueMapStructHelper(backendShaderData, blockName); // THEN - QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), shaderData->buildUniformMapNameIds(blockName).size()); + QCOMPARE(size_t(blockBuilder.activeUniformNamesToValue.count()), + shaderData->buildUniformMapNameIds(blockName).size()); // WHEN Qt3DRender::Render::UniformBlockValueBuilderHash::const_iterator it = blockBuilder.activeUniformNamesToValue.begin(); diff --git a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp index 371a14d04..2927489b0 100644 --- a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp +++ b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp @@ -304,7 +304,7 @@ private Q_SLOTS: const std::vector &results = gatherer.gather(test->frameGraphRoot()); // THEN - QCOMPARE(results.size(), 1); + QCOMPARE(results.size(), 1U); auto vca = results.front(); QCOMPARE(vca.area, QSize(600, 600)); QCOMPARE(vca.cameraId, camera->id()); diff --git a/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp b/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp index 4c2a34986..3447c8b84 100644 --- a/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp +++ b/tests/auto/render/proximityfiltering/tst_proximityfiltering.cpp @@ -83,8 +83,8 @@ private Q_SLOTS: // THEN QCOMPARE(filterJob.hasProximityFilter(), false); - QCOMPARE(filterJob.filteredEntities().size(), 0); - QCOMPARE(filterJob.proximityFilterIds().size(), 0); + QCOMPARE(filterJob.filteredEntities().size(), 0U); + QCOMPARE(filterJob.proximityFilterIds().size(), 0U); QVERIFY(filterJob.manager() == nullptr); } @@ -304,7 +304,7 @@ private Q_SLOTS: // THEN const std::vector &filterEntities = filterJob.filteredEntities(); - QCOMPARE(filterEntities.size(), expectedSelectedEntities.size()); + QCOMPARE(filterEntities.size(), size_t(expectedSelectedEntities.size())); for (int i = 0, m = expectedSelectedEntities.size(); i < m; ++i) QCOMPARE(filterEntities.at(i)->peerId(), expectedSelectedEntities.at(i)); diff --git a/tests/auto/render/technique/tst_technique.cpp b/tests/auto/render/technique/tst_technique.cpp index 454d73481..aa6956ae6 100644 --- a/tests/auto/render/technique/tst_technique.cpp +++ b/tests/auto/render/technique/tst_technique.cpp @@ -115,7 +115,7 @@ private Q_SLOTS: QCOMPARE(backendTechnique.renderPasses().first(), pass.id()); QCOMPARE(backendTechnique.isCompatibleWithRenderer(), false); const std::vector dirtyTechniques = nodeManagers.techniqueManager()->takeDirtyTechniques(); - QCOMPARE(dirtyTechniques.size(), 1); + QCOMPARE(dirtyTechniques.size(), 1U); QCOMPARE(dirtyTechniques.front(), backendTechnique.peerId()); QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::TechniquesDirty); } @@ -173,12 +173,12 @@ private Q_SLOTS: QCOMPARE(backendTechnique.isEnabled(), newValue); QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::TechniquesDirty); renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty); - QCOMPARE(nodeManagers.techniqueManager()->takeDirtyTechniques().size(), 1); + QCOMPARE(nodeManagers.techniqueManager()->takeDirtyTechniques().size(), 1U); } { // WHEN backendTechnique.setCompatibleWithRenderer(true); - QCOMPARE(nodeManagers.techniqueManager()->takeDirtyTechniques().size(), 0); + QCOMPARE(nodeManagers.techniqueManager()->takeDirtyTechniques().size(), 0U); technique.graphicsApiFilter()->setMajorVersion(4); technique.graphicsApiFilter()->setMinorVersion(5); @@ -193,7 +193,7 @@ private Q_SLOTS: QCOMPARE(backendTechnique.isCompatibleWithRenderer(), false); const std::vector dirtyTechniques = nodeManagers.techniqueManager()->takeDirtyTechniques(); - QCOMPARE(dirtyTechniques.size(), 1); + QCOMPARE(dirtyTechniques.size(), 1U); QCOMPARE(dirtyTechniques.front(), backendTechnique.peerId()); QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::TechniquesDirty); diff --git a/tests/auto/render/texture/tst_texture.cpp b/tests/auto/render/texture/tst_texture.cpp index 09514020e..f77bd6dfe 100644 --- a/tests/auto/render/texture/tst_texture.cpp +++ b/tests/auto/render/texture/tst_texture.cpp @@ -436,7 +436,7 @@ void tst_RenderTexture::checkPropertyChanges() // THEN const std::vector pendingUpdates = backend.takePendingTextureDataUpdates(); - QCOMPARE(pendingUpdates.size(), 1); + QCOMPARE(pendingUpdates.size(), 1U); QCOMPARE(pendingUpdates.front(), updateData); QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::TexturesDirty); QVERIFY(backend.dirtyFlags() == Qt3DRender::Render::Texture::DirtyPendingDataUpdates); @@ -489,7 +489,7 @@ void tst_RenderTexture::checkInitialUpdateData() // THEN -> should have received the update as part of the initial data const std::vector pendingUpdates = backend.takePendingTextureDataUpdates(); - QCOMPARE(pendingUpdates.size(), 1); + QCOMPARE(pendingUpdates.size(), 1U); QCOMPARE(pendingUpdates.front(), updateData); QVERIFY(backend.dirtyFlags() & Qt3DRender::Render::Texture::DirtyPendingDataUpdates); } -- cgit v1.2.3