From a0a024e323ebf73ea4559d4b29f937902703828b Mon Sep 17 00:00:00 2001 From: bsalomon Date: Tue, 1 Dec 2015 07:58:44 -0800 Subject: 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 --- bench/nanobench.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'bench/nanobench.h') diff --git a/bench/nanobench.h b/bench/nanobench.h index 2dac30a927..36f5ad5b75 100644 --- a/bench/nanobench.h +++ b/bench/nanobench.h @@ -29,11 +29,9 @@ struct Config { int samples; #if SK_SUPPORT_GPU GrContextFactory::GLContextType ctxType; - GrContextFactory::GLContextOptions ctxOptions; bool useDFText; #else int bogusInt; - int bogusIntOption; bool bogusBool; #endif }; -- cgit v1.2.3