commit ca107c9b70f9594f88e8c594abde1d96dde55d42
author John Stiles <johnstiles@google.com> Fri Feb 19 09:54:44 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Feb 19 18:09:27 2021 +0000
tree 6a4974e86abf1fab7c4d42a703ce72925a24a91c
parent b2705a1888fdae0093bfb9038a02b983a245866f

Move strictES2Mode method to ProgramConfig.

This will help us migrate code out of IRGenerator.

Change-Id: Id9c70cc4577ed41b2fc5ad26f752caea13a56083
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372437
Auto-Submit: John Stiles <johnstiles@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>

src/sksl/SkSLIRGenerator.h

diff --git a/src/sksl/SkSLIRGenerator.h b/src/sksl/SkSLIRGenerator.h
index 0a9abe7..a4b47a0 100644
--- a/src/sksl/SkSLIRGenerator.h
+++ b/src/sksl/SkSLIRGenerator.h
@@ -280,8 +280,7 @@
     // Runtime effects (and the interpreter, which uses the same CPU runtime) require adherence to
     // the strict rules from The OpenGL ES Shading Language Version 1.00. (Including Appendix A).
     bool strictES2Mode() const {
-        return this->programKind() == ProgramKind::kRuntimeEffect ||
-               this->programKind() == ProgramKind::kGeneric;
+        return fContext.fConfig->strictES2Mode();
     }
 
     Program::Inputs fInputs;

src/sksl/SkSLProgramSettings.h

diff --git a/src/sksl/SkSLProgramSettings.h b/src/sksl/SkSLProgramSettings.h
index ad98888..bc13775 100644
--- a/src/sksl/SkSLProgramSettings.h
+++ b/src/sksl/SkSLProgramSettings.h
@@ -79,6 +79,10 @@
 struct ProgramConfig {
     ProgramKind fKind;
     ProgramSettings fSettings;
+
+    bool strictES2Mode() const {
+        return fKind == ProgramKind::kRuntimeEffect || fKind == ProgramKind::kGeneric;
+    }
 };
 
 }  // namespace SkSL