| commit | 2ecf86e55ecb893cf4d04e16a4ac5b0de6dcf173 | [log] [tgz] |
|---|---|---|
| author | mtklein <mtklein@google.com> | Thu Nov 06 08:06:39 2014 -0800 |
| committer | Commit bot <commit-bot@chromium.org> | Thu Nov 06 08:06:39 2014 -0800 |
| tree | e1f00dc6b6871c026b149e4b447078e87b86546e | |
| parent | 527930fdbbba2a20f98b43821c6b72367e7b2d64 [diff] [blame] |
Revert of Revert of Turn on NVPR 4x MSAA by default when supported in DM and nanobench. (patchset #1 id:1 of https://codereview.chromium.org/693933004/) Reason for revert: Try again with loops overflow fix landed. Original issue's description: > Revert of Turn on NVPR 4x MSAA by default when supported in DM and nanobench. (patchset #2 id:20001 of https://codereview.chromium.org/704563003/) > > Reason for revert: > Timing out on nvpr when drawing conics. Fix will take some thought so reverting for now. > > Original issue's description: > > Turn on NVPR 4x MSAA by default when supported in DM and nanobench. > > > > This brings DM and nanobench's default configs in line with GM's. > > > > BUG=skia: > > > > Committed: https://skia.googlesource.com/skia/+/31f88675718966bbb7f09718b40de10c7e214739 > > TBR=bsalomon@google.com,mtklein@google.com,mtklein@chromium.org > NOTREECHECKS=true > NOTRY=true > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/d5cd4ee5b81b51e43be7ed13f3c0f0f6c1b3fe14 TBR=bsalomon@google.com,mtklein@chromium.org,egdaniel@google.com NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/685923003
diff --git a/include/gpu/gl/GrGLFunctions.h b/include/gpu/gl/GrGLFunctions.h index dd62085..0b7beb6 100644 --- a/include/gpu/gl/GrGLFunctions.h +++ b/include/gpu/gl/GrGLFunctions.h
@@ -22,6 +22,7 @@ kGL_GrGLStandard, kGLES_GrGLStandard, }; +static const int kGrGLStandardCnt = 3; ///////////////////////////////////////////////////////////////////////////////