diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-21 19:58:22 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-21 19:58:22 +0000 |
| commit | dd4400b5a169dc28e896fffa24f778ca1ead459a (patch) | |
| tree | ac3a16f2ab36ffd465a20a2cc38eb921ea1070b6 /src | |
| parent | d9ba9a05d6f5766fdb1378b6ed84c0659009a8da (diff) | |
Stop printing GL errors for disabling color tables on core profiles on nvidia/windows machines.
Author: bsalomon@google.com
Reviewed By: jvanverth@google.com
Review URL: https://chromiumcodereview.appspot.com/12812023
git-svn-id: http://skia.googlecode.com/svn/trunk@8305 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index e202a14e40..e7d3a946a4 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -422,9 +422,9 @@ void GrGpuGL::onResetContext() { GL_CALL(Disable(GR_GL_COLOR_LOGIC_OP)); GL_CALL(Disable(GR_GL_INDEX_LOGIC_OP)); } - if (this->glCaps().imagingSupport()) { - // This produces a GL error on the windows NVIDIA driver when using a core profile but - // I think that is a driver bug since GL_ARB_imaging is in the extension string. + // The windows NVIDIA driver has GL_ARB_imaging in the extension string when using a core + // profile. This seems like a bug since the core spec removes any mention of GL_ARB_imaging. + if (this->glCaps().imagingSupport() && !this->glCaps().isCoreProfile()) { GL_CALL(Disable(GR_GL_COLOR_TABLE)); } GL_CALL(Disable(GR_GL_POLYGON_OFFSET_FILL)); |