AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
c411429239
skia2/tests/sksl/dslfp/GrDSLFPTest_Ternary.h

47 lines
1.9 KiB
C
Raw Normal View History

Reland "Reland "Implement statements and expressions in DSL C++ code generator."" This is a reland of c412688798e572ac8ca6414a19a48d007500f751 This CL lands the code changes but not the dm test, which is causing link errors. Tests will be relanded as a separate CL, at http://review.skia.org/400097 Original change's description: > Reland "Implement statements and expressions in DSL C++ code generator." > > This is a reland of 16cbfb41dff107ca3388bacf34201311d3c5f14d > > Tests now rely on `shaderDerivativeSupport` and `integerSupport` as > proxies to indicate ES3 support. The SwitchStatement test has been > adjusted to hopefully confuse fewer compilers. > > Original change's description: > > Implement statements and expressions in DSL C++ code generator. > > > > This CL removes the bulk of the existing C++ code generator, especially > > all the complex format-string assembly code. It has been replaced with > > actual DSL code generation. Simple IR can now be successfully translated > > to a working DSL fragment processor. > > > > This CL also adds a simple test harness which is patterned after the > > existing SkSLTest; it renders a pixel, reads it back, and fails the test > > if the result isn't solid green (RGBA=0101). > > > > This CL doesn't implement every feature. Some obvious gaps include: > > - Sampling from children > > - Uniforms/inputs of any kind > > - Function calls of any kind > > > > Change-Id: Ib80c23fe1ba4453f7c3cb43b65f93c5ea0deb709 > > Bug: skia:11854 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/396757 > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > Bug: skia:11854, skia:11891 > Change-Id: I91363e31f34611d15ae350b52d6fc459feeace9c > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399076 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Bug: skia:11854 Bug: skia:11891 Change-Id: Ib1f08256c84d1da2130e0b61356f72435dc0a5a8 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399740 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-04-22 19:05:20 +00:00
Fork CPPCodeGenerator into a DSL-based version. The long term goal is for the DSLCPPCodeGenerator to replace the CPPCodeGenerator entirely, but we will need both to coexist while DSL is still under development. Currently, the DSLCPPCodeGenerator is cloned from CPPCodeGenerator and emits almost exactly the same code (it adds a comment at the top to distinguish its output). Its output will change in followup CLs. This CL also allows skslc to recognize the `_dsl.cpp` output suffix and generate code using DSLCPPCodeGenerator instead of CPPCodeGenerator. This allows test DSL FPs to be created for inspection. Change-Id: If5136279c307ea53a9df3a292caa18344c1eb259 Bug: skia:11854 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/396096 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-13 21:13:03 +00:00
/**************************************************************************************************
Reland "Reland "Implement statements and expressions in DSL C++ code generator."" This is a reland of c412688798e572ac8ca6414a19a48d007500f751 This CL lands the code changes but not the dm test, which is causing link errors. Tests will be relanded as a separate CL, at http://review.skia.org/400097 Original change's description: > Reland "Implement statements and expressions in DSL C++ code generator." > > This is a reland of 16cbfb41dff107ca3388bacf34201311d3c5f14d > > Tests now rely on `shaderDerivativeSupport` and `integerSupport` as > proxies to indicate ES3 support. The SwitchStatement test has been > adjusted to hopefully confuse fewer compilers. > > Original change's description: > > Implement statements and expressions in DSL C++ code generator. > > > > This CL removes the bulk of the existing C++ code generator, especially > > all the complex format-string assembly code. It has been replaced with > > actual DSL code generation. Simple IR can now be successfully translated > > to a working DSL fragment processor. > > > > This CL also adds a simple test harness which is patterned after the > > existing SkSLTest; it renders a pixel, reads it back, and fails the test > > if the result isn't solid green (RGBA=0101). > > > > This CL doesn't implement every feature. Some obvious gaps include: > > - Sampling from children > > - Uniforms/inputs of any kind > > - Function calls of any kind > > > > Change-Id: Ib80c23fe1ba4453f7c3cb43b65f93c5ea0deb709 > > Bug: skia:11854 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/396757 > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > Bug: skia:11854, skia:11891 > Change-Id: I91363e31f34611d15ae350b52d6fc459feeace9c > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399076 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Bug: skia:11854 Bug: skia:11891 Change-Id: Ib1f08256c84d1da2130e0b61356f72435dc0a5a8 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399740 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-04-22 19:05:20 +00:00
*** This file was autogenerated from GrDSLFPTest_Ternary.fp; do not modify.
Fork CPPCodeGenerator into a DSL-based version. The long term goal is for the DSLCPPCodeGenerator to replace the CPPCodeGenerator entirely, but we will need both to coexist while DSL is still under development. Currently, the DSLCPPCodeGenerator is cloned from CPPCodeGenerator and emits almost exactly the same code (it adds a comment at the top to distinguish its output). Its output will change in followup CLs. This CL also allows skslc to recognize the `_dsl.cpp` output suffix and generate code using DSLCPPCodeGenerator instead of CPPCodeGenerator. This allows test DSL FPs to be created for inspection. Change-Id: If5136279c307ea53a9df3a292caa18344c1eb259 Bug: skia:11854 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/396096 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-13 21:13:03 +00:00
**************************************************************************************************/
Reland "Reland "Implement statements and expressions in DSL C++ code generator."" This is a reland of c412688798e572ac8ca6414a19a48d007500f751 This CL lands the code changes but not the dm test, which is causing link errors. Tests will be relanded as a separate CL, at http://review.skia.org/400097 Original change's description: > Reland "Implement statements and expressions in DSL C++ code generator." > > This is a reland of 16cbfb41dff107ca3388bacf34201311d3c5f14d > > Tests now rely on `shaderDerivativeSupport` and `integerSupport` as > proxies to indicate ES3 support. The SwitchStatement test has been > adjusted to hopefully confuse fewer compilers. > > Original change's description: > > Implement statements and expressions in DSL C++ code generator. > > > > This CL removes the bulk of the existing C++ code generator, especially > > all the complex format-string assembly code. It has been replaced with > > actual DSL code generation. Simple IR can now be successfully translated > > to a working DSL fragment processor. > > > > This CL also adds a simple test harness which is patterned after the > > existing SkSLTest; it renders a pixel, reads it back, and fails the test > > if the result isn't solid green (RGBA=0101). > > > > This CL doesn't implement every feature. Some obvious gaps include: > > - Sampling from children > > - Uniforms/inputs of any kind > > - Function calls of any kind > > > > Change-Id: Ib80c23fe1ba4453f7c3cb43b65f93c5ea0deb709 > > Bug: skia:11854 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/396757 > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > Bug: skia:11854, skia:11891 > Change-Id: I91363e31f34611d15ae350b52d6fc459feeace9c > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399076 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Bug: skia:11854 Bug: skia:11891 Change-Id: Ib1f08256c84d1da2130e0b61356f72435dc0a5a8 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399740 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-04-22 19:05:20 +00:00
#ifndef GrDSLFPTest_Ternary_DEFINED
#define GrDSLFPTest_Ternary_DEFINED
Fork CPPCodeGenerator into a DSL-based version. The long term goal is for the DSLCPPCodeGenerator to replace the CPPCodeGenerator entirely, but we will need both to coexist while DSL is still under development. Currently, the DSLCPPCodeGenerator is cloned from CPPCodeGenerator and emits almost exactly the same code (it adds a comment at the top to distinguish its output). Its output will change in followup CLs. This CL also allows skslc to recognize the `_dsl.cpp` output suffix and generate code using DSLCPPCodeGenerator instead of CPPCodeGenerator. This allows test DSL FPs to be created for inspection. Change-Id: If5136279c307ea53a9df3a292caa18344c1eb259 Bug: skia:11854 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/396096 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-13 21:13:03 +00:00
#include "include/core/SkM44.h"
#include "include/core/SkTypes.h"
#include "src/gpu/GrFragmentProcessor.h"
Reland "Reland "Implement statements and expressions in DSL C++ code generator."" This is a reland of c412688798e572ac8ca6414a19a48d007500f751 This CL lands the code changes but not the dm test, which is causing link errors. Tests will be relanded as a separate CL, at http://review.skia.org/400097 Original change's description: > Reland "Implement statements and expressions in DSL C++ code generator." > > This is a reland of 16cbfb41dff107ca3388bacf34201311d3c5f14d > > Tests now rely on `shaderDerivativeSupport` and `integerSupport` as > proxies to indicate ES3 support. The SwitchStatement test has been > adjusted to hopefully confuse fewer compilers. > > Original change's description: > > Implement statements and expressions in DSL C++ code generator. > > > > This CL removes the bulk of the existing C++ code generator, especially > > all the complex format-string assembly code. It has been replaced with > > actual DSL code generation. Simple IR can now be successfully translated > > to a working DSL fragment processor. > > > > This CL also adds a simple test harness which is patterned after the > > existing SkSLTest; it renders a pixel, reads it back, and fails the test > > if the result isn't solid green (RGBA=0101). > > > > This CL doesn't implement every feature. Some obvious gaps include: > > - Sampling from children > > - Uniforms/inputs of any kind > > - Function calls of any kind > > > > Change-Id: Ib80c23fe1ba4453f7c3cb43b65f93c5ea0deb709 > > Bug: skia:11854 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/396757 > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > Bug: skia:11854, skia:11891 > Change-Id: I91363e31f34611d15ae350b52d6fc459feeace9c > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399076 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Bug: skia:11854 Bug: skia:11891 Change-Id: Ib1f08256c84d1da2130e0b61356f72435dc0a5a8 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399740 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-04-22 19:05:20 +00:00
class GrDSLFPTest_Ternary : public GrFragmentProcessor {
Fork CPPCodeGenerator into a DSL-based version. The long term goal is for the DSLCPPCodeGenerator to replace the CPPCodeGenerator entirely, but we will need both to coexist while DSL is still under development. Currently, the DSLCPPCodeGenerator is cloned from CPPCodeGenerator and emits almost exactly the same code (it adds a comment at the top to distinguish its output). Its output will change in followup CLs. This CL also allows skslc to recognize the `_dsl.cpp` output suffix and generate code using DSLCPPCodeGenerator instead of CPPCodeGenerator. This allows test DSL FPs to be created for inspection. Change-Id: If5136279c307ea53a9df3a292caa18344c1eb259 Bug: skia:11854 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/396096 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-13 21:13:03 +00:00
public:
Support 'layout(when)' expressions in DSL C++. This required some changes to how we name variables in DSL. When-expressions are designed to expect a local C++ variable with the same name as the layout key. This constraint means our DSLVar variables CANNOT have the same name as the layout key. Now, all DSL variables are given a prefix. We try to keep the code tidy by using just a leading underscore as the prefix, where it's safe to do so. (The C++ naming rules put some underscore-names out of bounds, but underscore followed by a lowercase letter is safe.) Change-Id: Iaa8878042329b9909096f05712d5cf636ea01822 Bug: skia:11854 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/400623 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-04-26 13:35:38 +00:00
static std::unique_ptr<GrFragmentProcessor> Make(bool primaryColors, SkPMColor4f colorGreen, SkPMColor4f colorRed, SkPMColor4f colorOrange, SkPMColor4f colorPurple) {
return std::unique_ptr<GrFragmentProcessor>(new GrDSLFPTest_Ternary(primaryColors, colorGreen, colorRed, colorOrange, colorPurple));
Fork CPPCodeGenerator into a DSL-based version. The long term goal is for the DSLCPPCodeGenerator to replace the CPPCodeGenerator entirely, but we will need both to coexist while DSL is still under development. Currently, the DSLCPPCodeGenerator is cloned from CPPCodeGenerator and emits almost exactly the same code (it adds a comment at the top to distinguish its output). Its output will change in followup CLs. This CL also allows skslc to recognize the `_dsl.cpp` output suffix and generate code using DSLCPPCodeGenerator instead of CPPCodeGenerator. This allows test DSL FPs to be created for inspection. Change-Id: If5136279c307ea53a9df3a292caa18344c1eb259 Bug: skia:11854 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/396096 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-13 21:13:03 +00:00
}
Reland "Reland "Implement statements and expressions in DSL C++ code generator."" This is a reland of c412688798e572ac8ca6414a19a48d007500f751 This CL lands the code changes but not the dm test, which is causing link errors. Tests will be relanded as a separate CL, at http://review.skia.org/400097 Original change's description: > Reland "Implement statements and expressions in DSL C++ code generator." > > This is a reland of 16cbfb41dff107ca3388bacf34201311d3c5f14d > > Tests now rely on `shaderDerivativeSupport` and `integerSupport` as > proxies to indicate ES3 support. The SwitchStatement test has been > adjusted to hopefully confuse fewer compilers. > > Original change's description: > > Implement statements and expressions in DSL C++ code generator. > > > > This CL removes the bulk of the existing C++ code generator, especially > > all the complex format-string assembly code. It has been replaced with > > actual DSL code generation. Simple IR can now be successfully translated > > to a working DSL fragment processor. > > > > This CL also adds a simple test harness which is patterned after the > > existing SkSLTest; it renders a pixel, reads it back, and fails the test > > if the result isn't solid green (RGBA=0101). > > > > This CL doesn't implement every feature. Some obvious gaps include: > > - Sampling from children > > - Uniforms/inputs of any kind > > - Function calls of any kind > > > > Change-Id: Ib80c23fe1ba4453f7c3cb43b65f93c5ea0deb709 > > Bug: skia:11854 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/396757 > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > Bug: skia:11854, skia:11891 > Change-Id: I91363e31f34611d15ae350b52d6fc459feeace9c > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399076 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Bug: skia:11854 Bug: skia:11891 Change-Id: Ib1f08256c84d1da2130e0b61356f72435dc0a5a8 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399740 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-04-22 19:05:20 +00:00
GrDSLFPTest_Ternary(const GrDSLFPTest_Ternary& src);
Fork CPPCodeGenerator into a DSL-based version. The long term goal is for the DSLCPPCodeGenerator to replace the CPPCodeGenerator entirely, but we will need both to coexist while DSL is still under development. Currently, the DSLCPPCodeGenerator is cloned from CPPCodeGenerator and emits almost exactly the same code (it adds a comment at the top to distinguish its output). Its output will change in followup CLs. This CL also allows skslc to recognize the `_dsl.cpp` output suffix and generate code using DSLCPPCodeGenerator instead of CPPCodeGenerator. This allows test DSL FPs to be created for inspection. Change-Id: If5136279c307ea53a9df3a292caa18344c1eb259 Bug: skia:11854 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/396096 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-13 21:13:03 +00:00
std::unique_ptr<GrFragmentProcessor> clone() const override;
Reland "Reland "Implement statements and expressions in DSL C++ code generator."" This is a reland of c412688798e572ac8ca6414a19a48d007500f751 This CL lands the code changes but not the dm test, which is causing link errors. Tests will be relanded as a separate CL, at http://review.skia.org/400097 Original change's description: > Reland "Implement statements and expressions in DSL C++ code generator." > > This is a reland of 16cbfb41dff107ca3388bacf34201311d3c5f14d > > Tests now rely on `shaderDerivativeSupport` and `integerSupport` as > proxies to indicate ES3 support. The SwitchStatement test has been > adjusted to hopefully confuse fewer compilers. > > Original change's description: > > Implement statements and expressions in DSL C++ code generator. > > > > This CL removes the bulk of the existing C++ code generator, especially > > all the complex format-string assembly code. It has been replaced with > > actual DSL code generation. Simple IR can now be successfully translated > > to a working DSL fragment processor. > > > > This CL also adds a simple test harness which is patterned after the > > existing SkSLTest; it renders a pixel, reads it back, and fails the test > > if the result isn't solid green (RGBA=0101). > > > > This CL doesn't implement every feature. Some obvious gaps include: > > - Sampling from children > > - Uniforms/inputs of any kind > > - Function calls of any kind > > > > Change-Id: Ib80c23fe1ba4453f7c3cb43b65f93c5ea0deb709 > > Bug: skia:11854 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/396757 > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > Bug: skia:11854, skia:11891 > Change-Id: I91363e31f34611d15ae350b52d6fc459feeace9c > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399076 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Bug: skia:11854 Bug: skia:11891 Change-Id: Ib1f08256c84d1da2130e0b61356f72435dc0a5a8 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399740 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-04-22 19:05:20 +00:00
const char* name() const override { return "DSLFPTest_Ternary"; }
Support 'layout(when)' expressions in DSL C++. This required some changes to how we name variables in DSL. When-expressions are designed to expect a local C++ variable with the same name as the layout key. This constraint means our DSLVar variables CANNOT have the same name as the layout key. Now, all DSL variables are given a prefix. We try to keep the code tidy by using just a leading underscore as the prefix, where it's safe to do so. (The C++ naming rules put some underscore-names out of bounds, but underscore followed by a lowercase letter is safe.) Change-Id: Iaa8878042329b9909096f05712d5cf636ea01822 Bug: skia:11854 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/400623 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-04-26 13:35:38 +00:00
bool primaryColors;
Reland "Add support for uniforms and layout(key)s to DSLCPPCodeGenerator." This reverts commit 289da86e37c3ebfb121832174c46757012ca49c3. Reason for revert: relanding Original change's description: > Revert "Add support for uniforms and layout(key)s to DSLCPPCodeGenerator." > > This reverts commit f33b061e3bebdecd8e9de41dffc6b8ce9d4e917a. > > Reason for revert: Google3 roll and wasm build > > Original change's description: > > Add support for uniforms and layout(key)s to DSLCPPCodeGenerator. > > > > Change-Id: I77c386e3d72fb4a5986e5efb8bc9d409200534d1 > > Bug: skia:11854 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/398457 > > Commit-Queue: John Stiles <johnstiles@google.com> > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I006ece639fa6051ff6ef1c496e648db9d5d0b30a > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:11854 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399498 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> Bug: skia:11854 Change-Id: I1a4a4db471e2ad0b169b2b77784ca17e6286fbd2 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/400036 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-04-22 19:08:33 +00:00
SkPMColor4f colorGreen;
SkPMColor4f colorRed;
Support 'layout(when)' expressions in DSL C++. This required some changes to how we name variables in DSL. When-expressions are designed to expect a local C++ variable with the same name as the layout key. This constraint means our DSLVar variables CANNOT have the same name as the layout key. Now, all DSL variables are given a prefix. We try to keep the code tidy by using just a leading underscore as the prefix, where it's safe to do so. (The C++ naming rules put some underscore-names out of bounds, but underscore followed by a lowercase letter is safe.) Change-Id: Iaa8878042329b9909096f05712d5cf636ea01822 Bug: skia:11854 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/400623 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-04-26 13:35:38 +00:00
SkPMColor4f colorOrange;
SkPMColor4f colorPurple;
Fork CPPCodeGenerator into a DSL-based version. The long term goal is for the DSLCPPCodeGenerator to replace the CPPCodeGenerator entirely, but we will need both to coexist while DSL is still under development. Currently, the DSLCPPCodeGenerator is cloned from CPPCodeGenerator and emits almost exactly the same code (it adds a comment at the top to distinguish its output). Its output will change in followup CLs. This CL also allows skslc to recognize the `_dsl.cpp` output suffix and generate code using DSLCPPCodeGenerator instead of CPPCodeGenerator. This allows test DSL FPs to be created for inspection. Change-Id: If5136279c307ea53a9df3a292caa18344c1eb259 Bug: skia:11854 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/396096 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-13 21:13:03 +00:00
private:
Support 'layout(when)' expressions in DSL C++. This required some changes to how we name variables in DSL. When-expressions are designed to expect a local C++ variable with the same name as the layout key. This constraint means our DSLVar variables CANNOT have the same name as the layout key. Now, all DSL variables are given a prefix. We try to keep the code tidy by using just a leading underscore as the prefix, where it's safe to do so. (The C++ naming rules put some underscore-names out of bounds, but underscore followed by a lowercase letter is safe.) Change-Id: Iaa8878042329b9909096f05712d5cf636ea01822 Bug: skia:11854 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/400623 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-04-26 13:35:38 +00:00
GrDSLFPTest_Ternary(bool primaryColors, SkPMColor4f colorGreen, SkPMColor4f colorRed, SkPMColor4f colorOrange, SkPMColor4f colorPurple)
Reland "Add support for uniforms and layout(key)s to DSLCPPCodeGenerator." This reverts commit 289da86e37c3ebfb121832174c46757012ca49c3. Reason for revert: relanding Original change's description: > Revert "Add support for uniforms and layout(key)s to DSLCPPCodeGenerator." > > This reverts commit f33b061e3bebdecd8e9de41dffc6b8ce9d4e917a. > > Reason for revert: Google3 roll and wasm build > > Original change's description: > > Add support for uniforms and layout(key)s to DSLCPPCodeGenerator. > > > > Change-Id: I77c386e3d72fb4a5986e5efb8bc9d409200534d1 > > Bug: skia:11854 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/398457 > > Commit-Queue: John Stiles <johnstiles@google.com> > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I006ece639fa6051ff6ef1c496e648db9d5d0b30a > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:11854 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399498 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> Bug: skia:11854 Change-Id: I1a4a4db471e2ad0b169b2b77784ca17e6286fbd2 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/400036 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-04-22 19:08:33 +00:00
: INHERITED(kGrDSLFPTest_Ternary_ClassID, kNone_OptimizationFlags)
Support 'layout(when)' expressions in DSL C++. This required some changes to how we name variables in DSL. When-expressions are designed to expect a local C++ variable with the same name as the layout key. This constraint means our DSLVar variables CANNOT have the same name as the layout key. Now, all DSL variables are given a prefix. We try to keep the code tidy by using just a leading underscore as the prefix, where it's safe to do so. (The C++ naming rules put some underscore-names out of bounds, but underscore followed by a lowercase letter is safe.) Change-Id: Iaa8878042329b9909096f05712d5cf636ea01822 Bug: skia:11854 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/400623 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-04-26 13:35:38 +00:00
, primaryColors(primaryColors)
Reland "Add support for uniforms and layout(key)s to DSLCPPCodeGenerator." This reverts commit 289da86e37c3ebfb121832174c46757012ca49c3. Reason for revert: relanding Original change's description: > Revert "Add support for uniforms and layout(key)s to DSLCPPCodeGenerator." > > This reverts commit f33b061e3bebdecd8e9de41dffc6b8ce9d4e917a. > > Reason for revert: Google3 roll and wasm build > > Original change's description: > > Add support for uniforms and layout(key)s to DSLCPPCodeGenerator. > > > > Change-Id: I77c386e3d72fb4a5986e5efb8bc9d409200534d1 > > Bug: skia:11854 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/398457 > > Commit-Queue: John Stiles <johnstiles@google.com> > > Auto-Submit: John Stiles <johnstiles@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I006ece639fa6051ff6ef1c496e648db9d5d0b30a > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:11854 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/399498 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> Bug: skia:11854 Change-Id: I1a4a4db471e2ad0b169b2b77784ca17e6286fbd2 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/400036 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-04-22 19:08:33 +00:00
, colorGreen(colorGreen)
Support 'layout(when)' expressions in DSL C++. This required some changes to how we name variables in DSL. When-expressions are designed to expect a local C++ variable with the same name as the layout key. This constraint means our DSLVar variables CANNOT have the same name as the layout key. Now, all DSL variables are given a prefix. We try to keep the code tidy by using just a leading underscore as the prefix, where it's safe to do so. (The C++ naming rules put some underscore-names out of bounds, but underscore followed by a lowercase letter is safe.) Change-Id: Iaa8878042329b9909096f05712d5cf636ea01822 Bug: skia:11854 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/400623 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-04-26 13:35:38 +00:00
, colorRed(colorRed)
, colorOrange(colorOrange)
, colorPurple(colorPurple) {
Fork CPPCodeGenerator into a DSL-based version. The long term goal is for the DSLCPPCodeGenerator to replace the CPPCodeGenerator entirely, but we will need both to coexist while DSL is still under development. Currently, the DSLCPPCodeGenerator is cloned from CPPCodeGenerator and emits almost exactly the same code (it adds a comment at the top to distinguish its output). Its output will change in followup CLs. This CL also allows skslc to recognize the `_dsl.cpp` output suffix and generate code using DSLCPPCodeGenerator instead of CPPCodeGenerator. This allows test DSL FPs to be created for inspection. Change-Id: If5136279c307ea53a9df3a292caa18344c1eb259 Bug: skia:11854 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/396096 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-13 21:13:03 +00:00
}
std::unique_ptr<GrGLSLFragmentProcessor> onMakeProgramImpl() const override;
void onGetGLSLProcessorKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
bool onIsEqual(const GrFragmentProcessor&) const override;
#if GR_TEST_UTILS
SkString onDumpInfo() const override;
#endif
GR_DECLARE_FRAGMENT_PROCESSOR_TEST
using INHERITED = GrFragmentProcessor;
};
#endif
Reference in New Issue Copy Permalink