diff options
Diffstat (limited to 'dm')
| -rw-r--r-- | dm/DM.cpp | 4 | ||||
| -rw-r--r-- | dm/DMGpuSupport.h | 21 | ||||
| -rw-r--r-- | dm/DMSrcSink.cpp | 2 | ||||
| -rw-r--r-- | dm/DMSrcSink.h | 17 |
4 files changed, 18 insertions, 26 deletions
@@ -70,8 +70,6 @@ DEFINE_int32(shard, 0, "Which shard do I run?"); DEFINE_bool(simpleCodec, false, "Only decode images to native scale"); using namespace DM; -using sk_gpu_test::GrContextFactory; -using sk_gpu_test::GLContext; /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ @@ -1413,7 +1411,7 @@ int dm_main() { namespace skiatest { namespace { typedef void(*TestWithGrContext)(skiatest::Reporter*, GrContext*); -typedef void(*TestWithGrContextAndGLContext)(skiatest::Reporter*, GrContext*, GLContext*); +typedef void(*TestWithGrContextAndGLContext)(skiatest::Reporter*, GrContext*, SkGLContext*); #if SK_SUPPORT_GPU template<typename T> void call_test(T test, skiatest::Reporter* reporter, const GrContextFactory::ContextInfo& context); diff --git a/dm/DMGpuSupport.h b/dm/DMGpuSupport.h index c713244e9d..73adeb0302 100644 --- a/dm/DMGpuSupport.h +++ b/dm/DMGpuSupport.h @@ -28,13 +28,12 @@ namespace DM { static const bool kGPUDisabled = false; -static inline sk_sp<SkSurface> NewGpuSurface( - sk_gpu_test::GrContextFactory* grFactory, - sk_gpu_test::GrContextFactory::GLContextType type, - sk_gpu_test::GrContextFactory::GLContextOptions options, - SkImageInfo info, - int samples, - bool useDIText) { +static inline sk_sp<SkSurface> NewGpuSurface(GrContextFactory* grFactory, + GrContextFactory::GLContextType type, + GrContextFactory::GLContextOptions options, + 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, @@ -60,7 +59,6 @@ public: void dumpGpuStats(SkString*) const {} }; -namespace sk_gpu_test { class GrContextFactory { public: GrContextFactory() {}; @@ -85,15 +83,14 @@ public: void abandonContexts() {} }; -} // namespace sk_gpu_test namespace DM { static const bool kGPUDisabled = true; -static inline SkSurface* NewGpuSurface(sk_gpu_test::GrContextFactory*, - sk_gpu_test::GrContextFactory::GLContextType, - sk_gpu_test::GrContextFactory::GLContextOptions, +static inline SkSurface* NewGpuSurface(GrContextFactory*, + GrContextFactory::GLContextType, + GrContextFactory::GLContextOptions, SkImageInfo, int, bool) { diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index e704f74d03..9e9ba9ed82 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -45,8 +45,6 @@ DEFINE_bool(multiPage, false, "For document-type backends, render the source" " into multiple pages"); DEFINE_bool(RAW_threading, true, "Allow RAW decodes to run on multiple threads?"); -using sk_gpu_test::GrContextFactory; - namespace DM { GMSrc::GMSrc(skiagm::GMRegistry::Factory factory) : fFactory(factory) {} diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h index 3a35acf005..1a56e817ca 100644 --- a/dm/DMSrcSink.h +++ b/dm/DMSrcSink.h @@ -232,8 +232,7 @@ public: class GPUSink : public Sink { public: - GPUSink(sk_gpu_test::GrContextFactory::GLContextType, - sk_gpu_test::GrContextFactory::GLContextOptions, + GPUSink(GrContextFactory::GLContextType, GrContextFactory::GLContextOptions, int samples, bool diText, SkColorType colorType, SkColorProfileType profileType, bool threaded); @@ -242,13 +241,13 @@ public: const char* fileExtension() const override { return "png"; } SinkFlags flags() const override { return SinkFlags{ SinkFlags::kGPU, SinkFlags::kDirect }; } private: - sk_gpu_test::GrContextFactory::GLContextType fContextType; - sk_gpu_test::GrContextFactory::GLContextOptions fContextOptions; - int fSampleCount; - bool fUseDIText; - SkColorType fColorType; - SkColorProfileType fProfileType; - bool fThreaded; + GrContextFactory::GLContextType fContextType; + GrContextFactory::GLContextOptions fContextOptions; + int fSampleCount; + bool fUseDIText; + SkColorType fColorType; + SkColorProfileType fProfileType; + bool fThreaded; }; class PDFSink : public Sink { |