Revert "Revert "Fixes from sample count change""
This reverts commit 914b285d45717bf8da8f141b41cec098749a6d0e.
Reason for revert: Already have fix for bug, which is quicker than fixing merge conflict
Original change's description:
> Revert "Fixes from sample count change"
>
> This reverts commit f3316224b95e4d3325972552df0d1c046ae73225.
>
> Reason for revert: <INSERT REASONING HERE>
>
> 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: I8e3c95621eb0bc6ea2be24cc4ee67f88239263ed
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/24863
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,caryclark@google.com
Change-Id: I43cb50691885cae8fe8bab1f034eb6a00b77de81
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/24900
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index 766b438..81311a4 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -2138,7 +2138,7 @@
static const int kDefaultSamples[] = {0,1,2,4,8};
int count = SK_ARRAY_COUNT(kDefaultSamples);
for (; count > 0; --count) {
- if (kDefaultSamples[count-i] <= fMaxColorSampleCount) {
+ if (kDefaultSamples[count-1] <= fMaxColorSampleCount) {
break;
}
}