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 --- tests/GrContextFactoryTest.cpp | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'tests/GrContextFactoryTest.cpp') diff --git a/tests/GrContextFactoryTest.cpp b/tests/GrContextFactoryTest.cpp index ad83a344d8..79209c719f 100644 --- a/tests/GrContextFactoryTest.cpp +++ b/tests/GrContextFactoryTest.cpp @@ -10,24 +10,8 @@ #if SK_SUPPORT_GPU #include "GrContextFactory.h" -#include "GrCaps.h" #include "Test.h" -DEF_GPUTEST(GrContextFactoryNVPRContextOptions, reporter, /*factory*/) { - GrContextFactory testFactory; - // Test that if NVPR is possible, caps are in sync. - for (int i = 0; i < GrContextFactory::kGLContextTypeCnt; ++i) { - GrContextFactory::GLContextType glCtxType = static_cast(i); - GrContext* context = testFactory.get(glCtxType, - kNone_GrGLStandard, - GrContextFactory::kEnableNVPR_GLContextOptions); - if (!context) { - continue; - } - REPORTER_ASSERT( - reporter, - context->caps()->shaderCaps()->pathRenderingSupport()); - } -} +// TODO: test GrContextFactory. #endif -- cgit v1.2.3