From 360bcc443e0c031299b4d5e8fe7d10e575bee9f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 2 Feb 2023 12:46:12 +0100 Subject: [PATCH] Shaders: don't use std::pair here. --- src/Magnum/Shaders/Test/PhongGLTest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Magnum/Shaders/Test/PhongGLTest.cpp b/src/Magnum/Shaders/Test/PhongGLTest.cpp index 0235649af..b6f27eb75 100644 --- a/src/Magnum/Shaders/Test/PhongGLTest.cpp +++ b/src/Magnum/Shaders/Test/PhongGLTest.cpp @@ -689,7 +689,7 @@ const struct { Color3 specularColor, lightSpecularColor; Float intensity; Float range; - Containers::Array> picks; + Containers::Array> picks; } RenderLightsData[] { {"directional", "light-directional.tga", {1.0f, -1.5f, 0.5f, 0.0f}, Color3{1.0f}, Color3{1.0f}, @@ -3610,10 +3610,10 @@ template void PhongGLTest::renderLights() { /* Analytical output check. Comment this out when image comparison fails for easier debugging. */ for(const auto& pick: data.picks) { - CORRADE_ITERATION(pick.first); + CORRADE_ITERATION(pick.first()); CORRADE_COMPARE_WITH( - image.pixels()[pick.first.y()][pick.first.x()].xyz(), - pick.second, TestSuite::Compare::around(0x010101_rgb)); + image.pixels()[pick.first().y()][pick.first().x()].xyz(), + pick.second(), TestSuite::Compare::around(0x010101_rgb)); } if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) ||