Move SkSLDefines to src/sksl/
It has no more uses in include/
Change-Id: Iefdf22e5b88625c84c1305a24184503e96561a98
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/753497
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Auto-Submit: Kevin Lubick <kjlubick@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
diff --git a/gn/sksl.gni b/gn/sksl.gni
index 01d969b..aa69acb 100644
--- a/gn/sksl.gni
+++ b/gn/sksl.gni
@@ -38,7 +38,6 @@
# //src/sksl:core_hdrs
# //src/sksl:core_srcs
skia_sksl_sources = [
- "$_include/private/SkSLDefines.h",
"$_include/private/SkSLSampleUsage.h",
"$_include/sksl/SkSLDebugTrace.h",
"$_include/sksl/SkSLVersion.h",
@@ -52,6 +51,7 @@
"$_src/sksl/SkSLConstantFolder.h",
"$_src/sksl/SkSLContext.cpp",
"$_src/sksl/SkSLContext.h",
+ "$_src/sksl/SkSLDefines.h",
"$_src/sksl/SkSLErrorReporter.cpp",
"$_src/sksl/SkSLErrorReporter.h",
"$_src/sksl/SkSLFileOutputStream.h",
diff --git a/include/private/BUILD.bazel b/include/private/BUILD.bazel
index 5a51a32..b757d90 100644
--- a/include/private/BUILD.bazel
+++ b/include/private/BUILD.bazel
@@ -8,7 +8,6 @@
skia_filegroup(
name = "sksl_private_hdrs",
srcs = [
- "SkSLDefines.h",
"SkSLSampleUsage.h",
],
)
diff --git a/public.bzl b/public.bzl
index 2abf6f5..4a529a1 100644
--- a/public.bzl
+++ b/public.bzl
@@ -239,7 +239,6 @@
"include/private/SkIDChangeListener.h",
"include/private/SkJpegMetadataDecoder.h",
"include/private/SkPathRef.h",
- "include/private/SkSLDefines.h",
"include/private/SkSLSampleUsage.h",
"include/private/SkWeakRefCnt.h",
"include/private/SkXmp.h",
@@ -1484,6 +1483,7 @@
"src/sksl/SkSLConstantFolder.h",
"src/sksl/SkSLContext.cpp",
"src/sksl/SkSLContext.h",
+ "src/sksl/SkSLDefines.h",
"src/sksl/SkSLErrorReporter.cpp",
"src/sksl/SkSLErrorReporter.h",
"src/sksl/SkSLFileOutputStream.h",
diff --git a/src/core/SkRuntimeEffect.cpp b/src/core/SkRuntimeEffect.cpp
index 2af405a..3abff32 100644
--- a/src/core/SkRuntimeEffect.cpp
+++ b/src/core/SkRuntimeEffect.cpp
@@ -12,7 +12,6 @@
#include "include/core/SkCapabilities.h"
#include "include/core/SkColorFilter.h"
#include "include/core/SkData.h"
-#include "include/private/SkSLDefines.h"
#include "include/private/base/SkAlign.h"
#include "include/private/base/SkDebug.h"
#include "include/private/base/SkMutex.h"
@@ -43,6 +42,7 @@
#include "src/sksl/SkSLBuiltinTypes.h"
#include "src/sksl/SkSLCompiler.h"
#include "src/sksl/SkSLContext.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLProgramKind.h"
#include "src/sksl/SkSLProgramSettings.h"
#include "src/sksl/SkSLUtil.h"
diff --git a/src/sksl/BUILD.bazel b/src/sksl/BUILD.bazel
index ac321ed..ae6f138 100644
--- a/src/sksl/BUILD.bazel
+++ b/src/sksl/BUILD.bazel
@@ -56,6 +56,7 @@
"SkSLConstantFolder.h",
"SkSLContext.cpp",
"SkSLContext.h",
+ "SkSLDefines.h",
"SkSLErrorReporter.cpp",
"SkSLErrorReporter.h",
"SkSLFileOutputStream.h",
diff --git a/src/sksl/SkSLAnalysis.cpp b/src/sksl/SkSLAnalysis.cpp
index 6bec326..683eeaa 100644
--- a/src/sksl/SkSLAnalysis.cpp
+++ b/src/sksl/SkSLAnalysis.cpp
@@ -9,7 +9,6 @@
#include "include/core/SkSpan.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
#include "include/private/SkSLSampleUsage.h"
#include "include/private/base/SkTArray.h"
#include "src/base/SkEnumBitMask.h"
@@ -18,6 +17,7 @@
#include "src/sksl/SkSLCompiler.h"
#include "src/sksl/SkSLConstantFolder.h"
#include "src/sksl/SkSLContext.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLErrorReporter.h"
#include "src/sksl/SkSLIntrinsicList.h"
#include "src/sksl/SkSLOperator.h"
diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
index 3188ebe..07f105c 100644
--- a/src/sksl/SkSLCompiler.cpp
+++ b/src/sksl/SkSLCompiler.cpp
@@ -7,11 +7,11 @@
#include "src/sksl/SkSLCompiler.h"
-#include "include/private/SkSLDefines.h"
#include "include/private/base/SkDebug.h"
#include "src/core/SkTraceEvent.h"
#include "src/sksl/SkSLAnalysis.h"
#include "src/sksl/SkSLContext.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLInliner.h"
#include "src/sksl/SkSLModuleLoader.h"
#include "src/sksl/SkSLOutputStream.h"
diff --git a/src/sksl/SkSLConstantFolder.h b/src/sksl/SkSLConstantFolder.h
index 761b4fe..c07a33e 100644
--- a/src/sksl/SkSLConstantFolder.h
+++ b/src/sksl/SkSLConstantFolder.h
@@ -10,7 +10,7 @@
#include <memory>
-#include "include/private/SkSLDefines.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLOperator.h"
namespace SkSL {
diff --git a/include/private/SkSLDefines.h b/src/sksl/SkSLDefines.h
similarity index 100%
rename from include/private/SkSLDefines.h
rename to src/sksl/SkSLDefines.h
diff --git a/src/sksl/SkSLInliner.cpp b/src/sksl/SkSLInliner.cpp
index 4cc4da3..f887001 100644
--- a/src/sksl/SkSLInliner.cpp
+++ b/src/sksl/SkSLInliner.cpp
@@ -11,10 +11,10 @@
#include "include/core/SkSpan.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
#include "include/private/base/SkTArray.h"
#include "src/base/SkEnumBitMask.h"
#include "src/sksl/SkSLAnalysis.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLErrorReporter.h"
#include "src/sksl/SkSLOperator.h"
#include "src/sksl/SkSLPosition.h"
diff --git a/src/sksl/SkSLParser.h b/src/sksl/SkSLParser.h
index fba1273..fcb42b6 100644
--- a/src/sksl/SkSLParser.h
+++ b/src/sksl/SkSLParser.h
@@ -9,7 +9,7 @@
#define SKSL_PARSER
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLLexer.h"
#include "src/sksl/SkSLOperator.h"
#include "src/sksl/SkSLPosition.h"
diff --git a/src/sksl/SkSLProgramSettings.h b/src/sksl/SkSLProgramSettings.h
index dd27de0..a3298f8 100644
--- a/src/sksl/SkSLProgramSettings.h
+++ b/src/sksl/SkSLProgramSettings.h
@@ -8,8 +8,8 @@
#ifndef SKSL_PROGRAMSETTINGS
#define SKSL_PROGRAMSETTINGS
-#include "include/private/SkSLDefines.h"
#include "include/sksl/SkSLVersion.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLProgramKind.h"
#include <vector>
diff --git a/src/sksl/SkSLString.cpp b/src/sksl/SkSLString.cpp
index b6d1fde..60c7502 100644
--- a/src/sksl/SkSLString.cpp
+++ b/src/sksl/SkSLString.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "include/private/SkSLDefines.h"
#include "src/base/SkStringView.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLString.h"
#include <cerrno>
diff --git a/src/sksl/SkSLString.h b/src/sksl/SkSLString.h
index 14083a6..61fac7d 100644
--- a/src/sksl/SkSLString.h
+++ b/src/sksl/SkSLString.h
@@ -9,8 +9,8 @@
#define SKSL_STRING
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
#include "src/base/SkNoDestructor.h"
+#include "src/sksl/SkSLDefines.h"
#include <stdarg.h>
#include <string>
diff --git a/src/sksl/analysis/SkSLCanExitWithoutReturningValue.cpp b/src/sksl/analysis/SkSLCanExitWithoutReturningValue.cpp
index 72c4dcc..ec36066 100644
--- a/src/sksl/analysis/SkSLCanExitWithoutReturningValue.cpp
+++ b/src/sksl/analysis/SkSLCanExitWithoutReturningValue.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "include/private/SkSLDefines.h"
#include "src/sksl/SkSLAnalysis.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/analysis/SkSLProgramVisitor.h"
#include "src/sksl/ir/SkSLDoStatement.h"
#include "src/sksl/ir/SkSLForStatement.h"
diff --git a/src/sksl/analysis/SkSLFinalizationChecks.cpp b/src/sksl/analysis/SkSLFinalizationChecks.cpp
index 1b0e7f8..b600848 100644
--- a/src/sksl/analysis/SkSLFinalizationChecks.cpp
+++ b/src/sksl/analysis/SkSLFinalizationChecks.cpp
@@ -7,13 +7,13 @@
#include "include/core/SkSpan.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
#include "src/base/SkEnumBitMask.h"
#include "src/base/SkSafeMath.h"
#include "src/core/SkTHash.h"
#include "src/sksl/SkSLAnalysis.h"
#include "src/sksl/SkSLBuiltinTypes.h"
#include "src/sksl/SkSLContext.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLErrorReporter.h"
#include "src/sksl/SkSLPosition.h"
#include "src/sksl/SkSLProgramSettings.h"
diff --git a/src/sksl/analysis/SkSLGetReturnComplexity.cpp b/src/sksl/analysis/SkSLGetReturnComplexity.cpp
index e1f05a0..aba06e7 100644
--- a/src/sksl/analysis/SkSLGetReturnComplexity.cpp
+++ b/src/sksl/analysis/SkSLGetReturnComplexity.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "include/private/SkSLDefines.h"
#include "src/sksl/SkSLAnalysis.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/analysis/SkSLProgramVisitor.h"
#include "src/sksl/ir/SkSLBlock.h"
#include "src/sksl/ir/SkSLFunctionDefinition.h"
diff --git a/src/sksl/analysis/SkSLIsSameExpressionTree.cpp b/src/sksl/analysis/SkSLIsSameExpressionTree.cpp
index 8158994..dd02335 100644
--- a/src/sksl/analysis/SkSLIsSameExpressionTree.cpp
+++ b/src/sksl/analysis/SkSLIsSameExpressionTree.cpp
@@ -7,9 +7,9 @@
#include "include/core/SkSpan.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
#include "include/private/base/SkTArray.h"
#include "src/sksl/SkSLAnalysis.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLOperator.h"
#include "src/sksl/ir/SkSLConstructor.h"
#include "src/sksl/ir/SkSLExpression.h"
diff --git a/src/sksl/analysis/SkSLReturnsInputAlpha.cpp b/src/sksl/analysis/SkSLReturnsInputAlpha.cpp
index 197179f..68b0982 100644
--- a/src/sksl/analysis/SkSLReturnsInputAlpha.cpp
+++ b/src/sksl/analysis/SkSLReturnsInputAlpha.cpp
@@ -7,9 +7,9 @@
#include "include/core/SkSpan.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
#include "include/private/base/SkTArray.h"
#include "src/sksl/SkSLAnalysis.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/analysis/SkSLProgramUsage.h"
#include "src/sksl/analysis/SkSLProgramVisitor.h"
#include "src/sksl/ir/SkSLConstructor.h"
diff --git a/src/sksl/codegen/SkSLGLSLCodeGenerator.cpp b/src/sksl/codegen/SkSLGLSLCodeGenerator.cpp
index ae4f977..492bb2e 100644
--- a/src/sksl/codegen/SkSLGLSLCodeGenerator.cpp
+++ b/src/sksl/codegen/SkSLGLSLCodeGenerator.cpp
@@ -9,13 +9,13 @@
#include "include/core/SkSpan.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
#include "include/private/base/SkTArray.h"
#include "src/base/SkEnumBitMask.h"
#include "src/base/SkStringView.h"
#include "src/sksl/SkSLAnalysis.h"
#include "src/sksl/SkSLBuiltinTypes.h"
#include "src/sksl/SkSLCompiler.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLErrorReporter.h"
#include "src/sksl/SkSLGLSL.h"
#include "src/sksl/SkSLIntrinsicList.h"
diff --git a/src/sksl/codegen/SkSLMetalCodeGenerator.h b/src/sksl/codegen/SkSLMetalCodeGenerator.h
index f1a082e..fe83518 100644
--- a/src/sksl/codegen/SkSLMetalCodeGenerator.h
+++ b/src/sksl/codegen/SkSLMetalCodeGenerator.h
@@ -9,8 +9,8 @@
#define SKSL_METALCODEGENERATOR
#include "include/core/SkSpan.h"
-#include "include/private/SkSLDefines.h"
#include "src/core/SkTHash.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLStringStream.h"
#include "src/sksl/codegen/SkSLCodeGenerator.h"
#include "src/sksl/ir/SkSLModifierFlags.h"
diff --git a/src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp b/src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp
index 45e7ca5..33d3cf0 100644
--- a/src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp
+++ b/src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp
@@ -11,12 +11,12 @@
#include "include/core/SkSpan.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
#include "include/private/base/SkTArray.h"
#include "src/base/SkEnumBitMask.h"
#include "src/core/SkTHash.h"
#include "src/sksl/SkSLBuiltinTypes.h"
#include "src/sksl/SkSLContext.h" // IWYU pragma: keep
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLIntrinsicList.h"
#include "src/sksl/SkSLOperator.h"
#include "src/sksl/SkSLProgramKind.h"
diff --git a/src/sksl/codegen/SkSLRasterPipelineCodeGenerator.cpp b/src/sksl/codegen/SkSLRasterPipelineCodeGenerator.cpp
index a047adc..9b07909 100644
--- a/src/sksl/codegen/SkSLRasterPipelineCodeGenerator.cpp
+++ b/src/sksl/codegen/SkSLRasterPipelineCodeGenerator.cpp
@@ -9,7 +9,6 @@
#include "include/core/SkPoint.h"
#include "include/core/SkSpan.h"
-#include "include/private/SkSLDefines.h"
#include "include/private/base/SkTArray.h"
#include "include/private/base/SkTo.h"
#include "src/base/SkEnumBitMask.h"
@@ -21,6 +20,7 @@
#include "src/sksl/SkSLCompiler.h"
#include "src/sksl/SkSLConstantFolder.h"
#include "src/sksl/SkSLContext.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLIntrinsicList.h"
#include "src/sksl/SkSLOperator.h"
#include "src/sksl/SkSLPosition.h"
diff --git a/src/sksl/codegen/SkSLSPIRVCodeGenerator.h b/src/sksl/codegen/SkSLSPIRVCodeGenerator.h
index 418f1d7..1f23c0c 100644
--- a/src/sksl/codegen/SkSLSPIRVCodeGenerator.h
+++ b/src/sksl/codegen/SkSLSPIRVCodeGenerator.h
@@ -9,9 +9,9 @@
#define SKSL_SPIRVCODEGENERATOR
#include "include/core/SkSpan.h"
-#include "include/private/SkSLDefines.h"
#include "include/private/base/SkTArray.h"
#include "src/core/SkTHash.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLMemoryLayout.h"
#include "src/sksl/SkSLStringStream.h"
#include "src/sksl/codegen/SkSLCodeGenerator.h"
diff --git a/src/sksl/codegen/SkSLWGSLCodeGenerator.h b/src/sksl/codegen/SkSLWGSLCodeGenerator.h
index 8e016f3..c779974 100644
--- a/src/sksl/codegen/SkSLWGSLCodeGenerator.h
+++ b/src/sksl/codegen/SkSLWGSLCodeGenerator.h
@@ -9,10 +9,10 @@
#define SKSL_WGSLCODEGENERATOR
#include "include/core/SkSpan.h"
-#include "include/private/SkSLDefines.h"
#include "include/private/base/SkTArray.h"
#include "src/base/SkEnumBitMask.h"
#include "src/core/SkTHash.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLMemoryLayout.h"
#include "src/sksl/SkSLOperator.h"
#include "src/sksl/SkSLStringStream.h"
diff --git a/src/sksl/ir/SkSLBlock.h b/src/sksl/ir/SkSLBlock.h
index 5058b44..52c2d03 100644
--- a/src/sksl/ir/SkSLBlock.h
+++ b/src/sksl/ir/SkSLBlock.h
@@ -8,7 +8,7 @@
#ifndef SKSL_BLOCK
#define SKSL_BLOCK
-#include "include/private/SkSLDefines.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLPosition.h"
#include "src/sksl/ir/SkSLIRNode.h"
#include "src/sksl/ir/SkSLStatement.h"
diff --git a/src/sksl/ir/SkSLChildCall.h b/src/sksl/ir/SkSLChildCall.h
index cccecf4..0516b2f 100644
--- a/src/sksl/ir/SkSLChildCall.h
+++ b/src/sksl/ir/SkSLChildCall.h
@@ -8,7 +8,7 @@
#ifndef SKSL_CHILDCALL
#define SKSL_CHILDCALL
-#include "include/private/SkSLDefines.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLPosition.h"
#include "src/sksl/ir/SkSLExpression.h"
#include "src/sksl/ir/SkSLIRNode.h"
diff --git a/src/sksl/ir/SkSLConstructor.h b/src/sksl/ir/SkSLConstructor.h
index 809c4de..4676f1d 100644
--- a/src/sksl/ir/SkSLConstructor.h
+++ b/src/sksl/ir/SkSLConstructor.h
@@ -9,7 +9,7 @@
#define SKSL_CONSTRUCTOR
#include "include/core/SkSpan.h"
-#include "include/private/SkSLDefines.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLPosition.h"
#include "src/sksl/ir/SkSLExpression.h"
#include "src/sksl/ir/SkSLType.h"
diff --git a/src/sksl/ir/SkSLConstructorArray.h b/src/sksl/ir/SkSLConstructorArray.h
index 4369958..3f6c9a7 100644
--- a/src/sksl/ir/SkSLConstructorArray.h
+++ b/src/sksl/ir/SkSLConstructorArray.h
@@ -8,7 +8,7 @@
#ifndef SKSL_CONSTRUCTOR_ARRAY
#define SKSL_CONSTRUCTOR_ARRAY
-#include "include/private/SkSLDefines.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLPosition.h"
#include "src/sksl/ir/SkSLConstructor.h"
#include "src/sksl/ir/SkSLExpression.h"
diff --git a/src/sksl/ir/SkSLConstructorArrayCast.cpp b/src/sksl/ir/SkSLConstructorArrayCast.cpp
index 8f5a9c2..6080144 100644
--- a/src/sksl/ir/SkSLConstructorArrayCast.cpp
+++ b/src/sksl/ir/SkSLConstructorArrayCast.cpp
@@ -9,9 +9,9 @@
#include "include/core/SkSpan.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
#include "src/sksl/SkSLAnalysis.h"
#include "src/sksl/SkSLConstantFolder.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/ir/SkSLConstructorArray.h"
#include "src/sksl/ir/SkSLConstructorCompoundCast.h"
#include "src/sksl/ir/SkSLConstructorScalarCast.h"
diff --git a/src/sksl/ir/SkSLConstructorCompound.h b/src/sksl/ir/SkSLConstructorCompound.h
index cf3bef8..d8f33b3 100644
--- a/src/sksl/ir/SkSLConstructorCompound.h
+++ b/src/sksl/ir/SkSLConstructorCompound.h
@@ -8,7 +8,7 @@
#ifndef SKSL_CONSTRUCTOR_COMPOUND
#define SKSL_CONSTRUCTOR_COMPOUND
-#include "include/private/SkSLDefines.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLPosition.h"
#include "src/sksl/ir/SkSLConstructor.h"
#include "src/sksl/ir/SkSLExpression.h"
diff --git a/src/sksl/ir/SkSLConstructorScalarCast.cpp b/src/sksl/ir/SkSLConstructorScalarCast.cpp
index 5a15df5..ba342ae 100644
--- a/src/sksl/ir/SkSLConstructorScalarCast.cpp
+++ b/src/sksl/ir/SkSLConstructorScalarCast.cpp
@@ -8,10 +8,10 @@
#include "src/sksl/ir/SkSLConstructorScalarCast.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
#include "include/private/base/SkTArray.h"
#include "src/sksl/SkSLConstantFolder.h"
#include "src/sksl/SkSLContext.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLErrorReporter.h"
#include "src/sksl/ir/SkSLLiteral.h"
#include "src/sksl/ir/SkSLType.h"
diff --git a/src/sksl/ir/SkSLConstructorStruct.h b/src/sksl/ir/SkSLConstructorStruct.h
index bf3d79b..d3b0626 100644
--- a/src/sksl/ir/SkSLConstructorStruct.h
+++ b/src/sksl/ir/SkSLConstructorStruct.h
@@ -8,7 +8,7 @@
#ifndef SKSL_CONSTRUCTOR_STRUCT
#define SKSL_CONSTRUCTOR_STRUCT
-#include "include/private/SkSLDefines.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLPosition.h"
#include "src/sksl/ir/SkSLConstructor.h"
#include "src/sksl/ir/SkSLExpression.h"
diff --git a/src/sksl/ir/SkSLExpression.cpp b/src/sksl/ir/SkSLExpression.cpp
index acfdc57..9a6ba54 100644
--- a/src/sksl/ir/SkSLExpression.cpp
+++ b/src/sksl/ir/SkSLExpression.cpp
@@ -7,8 +7,8 @@
#include "src/sksl/ir/SkSLExpression.h"
-#include "include/private/SkSLDefines.h"
#include "src/sksl/SkSLContext.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLErrorReporter.h"
#include "src/sksl/SkSLOperator.h"
diff --git a/src/sksl/ir/SkSLFieldAccess.cpp b/src/sksl/ir/SkSLFieldAccess.cpp
index 4cd9a98..d9b5339 100644
--- a/src/sksl/ir/SkSLFieldAccess.cpp
+++ b/src/sksl/ir/SkSLFieldAccess.cpp
@@ -9,12 +9,12 @@
#include "include/core/SkSpan.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
#include "include/private/base/SkTArray.h"
#include "src/sksl/SkSLAnalysis.h"
#include "src/sksl/SkSLBuiltinTypes.h"
#include "src/sksl/SkSLConstantFolder.h"
#include "src/sksl/SkSLContext.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLErrorReporter.h"
#include "src/sksl/SkSLOperator.h"
#include "src/sksl/ir/SkSLConstructorStruct.h"
diff --git a/src/sksl/ir/SkSLForStatement.cpp b/src/sksl/ir/SkSLForStatement.cpp
index 770a665..e41ede9 100644
--- a/src/sksl/ir/SkSLForStatement.cpp
+++ b/src/sksl/ir/SkSLForStatement.cpp
@@ -8,10 +8,10 @@
#include "src/sksl/ir/SkSLForStatement.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
#include "src/sksl/SkSLAnalysis.h"
#include "src/sksl/SkSLBuiltinTypes.h"
#include "src/sksl/SkSLContext.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLErrorReporter.h"
#include "src/sksl/SkSLProgramSettings.h"
#include "src/sksl/ir/SkSLBlock.h"
diff --git a/src/sksl/ir/SkSLFunctionCall.h b/src/sksl/ir/SkSLFunctionCall.h
index 9b03ffc..10372e9 100644
--- a/src/sksl/ir/SkSLFunctionCall.h
+++ b/src/sksl/ir/SkSLFunctionCall.h
@@ -8,7 +8,7 @@
#ifndef SKSL_FUNCTIONCALL
#define SKSL_FUNCTIONCALL
-#include "include/private/SkSLDefines.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLPosition.h"
#include "src/sksl/ir/SkSLExpression.h"
#include "src/sksl/ir/SkSLIRNode.h"
diff --git a/src/sksl/ir/SkSLFunctionDeclaration.cpp b/src/sksl/ir/SkSLFunctionDeclaration.cpp
index 9d3a0c7..f3aad4b 100644
--- a/src/sksl/ir/SkSLFunctionDeclaration.cpp
+++ b/src/sksl/ir/SkSLFunctionDeclaration.cpp
@@ -9,12 +9,12 @@
#include "include/core/SkSpan.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
#include "include/private/base/SkTo.h"
#include "src/base/SkEnumBitMask.h"
#include "src/base/SkStringView.h"
#include "src/sksl/SkSLBuiltinTypes.h"
#include "src/sksl/SkSLContext.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLErrorReporter.h"
#include "src/sksl/SkSLPosition.h"
#include "src/sksl/SkSLProgramKind.h"
diff --git a/src/sksl/ir/SkSLFunctionDefinition.cpp b/src/sksl/ir/SkSLFunctionDefinition.cpp
index f06084b..2111613 100644
--- a/src/sksl/ir/SkSLFunctionDefinition.cpp
+++ b/src/sksl/ir/SkSLFunctionDefinition.cpp
@@ -9,11 +9,11 @@
#include "include/core/SkSpan.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
#include "src/base/SkSafeMath.h"
#include "src/sksl/SkSLAnalysis.h"
#include "src/sksl/SkSLCompiler.h"
#include "src/sksl/SkSLContext.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLErrorReporter.h"
#include "src/sksl/SkSLOperator.h"
#include "src/sksl/SkSLProgramSettings.h"
diff --git a/src/sksl/ir/SkSLIRHelpers.h b/src/sksl/ir/SkSLIRHelpers.h
index 4c877c1..91ec335 100644
--- a/src/sksl/ir/SkSLIRHelpers.h
+++ b/src/sksl/ir/SkSLIRHelpers.h
@@ -9,10 +9,10 @@
#define SKSL_IRHELPERS
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
#include "src/sksl/SkSLAnalysis.h"
#include "src/sksl/SkSLBuiltinTypes.h"
#include "src/sksl/SkSLContext.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLOperator.h"
#include "src/sksl/SkSLPosition.h"
#include "src/sksl/ir/SkSLBinaryExpression.h"
diff --git a/src/sksl/ir/SkSLIndexExpression.cpp b/src/sksl/ir/SkSLIndexExpression.cpp
index 71ccb94..cc928e5 100644
--- a/src/sksl/ir/SkSLIndexExpression.cpp
+++ b/src/sksl/ir/SkSLIndexExpression.cpp
@@ -8,12 +8,12 @@
#include "src/sksl/ir/SkSLIndexExpression.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
#include "include/private/base/SkTArray.h"
#include "src/sksl/SkSLAnalysis.h"
#include "src/sksl/SkSLBuiltinTypes.h"
#include "src/sksl/SkSLConstantFolder.h"
#include "src/sksl/SkSLContext.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLErrorReporter.h"
#include "src/sksl/SkSLOperator.h"
#include "src/sksl/ir/SkSLConstructorArray.h"
diff --git a/src/sksl/ir/SkSLLiteral.h b/src/sksl/ir/SkSLLiteral.h
index f6f61ca..9a60b16 100644
--- a/src/sksl/ir/SkSLLiteral.h
+++ b/src/sksl/ir/SkSLLiteral.h
@@ -9,9 +9,9 @@
#define SKSL_FLOATLITERAL
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
#include "src/sksl/SkSLBuiltinTypes.h"
#include "src/sksl/SkSLContext.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLPosition.h"
#include "src/sksl/ir/SkSLExpression.h"
#include "src/sksl/ir/SkSLIRNode.h"
diff --git a/src/sksl/ir/SkSLPrefixExpression.cpp b/src/sksl/ir/SkSLPrefixExpression.cpp
index 680fc51..22eb2e1 100644
--- a/src/sksl/ir/SkSLPrefixExpression.cpp
+++ b/src/sksl/ir/SkSLPrefixExpression.cpp
@@ -8,10 +8,10 @@
#include "src/sksl/ir/SkSLPrefixExpression.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
#include "src/sksl/SkSLAnalysis.h"
#include "src/sksl/SkSLConstantFolder.h"
#include "src/sksl/SkSLContext.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLErrorReporter.h"
#include "src/sksl/SkSLOperator.h"
#include "src/sksl/SkSLProgramSettings.h"
diff --git a/src/sksl/ir/SkSLSwitchCase.h b/src/sksl/ir/SkSLSwitchCase.h
index e8c276a..1867732 100644
--- a/src/sksl/ir/SkSLSwitchCase.h
+++ b/src/sksl/ir/SkSLSwitchCase.h
@@ -8,8 +8,8 @@
#ifndef SKSL_SWITCHCASE
#define SKSL_SWITCHCASE
-#include "include/private/SkSLDefines.h"
#include "include/private/base/SkAssert.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLPosition.h"
#include "src/sksl/ir/SkSLIRNode.h"
#include "src/sksl/ir/SkSLStatement.h"
diff --git a/src/sksl/ir/SkSLSwitchStatement.h b/src/sksl/ir/SkSLSwitchStatement.h
index b1a43c2..199db2f 100644
--- a/src/sksl/ir/SkSLSwitchStatement.h
+++ b/src/sksl/ir/SkSLSwitchStatement.h
@@ -8,7 +8,7 @@
#ifndef SKSL_SWITCHSTATEMENT
#define SKSL_SWITCHSTATEMENT
-#include "include/private/SkSLDefines.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLPosition.h"
#include "src/sksl/ir/SkSLExpression.h"
#include "src/sksl/ir/SkSLIRNode.h"
diff --git a/src/sksl/ir/SkSLSwizzle.h b/src/sksl/ir/SkSLSwizzle.h
index a64dc5d..1192ddd 100644
--- a/src/sksl/ir/SkSLSwizzle.h
+++ b/src/sksl/ir/SkSLSwizzle.h
@@ -9,7 +9,7 @@
#define SKSL_SWIZZLE
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLPosition.h"
#include "src/sksl/ir/SkSLExpression.h"
#include "src/sksl/ir/SkSLIRNode.h"
diff --git a/src/sksl/ir/SkSLType.h b/src/sksl/ir/SkSLType.h
index 4f05efe..5ba2c84 100644
--- a/src/sksl/ir/SkSLType.h
+++ b/src/sksl/ir/SkSLType.h
@@ -10,8 +10,8 @@
#include "include/core/SkSpan.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
#include "include/private/base/SkTArray.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLPosition.h"
#include "src/sksl/ir/SkSLIRNode.h"
#include "src/sksl/ir/SkSLLayout.h"
diff --git a/src/sksl/transform/SkSLEliminateEmptyStatements.cpp b/src/sksl/transform/SkSLEliminateEmptyStatements.cpp
index 495ac7a..4f721d7 100644
--- a/src/sksl/transform/SkSLEliminateEmptyStatements.cpp
+++ b/src/sksl/transform/SkSLEliminateEmptyStatements.cpp
@@ -6,8 +6,8 @@
*/
#include "include/core/SkSpan.h"
-#include "include/private/SkSLDefines.h"
#include "src/sksl/SkSLCompiler.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/ir/SkSLBlock.h"
#include "src/sksl/ir/SkSLFunctionDefinition.h"
#include "src/sksl/ir/SkSLProgramElement.h"
diff --git a/src/sksl/transform/SkSLEliminateUnreachableCode.cpp b/src/sksl/transform/SkSLEliminateUnreachableCode.cpp
index 7c5308d..4e106a8 100644
--- a/src/sksl/transform/SkSLEliminateUnreachableCode.cpp
+++ b/src/sksl/transform/SkSLEliminateUnreachableCode.cpp
@@ -7,9 +7,9 @@
#include "include/core/SkSpan.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkSLDefines.h"
#include "include/private/base/SkTArray.h"
#include "src/sksl/SkSLCompiler.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/analysis/SkSLProgramUsage.h"
#include "src/sksl/ir/SkSLFunctionDefinition.h"
#include "src/sksl/ir/SkSLIRNode.h"
diff --git a/src/sksl/transform/SkSLHoistSwitchVarDeclarationsAtTopLevel.cpp b/src/sksl/transform/SkSLHoistSwitchVarDeclarationsAtTopLevel.cpp
index a1b0448..2313ddf 100644
--- a/src/sksl/transform/SkSLHoistSwitchVarDeclarationsAtTopLevel.cpp
+++ b/src/sksl/transform/SkSLHoistSwitchVarDeclarationsAtTopLevel.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "include/private/SkSLDefines.h"
#include "include/private/base/SkAssert.h"
#include "include/private/base/SkTArray.h"
#include "src/sksl/SkSLAnalysis.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/SkSLPosition.h"
#include "src/sksl/ir/SkSLBlock.h"
#include "src/sksl/ir/SkSLExpression.h"
diff --git a/src/sksl/transform/SkSLRewriteIndexedSwizzle.cpp b/src/sksl/transform/SkSLRewriteIndexedSwizzle.cpp
index 5dd22dc..919a863 100644
--- a/src/sksl/transform/SkSLRewriteIndexedSwizzle.cpp
+++ b/src/sksl/transform/SkSLRewriteIndexedSwizzle.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "include/private/SkSLDefines.h"
#include "include/private/base/SkTArray.h"
#include "src/sksl/SkSLBuiltinTypes.h"
#include "src/sksl/SkSLContext.h"
+#include "src/sksl/SkSLDefines.h"
#include "src/sksl/ir/SkSLConstructorCompound.h"
#include "src/sksl/ir/SkSLExpression.h"
#include "src/sksl/ir/SkSLIndexExpression.h"
