From e1bc7de7c07686b28b00b850e44e0722189f3592 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Wed, 13 Jun 2018 15:01:39 -0400 Subject: Remove SK_MaxSizeT, SK_M{in|ax}U{16|32}, #defines. sed 's/SK_MaxSizeT/SIZE_MAX/g' sed 's/SK_MaxU32/UINT32_MAX/g' sed 's/SK_MaxU16/UINT16_MAX/g' SK_MinU32 and SK_MinU16 were unused Change-Id: I6b6c824df47b05bde7e73b13a58e851a5f63fe0e Reviewed-on: https://skia-review.googlesource.com/134607 Commit-Queue: Hal Canary Reviewed-by: Ben Wagner --- src/gpu/effects/GrPorterDuffXferProcessor.cpp | 2 +- src/gpu/effects/GrXfermodeFragmentProcessor.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gpu/effects') diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp index f4af7a4679..c727670b4f 100644 --- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp +++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp @@ -618,7 +618,7 @@ private: class GLPDLCDXferProcessor : public GrGLSLXferProcessor { public: - GLPDLCDXferProcessor(const GrProcessor&) : fLastAlpha(SK_MaxU32) {} + GLPDLCDXferProcessor(const GrProcessor&) : fLastAlpha(UINT32_MAX) {} ~GLPDLCDXferProcessor() override {} diff --git a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp index 6b764f453a..2ce40c8fa4 100644 --- a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp +++ b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp @@ -395,7 +395,7 @@ private: } void onGetGLSLProcessorKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override { - GR_STATIC_ASSERT(((int)SkBlendMode::kLastMode & SK_MaxU16) == (int)SkBlendMode::kLastMode); + GR_STATIC_ASSERT(((int)SkBlendMode::kLastMode & UINT16_MAX) == (int)SkBlendMode::kLastMode); b->add32((int)fMode | (fChild << 16)); } -- cgit v1.2.3