diff options
Diffstat (limited to 'dm/DMGpuSupport.h')
| -rw-r--r-- | dm/DMGpuSupport.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/dm/DMGpuSupport.h b/dm/DMGpuSupport.h index 1ea51d2621..75bfc3b23e 100644 --- a/dm/DMGpuSupport.h +++ b/dm/DMGpuSupport.h @@ -31,13 +31,13 @@ static const bool kGPUDisabled = false; static inline sk_sp<SkSurface> NewGpuSurface( sk_gpu_test::GrContextFactory* grFactory, sk_gpu_test::GrContextFactory::ContextType type, - sk_gpu_test::GrContextFactory::ContextOptions options, + sk_gpu_test::GrContextFactory::ContextOverrides overrides, SkImageInfo info, int samples, bool useDIText) { uint32_t flags = useDIText ? SkSurfaceProps::kUseDeviceIndependentFonts_Flag : 0; SkSurfaceProps props(flags, SkSurfaceProps::kLegacyFontHost_InitType); - return SkSurface::MakeRenderTarget(grFactory->get(type, options), SkBudgeted::kNo, + return SkSurface::MakeRenderTarget(grFactory->get(type, overrides), SkBudgeted::kNo, info, samples, &props); } @@ -63,7 +63,7 @@ public: namespace sk_gpu_test { class GrContextFactory { public: - GrContextFactory() {}; + GrContextFactory() {} explicit GrContextFactory(const GrContextOptions&) {} typedef int ContextType; @@ -80,10 +80,7 @@ public: kNullGL_ContextType = 0, kVulkan_ContextType = 0; static const int kContextTypeCnt = 1; - enum ContextOptions { - kNone_ContextOptions = 0, - kEnableNVPR_ContextOptions = 0x1, - }; + enum class ContextOverrides {}; void destroyContexts() {} void abandonContexts() {} @@ -98,7 +95,7 @@ static const bool kGPUDisabled = true; static inline SkSurface* NewGpuSurface(sk_gpu_test::GrContextFactory*, sk_gpu_test::GrContextFactory::ContextType, - sk_gpu_test::GrContextFactory::ContextOptions, + sk_gpu_test::GrContextFactory::ContextOverrides, SkImageInfo, int, bool) { |