From c0110ff1c205d03ca970068beb0c667670343925 Mon Sep 17 00:00:00 2001 From: Mostyn Bramley-Moore Date: Thu, 8 Jun 2017 22:32:47 +0200 Subject: [PATCH] Use nextafter rather than std::nextafter, it's more widely available Bug: skia: Change-Id: Idffe99cde348af83ae4290614c44767fffe36609 Reviewed-on: https://skia-review.googlesource.com/19120 Reviewed-by: Brian Salomon Commit-Queue: Brian Salomon --- src/gpu/gl/GrGLGpu.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 50c0edba45..951f485282 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -1906,14 +1906,8 @@ void GrGLGpu::clear(const GrFixedClip& clip, GrColor color, GrRenderTarget* targ if (this->glCaps().clearToBoundaryValuesIsBroken() && (1 == r || 0 == r) && (1 == g || 0 == g) && (1 == b || 0 == b) && (1 == a || 0 == a)) { -#ifdef SK_BUILD_FOR_ANDROID - // Android doesn't have std::nextafter but has nextafter. static const GrGLfloat safeAlpha1 = nextafter(1.f, 2.f); static const GrGLfloat safeAlpha0 = nextafter(0.f, -1.f); -#else - static const GrGLfloat safeAlpha1 = std::nextafter(1.f, 2.f); - static const GrGLfloat safeAlpha0 = std::nextafter(0.f, -1.f); -#endif a = (1 == a) ? safeAlpha1 : safeAlpha0; } GL_CALL(ClearColor(r, g, b, a));