1 files changed, 16 insertions, 4 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index c36e2e8604..0bd4435118 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -1888,11 +1888,17 @@ bool SampleWindow::onHandleChar(SkUnichar uni) {
             this->resetFPS();
             break;
         case 'A':
-            if (gSkUseAnalyticAA.load() && !gSkForceAnalyticAA.load()) {
+            if (!gSkUseAnalyticAA) {
+                gSkUseAnalyticAA = true;
+            } else if (!gSkForceAnalyticAA && !gSkUseDeltaAA) {
                 gSkForceAnalyticAA = true;
-            } else {
-                gSkUseAnalyticAA = !gSkUseAnalyticAA.load();
+            } else if (!gSkUseDeltaAA) {
                 gSkForceAnalyticAA = false;
+                gSkUseDeltaAA = true;
+            } else if (!gSkForceDeltaAA) {
+                gSkForceDeltaAA = true;
+            } else {
+                gSkUseAnalyticAA = gSkForceAnalyticAA = gSkUseDeltaAA = gSkForceDeltaAA = false;
             }
             this->inval(nullptr);
             this->updateTitle();
@@ -2255,7 +2261,13 @@ void SampleWindow::updateTitle() {
         title.prependf("[T%d/%d] ", gSampleWindow->getTiles(), gSampleWindow->getThreads());
     }
 
-    if (gSkUseAnalyticAA) {
+    if (gSkUseDeltaAA) {
+        if (gSkForceDeltaAA) {
+            title.prepend("<FDAA> ");
+        } else {
+            title.prepend("<DAA> ");
+        }
+    } else if (gSkUseAnalyticAA) {
         if (gSkForceAnalyticAA) {
             title.prepend("<FAAA> ");
         } else {