commit 17dc63f01dd684d5abfaf57b524cacbd1e022be1
author Brian Salomon <bsalomon@google.com> Thu Jul 30 13:54:53 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jul 31 14:14:35 2020 +0000
tree ef88f828aef93e11f651906dc88fede7a5c38db1
parent 4470ba1491e555c4bb9d6695eb444b6a1b3a0c6b

Don't define SK_GL when no other GPU backends are enabled

SK_GL must explicitly be defined to enable the GL backend,
e.g. by setting skia_use_gl in gn args.

Change-Id: I61008b5422f4690e6f012609b239cd74e63d9f92
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/306732
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

include/core/SkTypes.h

diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index 4e85364..f99dfdf 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -246,16 +246,7 @@
 #  define SK_SUPPORT_GPU 1
 #endif
 
-/**
- * If GPU is enabled but no GPU backends are enabled then enable GL by default.
- * Traditionally clients have relied on Skia always building with the GL backend
- * and opting in to additional backends. TODO: Require explicit opt in for GL.
- */
-#if SK_SUPPORT_GPU
-#  if !defined(SK_GL) && !defined(SK_VULKAN) && !defined(SK_METAL) && !defined(SK_DAWN) && !defined(SK_DIRECT3D)
-#    define SK_GL
-#  endif
-#else
+#if !SK_SUPPORT_GPU
 #  undef SK_GL
 #  undef SK_VULKAN
 #  undef SK_METAL