Merge "Fix color change verification in dithering tests" into nougat-cts-dev am:...

am: 84ee6b2620

Change-Id: Icbd6e2e82dd0dda0e28881154e1d0ba2ed24af7e

diff --git a/modules/gles2/functional/es2fDitheringTests.cpp b/modules/gles2/functional/es2fDitheringTests.cpp
index faf9cb0..96d7baa 100644 (file)
--- a/modules/gles2/functional/es2fDitheringTests.cpp
+++ b/modules/gles2/functional/es2fDitheringTests.cpp
@@ -317,11 +317,12 @@ bool DitheringCase::drawAndCheckGradient (const bool isVerticallyIncreasing, con
        {
                const int       increasingDirectionSize = isVerticallyIncreasing ? renderedImg.getHeight() : renderedImg.getWidth();
                const int       constantDirectionSize   = isVerticallyIncreasing ? renderedImg.getWidth() : renderedImg.getHeight();
-               bool            colorHasChanged                 = false;
 
                for (int incrPos = 0; incrPos < increasingDirectionSize; incrPos++)
                {
-                       tcu::RGBA prevConstantDirectionPix;
+                       bool            colorHasChanged                 = false;
+                       tcu::RGBA       prevConstantDirectionPix;
+
                        for (int constPos = 0; constPos < constantDirectionSize; constPos++)
                        {
                                const int                       x               = isVerticallyIncreasing ? constPos : incrPos;

diff --git a/modules/gles3/functional/es3fDitheringTests.cpp b/modules/gles3/functional/es3fDitheringTests.cpp
index ad02947..5e52d9e 100644 (file)
--- a/modules/gles3/functional/es3fDitheringTests.cpp
+++ b/modules/gles3/functional/es3fDitheringTests.cpp
@@ -317,11 +317,12 @@ bool DitheringCase::drawAndCheckGradient (const bool isVerticallyIncreasing, con
        {
                const int       increasingDirectionSize = isVerticallyIncreasing ? renderedImg.getHeight() : renderedImg.getWidth();
                const int       constantDirectionSize   = isVerticallyIncreasing ? renderedImg.getWidth() : renderedImg.getHeight();
-               bool            colorHasChanged                 = false;
 
                for (int incrPos = 0; incrPos < increasingDirectionSize; incrPos++)
                {
-                       tcu::RGBA prevConstantDirectionPix;
+                       bool            colorHasChanged                 = false;
+                       tcu::RGBA       prevConstantDirectionPix;
+
                        for (int constPos = 0; constPos < constantDirectionSize; constPos++)
                        {
                                const int                       x               = isVerticallyIncreasing ? constPos : incrPos;