diff options
| author |  bsalomon <bsalomon@google.com> | 2015-12-01 07:58:44 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-01 07:58:44 -0800 |
| commit | a0a024e323ebf73ea4559d4b29f937902703828b (patch) | |
| tree | 1750701851ece8ade9a23444a41e23a5e3b4e097 /tests/GrContextFactoryTest.cpp | |
| parent | cb6cb21cd9d27054810d2c80ef534dcddd615d4b (diff) | |
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
Diffstat (limited to 'tests/GrContextFactoryTest.cpp')
| -rw-r--r-- | tests/GrContextFactoryTest.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
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<GrContextFactory::GLContextType>(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 |