diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-06-23 10:58:19 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-23 15:42:15 +0000 |
| commit | 91a3e52552c15751aea09b7a8a896e4edd09d42e (patch) | |
| tree | d615cde3a2207d435bc6b1ae750688fa671957a7 /include/gpu | |
| parent | a46969229d6b028f513995303001b659b4dcdc1d (diff) | |
Move mock gpu and caps, add Gr prefix, and create via GrContext::Create
Change-Id: I02427839f78372e337ed717b071c6baaa8ba4450
Reviewed-on: https://skia-review.googlesource.com/20622
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'include/gpu')
| -rw-r--r-- | include/gpu/GrContext.h | 8 | ||||
| -rw-r--r-- | include/gpu/GrTypes.h | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index d107fc6fd6..64c1746078 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -52,11 +52,6 @@ public: static GrContext* Create(GrBackend, GrBackendContext, const GrContextOptions& options); static GrContext* Create(GrBackend, GrBackendContext); - /** - * Only defined in test apps. - */ - static GrContext* CreateMockContext(); - virtual ~GrContext(); sk_sp<GrContextThreadSafeProxy> threadSafeProxy(); @@ -334,9 +329,6 @@ private: GrContext(); // init must be called after the constructor. bool init(GrBackend, GrBackendContext, const GrContextOptions& options); - void initMockContext(); - void initCommon(const GrContextOptions&); - /** * These functions create premul <-> unpremul effects. If the second argument is 'true', they * use the specialized round-trip effects from GrConfigConversionEffect, otherwise they diff --git a/include/gpu/GrTypes.h b/include/gpu/GrTypes.h index 60cccdfd69..a14a8eade1 100644 --- a/include/gpu/GrTypes.h +++ b/include/gpu/GrTypes.h @@ -187,6 +187,7 @@ static inline size_t GrSizeAlignDown(size_t x, uint32_t alignment) { enum GrBackend { kOpenGL_GrBackend, kVulkan_GrBackend, + kMock_GrBackend, kLast_GrBackend = kVulkan_GrBackend }; |