Revert of Make NVPR a GL context option instead of a GL context (patchset #2 id:20001 of https://codereview.chromium.org/1448883002/ )
Reason for revert:
BUG=skia:4609
skbug.com/4609
Seems like GrContextFactory needs to fail when the NVPR option is requested but the driver version isn't sufficiently high.
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
TBR=mtklein@google.com,jvanverth@google.com,kkinnunen@nvidia.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:2992
Review URL: https://codereview.chromium.org/1486153002
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 365ebc2..2861ae8 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -789,26 +789,12 @@
DEFINE_bool(gpuStats, false, "Append GPU stats to the log for each GPU task?");
GPUSink::GPUSink(GrContextFactory::GLContextType ct,
- GrGLStandard gpuAPI,
+ GrGLStandard api,
int samples,
bool diText,
bool threaded)
: fContextType(ct)
- , fContextOptions(GrContextFactory::kNone_GLContextOptions)
- , fGpuAPI(gpuAPI)
- , fSampleCount(samples)
- , fUseDIText(diText)
- , fThreaded(threaded) {}
-
-GPUSink::GPUSink(GrContextFactory::GLContextType ct,
- GrContextFactory::GLContextOptions options,
- GrGLStandard gpuAPI,
- int samples,
- bool diText,
- bool threaded)
- : fContextType(ct)
- , fContextOptions(options)
- , fGpuAPI(gpuAPI)
+ , fGpuAPI(api)
, fSampleCount(samples)
, fUseDIText(diText)
, fThreaded(threaded) {}
@@ -823,21 +809,21 @@
DEFINE_bool(batchClip, false, "Clip each GrBatch to its device bounds for testing.");
Error GPUSink::draw(const Src& src, SkBitmap* dst, SkWStream*, SkString* log) const {
- GrContextOptions grOptions;
+ GrContextOptions options;
if (FLAGS_imm) {
- grOptions.fImmediateMode = true;
+ options.fImmediateMode = true;
}
if (FLAGS_batchClip) {
- grOptions.fClipBatchToBounds = true;
+ options.fClipBatchToBounds = true;
}
- src.modifyGrContextOptions(&grOptions);
+ src.modifyGrContextOptions(&options);
- GrContextFactory factory(grOptions);
+ GrContextFactory factory(options);
const SkISize size = src.size();
const SkImageInfo info =
SkImageInfo::Make(size.width(), size.height(), kN32_SkColorType, kPremul_SkAlphaType);
SkAutoTUnref<SkSurface> surface(
- NewGpuSurface(&factory, fContextType, fContextOptions, fGpuAPI, info, fSampleCount, fUseDIText));
+ NewGpuSurface(&factory, fContextType, fGpuAPI, info, fSampleCount, fUseDIText));
if (!surface) {
return "Could not create a surface.";
}