commit f83d0346c06a047fcf2f4dbbd7311c6b626e744a
author Chris Dalton <csmartdalton@google.com> Mon Feb 10 14:19:30 2020 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Feb 10 22:46:45 2020 +0000
tree 0034e1cbe3edb30edf33af448243fa1349a9da1e
parent cb1ba160da8a36563f5f2845be77c014342da76b

Use mixed samples in GrDynamicAtlas

Change-Id: I0871f2e87be857ebf8577b212b318054a2ad84dd
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/269908
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/GrDynamicAtlas.cpp

diff --git a/src/gpu/GrDynamicAtlas.cpp b/src/gpu/GrDynamicAtlas.cpp
index 5cd8a5f..3ba2e8c 100644
--- a/src/gpu/GrDynamicAtlas.cpp
+++ b/src/gpu/GrDynamicAtlas.cpp
@@ -50,8 +50,11 @@
         InternalMultisample internalMultisample, const GrCaps& caps,
         GrSurfaceProxy::UseAllocator useAllocator) {
     GrBackendFormat format = caps.getDefaultBackendFormat(colorType, GrRenderable::kYes);
-    int sampleCount = (InternalMultisample::kYes == internalMultisample) ?
-            caps.internalMultisampleCount(format) : 1;
+
+    int sampleCount = 1;
+    if (!caps.mixedSamplesSupport() && InternalMultisample::kYes == internalMultisample) {
+        sampleCount = caps.internalMultisampleCount(format);
+    }
 
     auto instantiate = [cb = std::move(callback), format, sampleCount](GrResourceProvider* rp) {
         return cb(rp, format, sampleCount);