From 7b2391bc06a4cb5db83e3cd13402869fbe8b0bfd Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Thu, 20 Apr 2017 09:14:38 -0400 Subject: [PATCH] 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 Commit-Queue: Brian Osman --- src/gpu/GrContext.cpp | 2 -- 1 file changed, 2 deletions(-) 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 GrContext::createPMToUPMEffect(sk_sp GrContext::createUPMToPMEffect(sk_sp 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 -- 2.7.4