Rename enums in GrContextFactory to remove "GL"
Also, remove kNative as a separate context type and instead make it an alias for kGL or kGLES based on OS.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1845923004
Committed: https://skia.googlesource.com/skia/+/2d9c6f81353597aebf5934547e5cba7a872196fb
Review URL: https://codereview.chromium.org/1845923004
diff --git a/dm/DMGpuSupport.h b/dm/DMGpuSupport.h
index 490737f..2352f83 100644
--- a/dm/DMGpuSupport.h
+++ b/dm/DMGpuSupport.h
@@ -30,8 +30,8 @@
static inline sk_sp<SkSurface> NewGpuSurface(
sk_gpu_test::GrContextFactory* grFactory,
- sk_gpu_test::GrContextFactory::GLContextType type,
- sk_gpu_test::GrContextFactory::GLContextOptions options,
+ sk_gpu_test::GrContextFactory::ContextType type,
+ sk_gpu_test::GrContextFactory::ContextOptions options,
SkImageInfo info,
int samples,
bool useDIText) {
@@ -66,20 +66,22 @@
GrContextFactory() {};
explicit GrContextFactory(const GrContextOptions&) {}
- typedef int GLContextType;
+ typedef int ContextType;
- static const GLContextType kANGLE_GLContextType = 0,
- kANGLE_GL_GLContextType = 0,
- kCommandBuffer_GLContextType = 0,
- kDebug_GLContextType = 0,
- kMESA_GLContextType = 0,
- kNVPR_GLContextType = 0,
- kNative_GLContextType = 0,
- kNull_GLContextType = 0;
- static const int kGLContextTypeCnt = 1;
- enum GLContextOptions {
- kNone_GLContextOptions = 0,
- kEnableNVPR_GLContextOptions = 0x1,
+ static const ContextType kANGLE_ContextType = 0,
+ kANGLE_GL_ContextType = 0,
+ kCommandBuffer_ContextType = 0,
+ kDebugGL_ContextType = 0,
+ kMESA_ContextType = 0,
+ kNVPR_ContextType = 0,
+ kNativeGL_ContextType = 0,
+ kGL_ContextType = 0,
+ kGLES_ContextType = 0,
+ kNullGL_ContextType = 0;
+ static const int kContextTypeCnt = 1;
+ enum ContextOptions {
+ kNone_ContextOptions = 0,
+ kEnableNVPR_ContextOptions = 0x1,
};
void destroyContexts() {}
@@ -94,8 +96,8 @@
static const bool kGPUDisabled = true;
static inline SkSurface* NewGpuSurface(sk_gpu_test::GrContextFactory*,
- sk_gpu_test::GrContextFactory::GLContextType,
- sk_gpu_test::GrContextFactory::GLContextOptions,
+ sk_gpu_test::GrContextFactory::ContextType,
+ sk_gpu_test::GrContextFactory::ContextOptions,
SkImageInfo,
int,
bool) {