commit 7b2391bc06a4cb5db83e3cd13402869fbe8b0bfd
author Brian Osman <brianosman@google.com> Thu Apr 20 09:14:38 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Apr 20 13:59:16 2017 +0000
tree 2c7e4e3ba6fab9e32a3905b0b2860d94f6ec4fbe
parent 2c65d5161260f3d45a63dcd92229bd09c8a12d53

Remove incorrect assert

We only need to verify that we've tested the PM conversion if we're about
to use GrConfigConversionEffect. For the else case, no such guarantee is
made, so the assert is wrong.

Bug: chromium:713462
Change-Id: I5ffcc0c5f7de4e9614e9ccd83140acc9ab4f7283
Reviewed-on: https://skia-review.googlesource.com/13962
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 234303f..0edfb29 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -911,8 +911,6 @@
 sk_sp<GrFragmentProcessor> GrContext::createUPMToPMEffect(sk_sp<GrFragmentProcessor> fp,
                                                           bool useConfigConversionEffect) {
     ASSERT_SINGLE_OWNER
-    // We should have already called this->testPMConversionsIfNecessary().
-    SkASSERT(fDidTestPMConversions);
     // We have specialized effects that guarantee round-trip conversion for these formats
     if (useConfigConversionEffect) {
         // We should have already called this->validPMUPMConversionExists() in this case