diff options
author | 2017-07-20 10:57:17 +0000 | |
---|---|---|
committer | 2017-07-20 10:57:30 +0000 | |
commit | 390aaaf403f2e2487c44613e22c4d931c44315fb (patch) | |
tree | 2859d43f10c05f850ce22e09997b8d64433c5e3d /src/gpu/gl | |
parent | e32500f0642df381fd79731df2f7a4a4a71a46e2 (diff) |
Revert "Fixes from sample count change"
This reverts commit f3316224b95e4d3325972552df0d1c046ae73225.
Reason for revert: android vulkan build broken
Original change's description:
> Fixes from sample count change
>
> Re blacklist imagination msaa on Vulkan and fix i->1 bug in GL
>
> Bug: skia:
> Change-Id: I8045565b2064d2ee037ab43b167e6d5d3a59268e
> Reviewed-on: https://skia-review.googlesource.com/24780
> Reviewed-by: Cary Clark <caryclark@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,caryclark@google.com
Change-Id: I076a4226f5725b3d48592402772ca39b64cae478
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/24840
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
Diffstat (limited to 'src/gpu/gl')
-rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 81311a4fba..766b438d2b 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -2138,7 +2138,7 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions, static const int kDefaultSamples[] = {0,1,2,4,8}; int count = SK_ARRAY_COUNT(kDefaultSamples); for (; count > 0; --count) { - if (kDefaultSamples[count-1] <= fMaxColorSampleCount) { + if (kDefaultSamples[count-i] <= fMaxColorSampleCount) { break; } } |