From 9dcf4907f63f07eb91d2982001ad4d22f109f2fc Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Wed, 21 Mar 2018 16:45:41 -0700 Subject: [PATCH] Fix GPUSurfaceGL includes on macOS (flutter/engine#4844) macOS doesn't include GLES support. --- engine/src/flutter/shell/gpu/gpu_surface_gl.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/engine/src/flutter/shell/gpu/gpu_surface_gl.cc b/engine/src/flutter/shell/gpu/gpu_surface_gl.cc index 34aa74e00c5..f21304c64c9 100644 --- a/engine/src/flutter/shell/gpu/gpu_surface_gl.cc +++ b/engine/src/flutter/shell/gpu/gpu_surface_gl.cc @@ -4,9 +4,11 @@ #include "gpu_surface_gl.h" -#if OS_MACOSX || OS_IOS +#if OS_IOS #include #include +#elif OS_MACOSX +#include #else #include #include @@ -85,7 +87,11 @@ static SkColorType FirstSupportedColorType(GrContext* context, GLenum* format) { *format = (y); \ return (x); \ } +#if OS_MACOSX + RETURN_IF_RENDERABLE(kRGBA_8888_SkColorType, GL_RGBA8); +#else RETURN_IF_RENDERABLE(kRGBA_8888_SkColorType, GL_RGBA8_OES); +#endif RETURN_IF_RENDERABLE(kARGB_4444_SkColorType, GL_RGBA4); RETURN_IF_RENDERABLE(kRGB_565_SkColorType, GL_RGB565); return kUnknown_SkColorType;