Merge "Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat...

am: a03f6ca147

Change-Id: I0b6dace39931d8941f7bd012d636b73eff7097d6

diff --git a/modules/gles31/functional/es31fPrimitiveBoundingBoxTests.cpp b/modules/gles31/functional/es31fPrimitiveBoundingBoxTests.cpp
index 01cefc8..eb655fc 100644 (file)
--- a/modules/gles31/functional/es31fPrimitiveBoundingBoxTests.cpp
+++ b/modules/gles31/functional/es31fPrimitiveBoundingBoxTests.cpp
@@ -2186,13 +2186,16 @@ deUint8 LineRenderCase::checkLineContinuity (const tcu::ConstPixelBufferAccess&
                ++totalPixels;
        }
 
-       if (missedPixels > 0 && --messageLimitCounter >= 0)
+       if (missedPixels > 0)
        {
-               m_testCtx.getLog()
-                       << tcu::TestLog::Message
-                       << "Found non-continuous " << ((advance.x() == 1)  ? ("horizontal") : ("vertical")) << " line near " << begin << ". "
-                       << "Missed pixels: " << missedPixels
-                       << tcu::TestLog::EndMessage;
+               if (--messageLimitCounter >= 0)
+               {
+                       m_testCtx.getLog()
+                               << tcu::TestLog::Message
+                               << "Found non-continuous " << ((advance.x() == 1)  ? ("horizontal") : ("vertical")) << " line near " << begin << ". "
+                               << "Missed pixels: " << missedPixels
+                               << tcu::TestLog::EndMessage;
+               }
                // allow 10% missing pixels for warning
                if (missedPixels <= deRoundFloatToInt32((float)totalPixels * 0.1f))
                        errorMask = SCANRESULT_LINE_CONT_WARN_BIT;