Roll Skia from 88e54192dc56 to 3475f94816ea (1 revision)

https://skia.googlesource.com/skia.git/+log/88e54192dc56..3475f94816ea

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://skia-autoroll.corp.goog/r/android-next-autoroll
Please CC djsollen@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Test: Presubmit checks will test this change.
Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
Bug: b/187535297
Change-Id: Id519a5e132317e07e8981fe789bd7be679b27ee8

1 files changed, 3 insertions, 3 deletions

diff --git a/src/gpu/GrShaderCaps.cpp b/src/gpu/GrShaderCaps.cpp
index 0beba60276..0e66be659e 100644
--- a/src/gpu/GrShaderCaps.cpp
+++ b/src/gpu/GrShaderCaps.cpp
@@ -182,6 +182,9 @@ void GrShaderCaps::applyOptionsOverrides(const GrContextOptions& options) {
     if (!options.fEnableExperimentalHardwareTessellation) {
         fMaxTessellationSegments = 0;
     }
+    if (options.fReducedShaderVariations) {
+        fReducedShaderMode = true;
+    }
 #if GR_TEST_UTILS
     if (options.fSuppressDualSourceBlending) {
         fDualSourceBlendingSupport = false;
@@ -193,8 +196,5 @@ void GrShaderCaps::applyOptionsOverrides(const GrContextOptions& options) {
         fMaxTessellationSegments = std::min(options.fMaxTessellationSegmentsOverride,
                                             fMaxTessellationSegments);
     }
-    if (options.fReducedShaderVariations) {
-        fReducedShaderMode = true;
-    }
 #endif
 }