commit ce06e261e68848ae21cac1052abc16bc07b961bf
author Brian Salomon <bsalomon@google.com> Tue Aug 01 16:23:40 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Aug 01 21:02:18 2017 +0000
tree 60aaef5143ae80b8e4cbdb6e9a913ffcdc1b1c1c
parent 369e8b70eedfd151c7f88e50d7f430f4cda5d57e

Make ProcessorCloneTest more robust, fix matrix conv. onIsEqual

Change-Id: Iddf860b462dcac36f6a7f5b90d4ce4dceed0dd31
Reviewed-on: https://skia-review.googlesource.com/29604
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/effects/GrMatrixConvolutionEffect.cpp

diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
index 9d8e793..030a926 100644
--- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp
+++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
@@ -214,7 +214,7 @@
                    fKernelSize.width() * fKernelSize.height() * sizeof(float)) &&
            fGain == s.gain() &&
            fBias == s.bias() &&
-           fKernelOffset == s.kernelOffset() &&
+           !memcmp(fKernelOffset, s.kernelOffset(), sizeof(fKernelOffset)) &&
            fConvolveAlpha == s.convolveAlpha() &&
            fDomain == s.domain();
 }

tests/ProcessorTest.cpp

diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp
index e2625a7..8354225 100644
--- a/tests/ProcessorTest.cpp
+++ b/tests/ProcessorTest.cpp
@@ -554,6 +554,15 @@
                 !clone->instantiate(context->resourceProvider())) {
                 continue;
             }
+            REPORTER_ASSERT(reporter, !strcmp(fp->name(), clone->name()));
+            REPORTER_ASSERT(reporter, fp->compatibleWithCoverageAsAlpha() ==
+                                      clone->compatibleWithCoverageAsAlpha());
+            REPORTER_ASSERT(reporter, fp->isEqual(*clone));
+            REPORTER_ASSERT(reporter, fp->preservesOpaqueInput() == clone->preservesOpaqueInput());
+            REPORTER_ASSERT(reporter, fp->hasConstantOutputForConstantInput() ==
+                                      clone->hasConstantOutputForConstantInput());
+            REPORTER_ASSERT(reporter, fp->numChildProcessors() == clone->numChildProcessors());
+            REPORTER_ASSERT(reporter, fp->usesLocalCoords() == clone->usesLocalCoords());
             // Draw with original and read back the results.
             test_draw_op(rtc.get(), fp, inputTexture);
             memset(readData1.get(), 0x0, sizeof(GrColor) * kRenderSize * kRenderSize);