commit d8ed85101ee77ad2cb0c186a79d197698a75d246
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jan 24 20:49:44 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jan 24 20:49:44 2014 +0000
tree 0de059817c9954a768b85c15a972a5b09b33cb8b
parent 8f2201144945be6693dd4954c2cc89e085f14ef8

Turn NVPR on by default (but off in tools).

BUG=skia:2042

Committed: http://code.google.com/p/skia/source/detail?r=13164

R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/144003006

git-svn-id: http://skia.googlecode.com/svn/trunk@13176 2bbb7eff-a529-9590-31e7-b0007b416f81

tests/GLInterfaceValidation.cpp

diff --git a/tests/GLInterfaceValidation.cpp b/tests/GLInterfaceValidation.cpp
index 37a83df..541af8f 100755
--- a/tests/GLInterfaceValidation.cpp
+++ b/tests/GLInterfaceValidation.cpp
@@ -18,6 +18,16 @@
         // this forces the factory to make the context if it hasn't yet
         factory->get(glCtxType);
         SkGLContextHelper* glCtxHelper = factory->getGLContext(glCtxType);
+
+        // We're supposed to fail the NVPR context type when we the native context that does not
+        // support the NVPR extension.
+        if (GrContextFactory::kNVPR_GLContextType == glCtxType &&
+            NULL != factory->getGLContext(GrContextFactory::kNative_GLContextType) &&
+            !factory->getGLContext(GrContextFactory::kNative_GLContextType)->hasExtension("GL_NV_path_rendering")) {
+            REPORTER_ASSERT(reporter, NULL == glCtxHelper);
+            continue;
+        }
+
         REPORTER_ASSERT(reporter, NULL != glCtxHelper);
         if (NULL != glCtxHelper) {
             const GrGLInterface* interface = glCtxHelper->gl();