diff options
| author |  halcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-24 16:04:09 +0000 |
|---|---|---|
| committer | halcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-24 16:04:09 +0000 |
| commit | 68c74884d0da1aa794bb660a37f31f2f9108bc36 (patch) | |
| tree | 15e0fd795d0fd88b28763ae145923c883dae9571 /src/gpu/gl/win | |
| parent | 0ded88d431a1872e21986984f009db2e84f52738 (diff) | |
Revert "Turn NVPR on by default (but off in tools)."
This reverts commit 83d81c96de34950bdd84dc575997a250b685a3d6.
Broke Windows build. Autorevert didn't work.
TBR=bsalomon@google.com,robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true
BUG=skia:2042
Review URL: https://codereview.chromium.org/146863003
git-svn-id: http://skia.googlecode.com/svn/trunk@13169 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/win')
| -rw-r--r-- | src/gpu/gl/win/SkNativeGLContext_win.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gpu/gl/win/SkNativeGLContext_win.cpp b/src/gpu/gl/win/SkNativeGLContext_win.cpp index bae97a780c..17b4e4ad9b 100644 --- a/src/gpu/gl/win/SkNativeGLContext_win.cpp +++ b/src/gpu/gl/win/SkNativeGLContext_win.cpp @@ -86,8 +86,10 @@ const GrGLInterface* SkNativeGLContext::createGLContext() { return NULL; } - // Requesting a Core profile would bar us from using NVPR. So we pass false. - if (!(fGlRenderContext = SkCreateWGLContext(fDeviceContext, 0, false))) { + // We don't want the core profile when using NV path rendering (since + // NV path rendering relies on fixed function calls) + if (!(fGlRenderContext = SkCreateWGLContext(fDeviceContext, 0, + !GR_GL_USE_NV_PATH_RENDERING))) { SkDebugf("Could not create rendering context.\n"); this->destroyGLContext(); return NULL; |