Revert "SkSL CPP and H backends no longer emitted in non-dev builds"
This reverts commit bc6fb279fe9714947ecd1fadcff22ef84785c349.
Reason for revert: maybe breaking Chrome roll
Original change's description:
> SkSL CPP and H backends no longer emitted in non-dev builds
>
> As these backends are never used at runtime, it's pointless to include
> them in the Skia binaries. We still include them in GR_TEST_UTILS mode
> to support unit tests.
>
> Change-Id: I9ec9cc9300b74c501985656323ec894008255a70
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/311454
> Commit-Queue: Brian Osman <brianosman@google.com>
> Reviewed-by: John Stiles <johnstiles@google.com>
> Reviewed-by: Brian Osman <brianosman@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Change-Id: Ic3d871e2b17a41d3f5902674d1233517ad358f45
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/312079
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
diff --git a/src/sksl/SkSLCPPCodeGenerator.cpp b/src/sksl/SkSLCPPCodeGenerator.cpp
index d21afa5..5244a91 100644
--- a/src/sksl/SkSLCPPCodeGenerator.cpp
+++ b/src/sksl/SkSLCPPCodeGenerator.cpp
@@ -15,8 +15,6 @@
#include <algorithm>
-#if defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS)
-
namespace SkSL {
static bool needs_uniform_var(const Variable& var) {
@@ -1415,5 +1413,3 @@
}
} // namespace SkSL
-
-#endif // defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS)
diff --git a/src/sksl/SkSLCPPCodeGenerator.h b/src/sksl/SkSLCPPCodeGenerator.h
index 4a6c19e..4973f21 100644
--- a/src/sksl/SkSLCPPCodeGenerator.h
+++ b/src/sksl/SkSLCPPCodeGenerator.h
@@ -13,8 +13,6 @@
#include <set>
-#if defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS)
-
namespace SkSL {
class CPPCodeGenerator : public GLSLCodeGenerator {
@@ -147,6 +145,4 @@
} // namespace SkSL
-#endif // defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS)
-
-#endif // SKSL_CPPCODEGENERATOR
+#endif
diff --git a/src/sksl/SkSLCPPUniformCTypes.cpp b/src/sksl/SkSLCPPUniformCTypes.cpp
index b36ae1e..74146d7 100644
--- a/src/sksl/SkSLCPPUniformCTypes.cpp
+++ b/src/sksl/SkSLCPPUniformCTypes.cpp
@@ -11,8 +11,6 @@
#include <vector>
-#if defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS)
-
namespace SkSL {
/////////////////////////
@@ -234,5 +232,3 @@
}
} // namespace SkSL
-
-#endif // defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS)
diff --git a/src/sksl/SkSLCPPUniformCTypes.h b/src/sksl/SkSLCPPUniformCTypes.h
index 076dda3..a838aa5 100644
--- a/src/sksl/SkSLCPPUniformCTypes.h
+++ b/src/sksl/SkSLCPPUniformCTypes.h
@@ -13,8 +13,6 @@
#include "src/sksl/ir/SkSLType.h"
#include "src/sksl/ir/SkSLVariable.h"
-#if defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS)
-
namespace SkSL {
// This uses templates to define dirtyExpression(), saveState() and setUniform(). Each template can
@@ -132,6 +130,4 @@
} // namespace SkSL
-#endif // defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS)
-
#endif // SkSLUniformCTypes_DEFINED
diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
index 68ff703..5dec066 100644
--- a/src/sksl/SkSLCompiler.cpp
+++ b/src/sksl/SkSLCompiler.cpp
@@ -1771,7 +1771,6 @@
return result;
}
-#if defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS)
bool Compiler::toCPP(Program& program, String name, OutputStream& out) {
if (!this->optimize(program)) {
return false;
@@ -1793,9 +1792,8 @@
fSource = nullptr;
return result;
}
-#endif // defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS)
-#endif // defined(SKSL_STANDALONE) || SK_SUPPORT_GPU
+#endif
#if !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU
bool Compiler::toPipelineStage(Program& program, PipelineStageArgs* outArgs) {
diff --git a/src/sksl/SkSLCompiler.h b/src/sksl/SkSLCompiler.h
index 1681f75..9828768 100644
--- a/src/sksl/SkSLCompiler.h
+++ b/src/sksl/SkSLCompiler.h
@@ -140,11 +140,9 @@
bool toMetal(Program& program, String* out);
-#if defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS)
bool toCPP(Program& program, String name, OutputStream& out);
bool toH(Program& program, String name, OutputStream& out);
-#endif
std::unique_ptr<ByteCode> toByteCode(Program& program);
diff --git a/src/sksl/SkSLHCodeGenerator.cpp b/src/sksl/SkSLHCodeGenerator.cpp
index 012b302..8af06c5 100644
--- a/src/sksl/SkSLHCodeGenerator.cpp
+++ b/src/sksl/SkSLHCodeGenerator.cpp
@@ -19,8 +19,6 @@
#include <set>
-#if defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS)
-
namespace SkSL {
HCodeGenerator::HCodeGenerator(const Context* context, const Program* program,
@@ -385,5 +383,3 @@
}
} // namespace SkSL
-
-#endif // defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS)
diff --git a/src/sksl/SkSLHCodeGenerator.h b/src/sksl/SkSLHCodeGenerator.h
index 6e9bf42..03ab038 100644
--- a/src/sksl/SkSLHCodeGenerator.h
+++ b/src/sksl/SkSLHCodeGenerator.h
@@ -15,8 +15,6 @@
#include <cctype>
-#if defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS)
-
constexpr const char* kFragmentProcessorHeader =
R"(
/**************************************************************************************************
@@ -85,6 +83,4 @@
} // namespace SkSL
-#endif // defined(SKSL_STANDALONE) || defined(GR_TEST_UTILS)
-
-#endif // SKSL_HCODEGENERATOR
+#endif
