AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Make SkASSERT not break build in constexpr GrSwizzle method on GCC"

Browse Source 
This reverts commit 2935638a1b.

Reason for revert: valgrind errors

Original change's description:
> Make SkASSERT not break build in constexpr GrSwizzle method on GCC
> 
> Change-Id: I042b90e7c405505447662e6d187ca1519efd4743
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221342
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>

TBR=egdaniel@google.com,bsalomon@google.com,brianosman@google.com

Change-Id: I6bc0f8f84212e3ce53f4d2198c4369db7f08ea3f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221537
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Robert Phillips 2019-06-18 11:54:50 +00:00 committed by Skia Commit-Bot
parent 37a59ef1af
commit 27239e456a
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gpu/GrSwizzle.h
View File

@ -117,9 +117,7 @@ constexpr float GrSwizzle::ComponentIndexToFloat(const SkPMColor4f& color, int i
if (idx == CToI('0')) { if (idx == CToI('0')) {
return 1.0f; return 1.0f;
} }
bool failed = true; // Using this var allows SkASSERT() to be used on GCC. SkASSERT(false);
(void)failed; // Otherwise unused in release build.
SkASSERT(!failed);
return -1.0f; return -1.0f;
} }