diff options
| author |  borenet <borenet@google.com> | 2015-12-09 07:03:51 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-09 07:03:51 -0800 |
| commit | 9d66696f6b1651b52adad1b0202aca013ef7da58 (patch) | |
| tree | c04930e1482d99053002108cb650d03a9f2f96b3 /dm/DMSrcSink.h | |
| parent | f528e0dc7100bf7e55e28d56f1b35b9e72b9f718 (diff) | |
Revert of Make NVPR a GL context option instead of a GL context (patchset #9 id:160001 of https://codereview.chromium.org/1448883002/ )
Reason for revert:
"Could not create surface" on Linux GTX660 bots
Original issue's description:
> Make NVPR a GL context option instead of a GL context
>
> Make NVPR a GL context option instead of a GL context.
> This may enable NVPR to be run with command buffer
> interface.
>
> No functionality change in DM or nanobench. NVPR can
> only be run with normal GL APIs.
>
> BUG=skia:2992
>
> Committed: https://skia.googlesource.com/skia/+/eeebdb538d476c1bfc8b63a946094ca1b505ecd1
>
> Committed: https://skia.googlesource.com/skia/+/64492c43c3faee7ab0f69b1c84e0267616f85e52
TBR=mtklein@google.com,bsalomon@google.com,jvanverth@google.com,scroggo@google.com,kkinnunen@nvidia.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:2992
Review URL: https://codereview.chromium.org/1513703002
Diffstat (limited to 'dm/DMSrcSink.h')
| -rw-r--r-- | dm/DMSrcSink.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h index 6b644ecdf3..e155508ac2 100644 --- a/dm/DMSrcSink.h +++ b/dm/DMSrcSink.h @@ -214,20 +214,18 @@ public: class GPUSink : public Sink { public: - GPUSink(GrContextFactory::GLContextType, GrContextFactory::GLContextOptions, - GrGLStandard, int samples, bool diText, bool threaded); + GPUSink(GrContextFactory::GLContextType, GrGLStandard, int samples, bool diText, bool threaded); Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override; int enclave() const override; const char* fileExtension() const override { return "png"; } SinkFlags flags() const override { return SinkFlags{ SinkFlags::kGPU, SinkFlags::kDirect }; } private: - GrContextFactory::GLContextType fContextType; - GrContextFactory::GLContextOptions fContextOptions; - GrGLStandard fGpuAPI; - int fSampleCount; - bool fUseDIText; - bool fThreaded; + GrContextFactory::GLContextType fContextType; + GrGLStandard fGpuAPI; + int fSampleCount; + bool fUseDIText; + bool fThreaded; }; class PDFSink : public Sink { |