From 5c00c52fca57b186811090e85e1895c911a39d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 9 Nov 2022 23:36:27 +0100 Subject: [PATCH] DebugTools: fix CompareMaterial to behave properly with layers. The test added in parent commit now passes. --- src/Magnum/DebugTools/CompareMaterial.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Magnum/DebugTools/CompareMaterial.cpp b/src/Magnum/DebugTools/CompareMaterial.cpp index 77e2880cc..1d32b2c80 100644 --- a/src/Magnum/DebugTools/CompareMaterial.cpp +++ b/src/Magnum/DebugTools/CompareMaterial.cpp @@ -174,11 +174,11 @@ TestSuite::ComparisonStatusFlags Comparator::operat arrayAppend(_state->attributes, InPlaceInit, attributeState, inActual, inExpected); ++inActual; ++inExpected; - } else if(actual.attributeName(inActual) < expected.attributeName(inExpected)) { + } else if(actual.attributeName(layer, inActual) < expected.attributeName(layer, inExpected)) { arrayAppend(_state->attributes, InPlaceInit, AttributeState::OnlyInActual, inActual, ~UnsignedInt{}); _state->materialState = Utility::max(_state->materialState, MaterialState::DifferentAttributes); ++inActual; - } else if(actual.attributeName(inActual) > expected.attributeName(inExpected)) { + } else if(actual.attributeName(layer, inActual) > expected.attributeName(layer, inExpected)) { arrayAppend(_state->attributes, InPlaceInit, AttributeState::OnlyInExpected, ~UnsignedInt{}, inExpected); _state->materialState = Utility::max(_state->materialState, MaterialState::DifferentAttributes); ++inExpected;