AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
0326a9f27a
skia2/gn/sksl.gni

265 lines
9.7 KiB
Plaintext
Raw Normal View History

Split SkSL and utils apart again into .gni files. Also extend GN format presubmit check to .gni files. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3976 Change-Id: I292f3136437101e3e2c3271e260536ab7a24b192 Reviewed-on: https://skia-review.googlesource.com/3976 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
2016-10-26 18:17:04 +00:00
# Copyright 2016 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# Things are easiest for everyone if these source paths are absolute.
_src = get_path_info("../src", "abspath")
Move SkSLSampleMatrix to include/private Switch it to use std::string (not SkSL::String). Along these lines, remove SkSL::String's operator SkString, and instead add an explicit SkString constructor from std::string. Other changes aren't strictly necessary, but I wanted to clean up some of the other SkSL vs. Skia code barriers. VS (since 2015) has had vsnprintf that conforms to the C99 standard, the only difference with _vsnprintf is a different (nonstandard) return value for overflowing calls. Remove the special-case (the only use of SKSL_BUILD_FOR_WIN). Change-Id: I8826af10c8e78a8d935c601d00b8ae9ba0640041 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/298816 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2020-06-24 18:50:25 +00:00
_include = get_path_info("../include", "abspath")
Split SkSL and utils apart again into .gni files. Also extend GN format presubmit check to .gni files. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3976 Change-Id: I292f3136437101e3e2c3271e260536ab7a24b192 Reviewed-on: https://skia-review.googlesource.com/3976 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
2016-10-26 18:17:04 +00:00
skia_sksl_sources = [
Made SkSL DSL into public API In addition to the unsurprising changes to eliminate references to src/, we also had to tighten up some C++17-isms as they are not permitted in public headers. Change-Id: Ie5005a33d7a135e69fb66beca5e7a5f960dbd453 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/378496 Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-04 19:30:25 +00:00
"$_include/private/SkSLDefines.h",
Fixed an issue with DSL includes It turned out that everywhere we were using or testing DSL code either directly or indirectly imported big chunks of the SkSL library. These imports turned out to be necessary; code written using just DSL.h would fail with various template instantiation errors. Change-Id: Iae72d15b0d6ef14614ac1a4ff08c36bc1876cd4d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/381638 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-03-09 18:10:59 +00:00
"$_include/private/SkSLIRNode.h",
Made SkSL DSL into public API In addition to the unsurprising changes to eliminate references to src/, we also had to tighten up some C++17-isms as they are not permitted in public headers. Change-Id: Ie5005a33d7a135e69fb66beca5e7a5f960dbd453 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/378496 Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-04 19:30:25 +00:00
"$_include/private/SkSLLayout.h",
"$_include/private/SkSLModifiers.h",
Fixed an issue with DSL includes It turned out that everywhere we were using or testing DSL code either directly or indirectly imported big chunks of the SkSL library. These imports turned out to be necessary; code written using just DSL.h would fail with various template instantiation errors. Change-Id: Iae72d15b0d6ef14614ac1a4ff08c36bc1876cd4d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/381638 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-03-09 18:10:59 +00:00
"$_include/private/SkSLProgramElement.h",
Added DSL fragmentProcessor and Sample function Change-Id: I76348d151fbf27454a6f60e4f5f7e1774731e61b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/395216 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-04-09 19:33:53 +00:00
"$_include/private/SkSLProgramKind.h",
Change SampleMatrix to SampleUsage It now tracks all sample calls of a child (matrix, explicit coords, pass through). There is now just one registerChild() call, and the sampling pattern of that child is fully determined by the SampleUsage parameter. Change-Id: Iaadcd325fca64a59f24192aadd06923c66362181 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/299875 Reviewed-by: Michael Ludwig <michaelludwig@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2020-06-30 17:39:35 +00:00
"$_include/private/SkSLSampleUsage.h",
Fixed an issue with DSL includes It turned out that everywhere we were using or testing DSL code either directly or indirectly imported big chunks of the SkSL library. These imports turned out to be necessary; code written using just DSL.h would fail with various template instantiation errors. Change-Id: Iae72d15b0d6ef14614ac1a4ff08c36bc1876cd4d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/381638 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-03-09 18:10:59 +00:00
"$_include/private/SkSLStatement.h",
Made SkSL DSL into public API In addition to the unsurprising changes to eliminate references to src/, we also had to tighten up some C++17-isms as they are not permitted in public headers. Change-Id: Ie5005a33d7a135e69fb66beca5e7a5f960dbd453 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/378496 Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-04 19:30:25 +00:00
"$_include/private/SkSLString.h",
Fixed an issue with DSL includes It turned out that everywhere we were using or testing DSL code either directly or indirectly imported big chunks of the SkSL library. These imports turned out to be necessary; code written using just DSL.h would fail with various template instantiation errors. Change-Id: Iae72d15b0d6ef14614ac1a4ff08c36bc1876cd4d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/381638 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-03-09 18:10:59 +00:00
"$_include/private/SkSLSymbol.h",
Made SkSL DSL into public API In addition to the unsurprising changes to eliminate references to src/, we also had to tighten up some C++17-isms as they are not permitted in public headers. Change-Id: Ie5005a33d7a135e69fb66beca5e7a5f960dbd453 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/378496 Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-04 19:30:25 +00:00
"$_include/sksl/DSL.h",
"$_include/sksl/DSLBlock.h",
"$_include/sksl/DSLCase.h",
"$_include/sksl/DSLCore.h",
"$_include/sksl/DSLExpression.h",
"$_include/sksl/DSLFunction.h",
Added DSL layout() support Change-Id: I698dd607ff4676b6fb29be0a718c6073b66dc7c7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/406336 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-05-10 20:17:22 +00:00
"$_include/sksl/DSLLayout.h",
Made SkSL DSL into public API In addition to the unsurprising changes to eliminate references to src/, we also had to tighten up some C++17-isms as they are not permitted in public headers. Change-Id: Ie5005a33d7a135e69fb66beca5e7a5f960dbd453 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/378496 Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-04 19:30:25 +00:00
"$_include/sksl/DSLModifiers.h",
Added an API for creating RuntimeEffects using the SkSL DSL. Change-Id: I305016d305455e2b90fe904d8da93cf7735cc38e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/389316 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-04-16 18:54:43 +00:00
"$_include/sksl/DSLRuntimeEffects.h",
Made SkSL DSL into public API In addition to the unsurprising changes to eliminate references to src/, we also had to tighten up some C++17-isms as they are not permitted in public headers. Change-Id: Ie5005a33d7a135e69fb66beca5e7a5f960dbd453 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/378496 Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-04 19:30:25 +00:00
"$_include/sksl/DSLStatement.h",
Added DSLSymbols These are new APIs to manage symbols and symbol tables from DSL code, needed for the upcoming DSLParser. Change-Id: Ic8d86aebfbcdeb84bd872d8727cdfafbb8db2fd6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/414907 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-06-10 16:07:34 +00:00
"$_include/sksl/DSLSymbols.h",
Made SkSL DSL into public API In addition to the unsurprising changes to eliminate references to src/, we also had to tighten up some C++17-isms as they are not permitted in public headers. Change-Id: Ie5005a33d7a135e69fb66beca5e7a5f960dbd453 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/378496 Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-04 19:30:25 +00:00
"$_include/sksl/DSLType.h",
"$_include/sksl/DSLVar.h",
Add missing headers to sksl.gni. Change-Id: I225de583d408f1ca29e7e74d591e9be1ab2cbc20 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/532785 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-04-22 20:47:46 +00:00
"$_include/sksl/DSLWrapper.h",
Revert "Remove newly-added SkSL::DebugTrace base class." This reverts commit 873a39ebd16444221413c602959a51e2fbf1862b. Reason for revert: rework #2 of trace design, DebugTrace is back Original change's description: > Remove newly-added SkSL::DebugTrace base class. > > Slight rework of the SkRuntimeEffect trace design means we won't expose > any debug-trace class at the public level, so an interface base class > doesn't add value after all. > > Change-Id: I82739e9c5ba5ce5c7a63793ec0c09a50ab19fbb3 > Bug: skia:12708 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/480776 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Brian Osman <brianosman@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:12708 Change-Id: I02d51f83c7a3384b1eaa74ecf1a80b5f6e4fd774 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/481196 Auto-Submit: John Stiles <johnstiles@google.com> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-12-07 16:22:18 +00:00
"$_include/sksl/SkSLDebugTrace.h",
Further unified error handling between SkSL and DSL This eliminates the SkSL ErrorReporter class and funnels everything through the DSL ErrorHandler. Since the DSL error handler can be changed, this required a number of updates to ensure that things work properly in the face of custom error handlers. There is probably more work to be done in that area, but this at least passes all existing tests. Change-Id: Iaee27b79fc4ed426c484ccab257c09d28619ead5 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/438116 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-08-13 21:29:51 +00:00
"$_include/sksl/SkSLErrorReporter.h",
Added an SkSL Operator enum SkSL::Operator was previously just a thin wrapper around Token::Kind and everything was therefore written in terms of Token. Since Token is not accessible from include/ (and we don't want it to be), this creates an actual Operator enum and eliminates the dependence on Token. This will enable followup changes to reference Operator from within the DSL include files. Change-Id: I49555c9151618fd15970a303d2284972c78c3f21 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/525976 Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-03-30 19:48:52 +00:00
"$_include/sksl/SkSLOperator.h",
Add missing headers to sksl.gni. Change-Id: I225de583d408f1ca29e7e74d591e9be1ab2cbc20 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/532785 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-04-22 20:47:46 +00:00
"$_include/sksl/SkSLPosition.h",
Write SkSL visitor pattern and consolidate sampling analysis Besides moving the existing coord-overrides and sample matrix merging logic on to a shared visitor pattern, this updates the sample coord reference detection to actually look for references to that built-in. Previously, we only had this behavior in the CPP code generator. The .h generator just did a string search for sk_TransformedCoords2D, and runtime effects just looked at the main signature. Now, the .h generator is more robust, and runtime effects that declare the main coords parameter but never use it will not be marked as using the sample coords directly. Change-Id: I802d610dbda512cf3823c58f349307b3926aa58f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/299458 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Michael Ludwig <michaelludwig@google.com>
2020-06-29 21:27:00 +00:00
"$_src/sksl/SkSLAnalysis.cpp",
"$_src/sksl/SkSLAnalysis.h",
Do some renaming of "intrinsic" throughout SkSL Trying to land on more consistent terminology: - builtin: Any symbol or program element that's declared in the one of the modules/pre-includes. - intrinsic: The specific functions that are declared, but not defined in the modules. These are implemented by the generators. - builtin functions: Use this to refer to functions that are both declared and defined in the modules. (eg unpremul) Note that Module is still a term, and that may go away as well. This was focused on reducing overloaded terminology around the elements themselves (and not referring to things like "unpremul" as an intrinsic, in the case of "referencedIntrinsics"). Change-Id: I2b55c4628e9263a7f7a4faad005a653592e9724c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/484677 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-12-14 16:25:26 +00:00
"$_src/sksl/SkSLBuiltinMap.cpp",
"$_src/sksl/SkSLBuiltinMap.h",
Migrate BuiltinTypes to a separate file from Context. No code or functionality changes. Change-Id: I24317767570ae9ebbfea56f873d98709fb22d8b9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/354876 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-15 16:12:46 +00:00
"$_src/sksl/SkSLBuiltinTypes.cpp",
"$_src/sksl/SkSLBuiltinTypes.h",
Split SkSL and utils apart again into .gni files. Also extend GN format presubmit check to .gni files. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3976 Change-Id: I292f3136437101e3e2c3271e260536ab7a24b192 Reviewed-on: https://skia-review.googlesource.com/3976 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
2016-10-26 18:17:04 +00:00
"$_src/sksl/SkSLCompiler.cpp",
Add headers to SkSL GN file. This makes it easier to work with SkSL files when using an IDE. Change-Id: I30665478a9cde63b4c9ba7e5a9948e9647f7ef81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293571 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-06-02 16:29:20 +00:00
"$_src/sksl/SkSLCompiler.h",
Move constant folding to a separate file. This doesn't change any logic, just makes the IR generator a few hundred lines shorter. Change-Id: I92010191ee9283c33499c819d65fc85913f25824 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/352121 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-11 16:05:21 +00:00
"$_src/sksl/SkSLConstantFolder.cpp",
"$_src/sksl/SkSLConstantFolder.h",
Separate out built-in SkSL types into their own struct. Previously, these were in SkSL::Context directly. This change doesn't remove them from the context entirely, but it gives them a dedicated subclass and firewalls them off from the rest of the context. Change-Id: I0c344bf7436a11b8494a5fe7542d0a4ef1ece964 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/352502 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-11 19:22:36 +00:00
"$_src/sksl/SkSLContext.cpp",
Add headers to SkSL GN file. This makes it easier to work with SkSL files when using an IDE. Change-Id: I30665478a9cde63b4c9ba7e5a9948e9647f7ef81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293571 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-06-02 16:29:20 +00:00
"$_src/sksl/SkSLContext.h",
Initial land of DSLParser The DSLParser is an alternative to the existing SkSLParser which goes directly to IR code using the SkSL DSL. It is substantially faster and simpler than the existing parser->IRGenerator pipeline, but not yet feature complete nor fully tested. Change-Id: Iee45e9b527a3b88faa2ea74fc512051c8a38c5d4 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/400622 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-07-20 19:23:04 +00:00
"$_src/sksl/SkSLDSLParser.cpp",
"$_src/sksl/SkSLDSLParser.h",
SkSL include files are now stored in a binary format This speeds up compiler construction, because we no longer have to parse and process a bunch of SkSL source code during startup. Change-Id: I6d6bd9b5ce78b1661be691708ab84bf399c6df8b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305717 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2020-07-28 18:46:53 +00:00
"$_src/sksl/SkSLDehydrator.cpp",
Separate out SymbolTable aliases from regular Symbols. SymbolTable::addAlias can be used to create a Symbol that's an alias for an existing symbol, but uses a different name. (e.g. in Runtime Effects, a `fragmentProcessor` is a `shader` and `float4` is also `vec4`.) SymbolTable::addWithoutOwnership will now assert if an attempt is made to add a Symbol with the wrong name. In a followup CL, the name argument will be removed entirely and it will simply use the Symbol's name. Change-Id: I9aee7717e2600a6d84ebe4c3ab7fca40229faa5d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/323106 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-10-06 20:14:37 +00:00
"$_src/sksl/SkSLDehydrator.h",
Further unified error handling between SkSL and DSL This eliminates the SkSL ErrorReporter class and funnels everything through the DSL ErrorHandler. Since the DSL error handler can be changed, this required a number of updates to ensure that things work properly in the face of custom error handlers. There is probably more work to be done in that area, but this at least passes all existing tests. Change-Id: Iaee27b79fc4ed426c484ccab257c09d28619ead5 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/438116 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-08-13 21:29:51 +00:00
"$_src/sksl/SkSLErrorReporter.cpp",
Add headers to SkSL GN file. This makes it easier to work with SkSL files when using an IDE. Change-Id: I30665478a9cde63b4c9ba7e5a9948e9647f7ef81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293571 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-06-02 16:29:20 +00:00
"$_src/sksl/SkSLFileOutputStream.h",
Move GLSLGeneration definition to SkSL This is a first step in making GrShaderCaps more general so we can use it in Graphite. Change-Id: I7fc874e5df8dba2cef05421840a4019e5499ab59 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/473000 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2021-11-17 22:34:43 +00:00
"$_src/sksl/SkSLGLSL.h",
Migrate SkSL Inliner out of IRGenerator and into its own module. The functional changes needed to make this migration possible have already been submitted in prior CLs, so although this is large, it is almost entirely a mechanical migration of code from one file to another. Change-Id: I54380b52e38ebcec40ffbca7cb254f9655cb1865 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/313909 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-08-31 17:16:04 +00:00
"$_src/sksl/SkSLInliner.cpp",
"$_src/sksl/SkSLInliner.h",
Keep the intrinsic kind of a FunctionDefinition in its IRNode. This simplifies intrinsic identification from our backends. Rather than needing to manually track a list of strings in each backend, we can just call `funcCall.function().intrinsicKind()` and use the shared enum. In this CL, the GLSL backend has been converted to use the intrinsicKind call. Other backends will be updated in followup CLs. Change-Id: I47491655108a08b7414bfa293807d46ad948084a Bug: skia:11961 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/404898 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-05-06 02:17:04 +00:00
"$_src/sksl/SkSLIntrinsicList.h",
Revert "Revert "Switch to the new SkSL lexer."" This reverts commit 358515491a0d6891e6a709688a30ad087df1beb1. Bug: skia: Change-Id: I013fac0ed83774d8ae7c6ee6819045cab37f5e97 Reviewed-on: https://skia-review.googlesource.com/45180 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2017-09-11 20:50:14 +00:00
"$_src/sksl/SkSLLexer.cpp",
Add headers to SkSL GN file. This makes it easier to work with SkSL files when using an IDE. Change-Id: I30665478a9cde63b4c9ba7e5a9948e9647f7ef81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293571 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-06-02 16:29:20 +00:00
"$_src/sksl/SkSLLexer.h",
Break SkSLInliner mangling out into a separate class Change-Id: If0300761153d37b026fdc7756018c239ea6ca7ee Reviewed-on: https://skia-review.googlesource.com/c/skia/+/352505 Auto-Submit: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-01-11 17:37:42 +00:00
"$_src/sksl/SkSLMangler.cpp",
Add private blender type to SkSL built-in types. This type will hold blender objects, similar to color filters and shaders. Since the implementation is not yet complete, the type is currently named `$blender` to indicate that it's private/inaccessible. The $ will be removed once sampling is functional. Many places which were conditioned on "is a color filter or shader" are now conditioned on a helper method instead; if we ever add another runtime effect type in the future, there should be less hunting for places that need to be fixed. Change-Id: I207219abf8764906c3612ce8896492c7a2af6ea1 Bug: skia:12257 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/432259 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-07-26 12:32:07 +00:00
"$_src/sksl/SkSLMangler.h",
Add headers to SkSL GN file. This makes it easier to work with SkSL files when using an IDE. Change-Id: I30665478a9cde63b4c9ba7e5a9948e9647f7ef81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293571 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-06-02 16:29:20 +00:00
"$_src/sksl/SkSLMemoryLayout.h",
Reland "Replace pooling mechanism with GrMemoryPool." This is a reland of 67e1cf4b1d81185051bdaaaab4a1d88723e57358 The iOS 8 code path now compiles normally Original change's description: > Replace pooling mechanism with GrMemoryPool. > > This change is a wash for tests that could fit inside the previous > hard-coded pool (512 nodes) and appears to be a 5% improvement for > sksl_large. Larger programs would hypothetically show an even more > significant improvement. > > When SK_SUPPORT_GPU is disabled, we disable pooling entirely and fall > back to the system allocator. This is necessary because SkSL can exist > without Ganesh (such as in the wasm+CanvasKit build). > > Nanobench: http://screen/4xJEzdGducRxGeq > > Change-Id: I71dc702a84ab5c163673e35ec651003d7d45dacd > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/330219 > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> Change-Id: Iced330084f1ed8997e19bbee585422cb89e1c6b0 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/330404 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-10-29 14:17:15 +00:00
"$_src/sksl/SkSLMemoryPool.h",
Add private blender type to SkSL built-in types. This type will hold blender objects, similar to color filters and shaders. Since the implementation is not yet complete, the type is currently named `$blender` to indicate that it's private/inaccessible. The $ will be removed once sampling is functional. Many places which were conditioned on "is a color filter or shader" are now conditioned on a helper method instead; if we ever add another runtime effect type in the future, there should be less hunting for places that need to be fixed. Change-Id: I207219abf8764906c3612ce8896492c7a2af6ea1 Bug: skia:12257 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/432259 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-07-26 12:32:07 +00:00
"$_src/sksl/SkSLModifiersPool.h",
Added an SkSL Operator enum SkSL::Operator was previously just a thin wrapper around Token::Kind and everything was therefore written in terms of Token. Since Token is not accessible from include/ (and we don't want it to be), this creates an actual Operator enum and eliminates the dependence on Token. This will enable followup changes to reference Operator from within the DSL include files. Change-Id: I49555c9151618fd15970a303d2284972c78c3f21 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/525976 Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-03-30 19:48:52 +00:00
"$_src/sksl/SkSLOperator.cpp",
Reland "Add ByteCode output to skslc" Reland fixes link errors in nogpu builds This reverts commit 5fa45548b4e5649a46605ef483049fa3dcdd57e3. Change-Id: I45e0509d0476dde3a7088c1ed66ab0118894b31e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/340037 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2020-12-02 14:27:10 +00:00
"$_src/sksl/SkSLOutputStream.cpp",
"$_src/sksl/SkSLOutputStream.h",
Add private blender type to SkSL built-in types. This type will hold blender objects, similar to color filters and shaders. Since the implementation is not yet complete, the type is currently named `$blender` to indicate that it's private/inaccessible. The $ will be removed once sampling is functional. Many places which were conditioned on "is a color filter or shader" are now conditioned on a helper method instead; if we ever add another runtime effect type in the future, there should be less hunting for places that need to be fixed. Change-Id: I207219abf8764906c3612ce8896492c7a2af6ea1 Bug: skia:12257 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/432259 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-07-26 12:32:07 +00:00
"$_src/sksl/SkSLParsedModule.h",
Reland "Create a basic IRNode pooling system." This is a reland of e16eca95f5c08c2bdf72cc0b04af62a1071afd8d This fixes the no-op (iOS) implementation of CreatePoolOnThread. Original change's description: > Create a basic IRNode pooling system. > > Allocations are redirected by overriding `operator new` and `operator > delete` on the IRNode class. This allows us to use our existing > `unique_ptr` and `make_unique` calls as-is. The Pool class is simple; > it holds a fixed number of nodes and recycles them as they are returned. > > A fixed pool size of 2000 nodes was chosen. That is large enough to hold > the contents of `sksl_large` during compilation, but it can be > overflowed by very large shaders, or if multiple programs are converted > at the same time. Exhausting the pool is not a problem; if this happens, > additional nodes will be allocated via the system allocator as usual. > More elaborate schemes are possible but might not add a lot of value. > > Thread safety is accomplished by placing the pool in a `thread_local` > static during a Program's creation and destruction; the pool is freed > when the program is destroyed. One important consequence of this > strategy is that a program must free every node that it allocated during > its creation, or else the node will be leaked. In debug, leaking a node > will be detected and causes a DEBUGFAIL. In release, the pool will be > freed despite having a live node in it, and if that node is later freed, > that pointer will be passed to the system `free` (which is likely to > cause a crash). > > In this CL, iOS does not support pooling, since support for > `thread_local` was only added on iOS 9. This is fixed in the followup > CL, http://review.skia.org/328837, which uses pthread keys on iOS. > > Nanobench shows ~15% improvement: > (last week) http://screen/5CNBhTaZApcDA8h > (today) http://screen/8ti5Rymvf6LUs8i > > Change-Id: I559de73606ee1be54e5eae7f82129dc928a63e3c > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/326876 > Commit-Queue: John Stiles <johnstiles@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> Change-Id: I8623a574a7e92332ff00b83982497863c8953929 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/329171 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-10-22 15:09:15 +00:00
"$_src/sksl/SkSLPool.cpp",
"$_src/sksl/SkSLPool.h",
Added safety checks to SkSL error reporting This adds an assert to Position::line() to ensure that we don't run past the end of the source string. Since the source string can contain embedded nulls, we also switch the source handling from const char* to std::string so we can accurately determine its length. Change-Id: I9df47e98c1a0cbc35222a0ea709d9403762210d3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/521656 Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-03-17 14:01:59 +00:00
"$_src/sksl/SkSLPosition.cpp",
Add private blender type to SkSL built-in types. This type will hold blender objects, similar to color filters and shaders. Since the implementation is not yet complete, the type is currently named `$blender` to indicate that it's private/inaccessible. The $ will be removed once sampling is functional. Many places which were conditioned on "is a color filter or shader" are now conditioned on a helper method instead; if we ever add another runtime effect type in the future, there should be less hunting for places that need to be fixed. Change-Id: I207219abf8764906c3612ce8896492c7a2af6ea1 Bug: skia:12257 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/432259 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-07-26 12:32:07 +00:00
"$_src/sksl/SkSLProgramSettings.h",
SkSL include files are now stored in a binary format This speeds up compiler construction, because we no longer have to parse and process a bunch of SkSL source code during startup. Change-Id: I6d6bd9b5ce78b1661be691708ab84bf399c6df8b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305717 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2020-07-28 18:46:53 +00:00
"$_src/sksl/SkSLRehydrator.cpp",
Separate out SymbolTable aliases from regular Symbols. SymbolTable::addAlias can be used to create a Symbol that's an alias for an existing symbol, but uses a different name. (e.g. in Runtime Effects, a `fragmentProcessor` is a `shader` and `float4` is also `vec4`.) SymbolTable::addWithoutOwnership will now assert if an attempt is made to add a Symbol with the wrong name. In a followup CL, the name argument will be removed entirely and it will simply use the Symbol's name. Change-Id: I9aee7717e2600a6d84ebe4c3ab7fca40229faa5d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/323106 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-10-06 20:14:37 +00:00
"$_src/sksl/SkSLRehydrator.h",
Change SampleMatrix to SampleUsage It now tracks all sample calls of a child (matrix, explicit coords, pass through). There is now just one registerChild() call, and the sampling pattern of that child is fully determined by the SampleUsage parameter. Change-Id: Iaadcd325fca64a59f24192aadd06923c66362181 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/299875 Reviewed-by: Michael Ludwig <michaelludwig@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2020-06-30 17:39:35 +00:00
"$_src/sksl/SkSLSampleUsage.cpp",
Make SkRuntimeEffect's compiler instance shareable. No functional change. Bug: skia:12720 Change-Id: I649bc258c9a6b4973cdd9d1727827cdaf89b43ad Reviewed-on: https://skia-review.googlesource.com/c/skia/+/481280 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2021-12-08 14:42:09 +00:00
"$_src/sksl/SkSLSharedCompiler.cpp",
"$_src/sksl/SkSLSharedCompiler.h",
skslc can now be compiled with no Skia dependencies, in preparation for its eventual This reverts commit 9bd301d640ff63c280b202c7dd00bc00a3315ff4. Bug: skia: Change-Id: I5ad3f77ef33aa5ce2fd27fe383c9339c571663a1 Reviewed-on: https://skia-review.googlesource.com/10964 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2017-03-31 17:56:23 +00:00
"$_src/sksl/SkSLString.cpp",
Add headers to SkSL GN file. This makes it easier to work with SkSL files when using an IDE. Change-Id: I30665478a9cde63b4c9ba7e5a9948e9647f7ef81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293571 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-06-02 16:29:20 +00:00
"$_src/sksl/SkSLStringStream.h",
Broke DSLWriter into two separate classes As DSLWriter evolved, it ended up performing two unrelated duties: 1. Holding per-thread state which is referenced throughout SkSL (including non-DSL code) 2. DSL-specific utility functions There's no reason for those to be contained in the same class, and there's also no reason the per-thread state should be held in a DSL-specific class. This breaks out an SkSL::ThreadContext class to hold the state info, leaving the DSL utility functions behind in DSLWriter (which should perhaps be renamed, but that's a job for a future CL). Change-Id: Iccd45314bd9b37d4a1d3e27920e32a50c0b07d7c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/456736 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-10-07 14:47:32 +00:00
"$_src/sksl/SkSLThreadContext.cpp",
"$_src/sksl/SkSLThreadContext.h",
Split SkSL and utils apart again into .gni files. Also extend GN format presubmit check to .gni files. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3976 Change-Id: I292f3136437101e3e2c3271e260536ab7a24b192 Reviewed-on: https://skia-review.googlesource.com/3976 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
2016-10-26 18:17:04 +00:00
"$_src/sksl/SkSLUtil.cpp",
Add headers to SkSL GN file. This makes it easier to work with SkSL files when using an IDE. Change-Id: I30665478a9cde63b4c9ba7e5a9948e9647f7ef81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293571 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-06-02 16:29:20 +00:00
"$_src/sksl/SkSLUtil.h",
Migrate CanExitWithoutReturningValue out of SkSLAnalysis. Change-Id: I0e59da9dda8917e2bc9d6959fdfeeaeae9372c3a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/456647 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-10-07 00:05:59 +00:00
"$_src/sksl/analysis/SkSLCanExitWithoutReturningValue.cpp",
Rename CheckProgramUnrolledSize to CheckProgramStructure. This code also checks for recursion and overly-deep call chains, so it's useful even in cases where we don't care about the program size. Change-Id: I7f123d95b3881d8738b84c565d0fc46da778314e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/534664 Reviewed-by: Arman Uguray <armansito@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-04-27 20:59:04 +00:00
"$_src/sksl/analysis/SkSLCheckProgramStructure.cpp",
Migrate VerifyStaticTestsAndExpressions analysis pass out. A followup CL will add new checks to this analysis pass (specifically, error reporting for never-assigned out params). In preparation for this, the code has been renamed to `DoFinalizationChecks` and migrated out of SkSLAnalysis.cpp and into its own file in sksl/analysis/. No logic is changing in this CL. Change-Id: I7a474269be34350b3adfdd13fc1f384df143fde9 Bug: skia:12867 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/499755 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2022-01-25 22:07:50 +00:00
"$_src/sksl/analysis/SkSLFinalizationChecks.cpp",
Migrate GetLoopUnrollInfo out of SkSLAnalysis. Change-Id: Ic0d1b04ee09a144dbb13cc98dff8e10409186a8e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/456648 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-10-07 00:06:22 +00:00
"$_src/sksl/analysis/SkSLGetLoopUnrollInfo.cpp",
Migrate IsConstantExpression out of SkSLAnalysis. Change-Id: I08717dd9e9ad20a18a623e06f0c66a0f697effa4 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/456796 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-10-07 00:06:41 +00:00
"$_src/sksl/analysis/SkSLIsConstantExpression.cpp",
Allow prefix-expressions in IsSameExpressionTree. This will allow expressions like `-x == -x` or `!y == !y` to be detected as matching expressions (which enables various constant-folding paths). (Also, migrated the analysis code into a separate cpp.) Change-Id: I3e317fdaed3762f8fa19e684a5ed557fc9348c7c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/527617 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2022-04-05 17:57:51 +00:00
"$_src/sksl/analysis/SkSLIsSameExpressionTree.cpp",
Remove get_es2_loop_unroll_info helper function. This only needed a helper function to make error-reporting optional, but NoOpErrorReporter (previously TrivialErrorReporter) can serve this purpose equally well. Change-Id: Iac249483f2013cbf8563c0ea44c680d3e03e2894 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/524766 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-03-28 14:41:23 +00:00
"$_src/sksl/analysis/SkSLNoOpErrorReporter.h",
Migrate ProgramUsage out of SkSLAnalysis. Change-Id: I005eccfa262ed047409cce0417f50f93fb6341a3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/456641 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-10-06 19:52:11 +00:00
"$_src/sksl/analysis/SkSLProgramUsage.cpp",
Migrate `SwitchCaseContainsExit` out of SkSLAnalysis. This CL also removes `SwitchCaseFallsThrough` entirely; it was not referenced anywhere. Change-Id: I58298bf2a603615e37f4cced9db6d2f4c2c54d5a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/456473 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-10-06 17:18:57 +00:00
"$_src/sksl/analysis/SkSLProgramVisitor.h",
Add SkSL prefix to SwitchCaseContainsExit filename. Change-Id: Ia5bf3423fa75ac610fd34db252fee493d5a53877 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/456644 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-10-06 19:57:17 +00:00
"$_src/sksl/analysis/SkSLSwitchCaseContainsExit.cpp",
Move code generators to codegen/ directory. We are up to having seven distinct types of codegen, and will soon have an 8th (DSL C++). Change-Id: I6758328390c234ba1d5c30c118199dbc820af52a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/395817 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-04-13 14:41:57 +00:00
"$_src/sksl/codegen/SkSLVMCodeGenerator.cpp",
"$_src/sksl/codegen/SkSLVMCodeGenerator.h",
Added basic SkSL DSL statements (and Ternary for good measure) Change-Id: I4afa121d54ab9ba8d0814693ce53da7cb73ef340 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/353626 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-01-22 20:18:25 +00:00
"$_src/sksl/dsl/DSLBlock.cpp",
Made SkSL DSL into public API In addition to the unsurprising changes to eliminate references to src/, we also had to tighten up some C++17-isms as they are not permitted in public headers. Change-Id: Ie5005a33d7a135e69fb66beca5e7a5f960dbd453 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/378496 Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-04 19:30:25 +00:00
"$_src/sksl/dsl/DSLCase.cpp",
Beginnings of the SkSL DSL framework The code at this point doesn't do anything useful, but establishes some of the basic types and patterns. Change-Id: I580a9e75ffa3162879893450fb7d1f0905a10687 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/350697 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Auto-Submit: Ethan Nicholas <ethannicholas@google.com>
2021-01-07 15:57:27 +00:00
"$_src/sksl/dsl/DSLCore.cpp",
"$_src/sksl/dsl/DSLExpression.cpp",
Added SkSL DSLFunction Change-Id: Ibc995e908e5b4f8d1516e13d56854a4fcf5cc809 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360556 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-28 15:02:43 +00:00
"$_src/sksl/dsl/DSLFunction.cpp",
Added DSL layout() support Change-Id: I698dd607ff4676b6fb29be0a718c6073b66dc7c7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/406336 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-05-10 20:17:22 +00:00
"$_src/sksl/dsl/DSLLayout.cpp",
Added an API for creating RuntimeEffects using the SkSL DSL. Change-Id: I305016d305455e2b90fe904d8da93cf7735cc38e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/389316 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-04-16 18:54:43 +00:00
"$_src/sksl/dsl/DSLRuntimeEffects.cpp",
Added basic SkSL DSL statements (and Ternary for good measure) Change-Id: I4afa121d54ab9ba8d0814693ce53da7cb73ef340 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/353626 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-01-22 20:18:25 +00:00
"$_src/sksl/dsl/DSLStatement.cpp",
Added DSLSymbols These are new APIs to manage symbols and symbol tables from DSL code, needed for the upcoming DSLParser. Change-Id: Ic8d86aebfbcdeb84bd872d8727cdfafbb8db2fd6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/414907 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-06-10 16:07:34 +00:00
"$_src/sksl/dsl/DSLSymbols.cpp",
Add SkSL DSLType Change-Id: I0bbda6a41391fc2a11dc812be5e9c0c0d14c4d75 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/351921 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-08 16:42:25 +00:00
"$_src/sksl/dsl/DSLType.cpp",
Add SkSL DSLVar Change-Id: I1093aa6bbdb481c98ea3dab10c06bfcf323b2a75 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/352058 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-01-11 20:42:44 +00:00
"$_src/sksl/dsl/DSLVar.cpp",
add Start/EndFragmentProcessor to DSLWriter Change-Id: I6f9d414d55b3ba64c3f67f3a590f6b7b5642062a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/364599 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-02-02 16:51:03 +00:00
"$_src/sksl/dsl/priv/DSLFPs.cpp",
Beginnings of the SkSL DSL framework The code at this point doesn't do anything useful, but establishes some of the basic types and patterns. Change-Id: I580a9e75ffa3162879893450fb7d1f0905a10687 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/350697 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Auto-Submit: Ethan Nicholas <ethannicholas@google.com>
2021-01-07 15:57:27 +00:00
"$_src/sksl/dsl/priv/DSLWriter.cpp",
Add DSL headers to GN files. Change-Id: I712b34874f36dc83812389d24bc0e4997ead1b12 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/363780 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-01 15:18:20 +00:00
"$_src/sksl/dsl/priv/DSLWriter.h",
Convert IRGenerator::convertBinaryExpr to BinaryExpr::Make. Interestingly, this reduces the size of our dehydated data significantly, because we were storing the result type of the binary expression explicitly. Now the result type is deduced automatically from the left and right types by the Make call. Change-Id: Ic6187a5c36774f5a4ed2ec579e9cd13b331832b5 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/377099 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-01 14:27:48 +00:00
"$_src/sksl/ir/SkSLBinaryExpression.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLBinaryExpression.h",
Add Make factory function to Block. Block::Make always makes a real Block object. This is important because many callers rely on Blocks specifically; e.g. a function body must be a scoped Block, nothing else will do. However, unscoped Blocks are just a collection of Statements and usually have more flexibility. So, Block::MakeUnscoped is a factory function that will return the Statement as-is for a single-statement unscoped Block. For an entirely empty Block, MakeUnscoped returns Nop. Change-Id: Ied65d505bde4ea7f6157a039944018546e4b7333 Bug: skia:11342 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/384180 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-03-13 00:24:31 +00:00
"$_src/sksl/ir/SkSLBlock.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLBlock.h",
"$_src/sksl/ir/SkSLBreakStatement.h",
SkSL: Allow invoking children (shaders, etc) like functions Previously, you would declare child objects (shaders, colorFilters, etc.) and "sample" them like this: uniform shader input; uniform colorFilter filter; half4 main(float2 coord) { half4 inColor = sample(input, coord); return sample(filter, inColor); } With the new syntax, those child objects become directly callable, reflecting the way that Skia assembles all parts of the paint (as functions) in the overall fragment shader: uniform shader input; uniform colorFilter filter; half4 main(float2 coord) { half4 inColor = input(coord); return filter(inColor); } Bug: skia:12302 Change-Id: Ia12351964dc5d2300660187933188e738671cd83 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/436517 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-08-04 15:34:16 +00:00
"$_src/sksl/ir/SkSLChildCall.cpp",
"$_src/sksl/ir/SkSLChildCall.h",
moved SkSL Constructor's data into IRNode Change-Id: I9568deca0031d32bc1c6bdf1f11f6da76de6d07f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/320075 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2020-09-29 16:41:35 +00:00
"$_src/sksl/ir/SkSLConstructor.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLConstructor.h",
Represent array constructors with a dedicated ConstructorArray class. Change-Id: Ia8c8a3476202257ecc100f9cb31e6d0095135aa1 Bug: skia:11032 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/391919 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-01 17:48:15 +00:00
"$_src/sksl/ir/SkSLConstructorArray.cpp",
"$_src/sksl/ir/SkSLConstructorArray.h",
Enable comparison of arrays of different precision types. GLSL allows an array of `lowp float` to be compared against `highp float` seamlessly because the types are considered to be the same. SkSL, however, treats these as different types, so we need to coerce the types to allow this comparison to work. In other words, these comparisons can cause an array to be implicitly casted. The expression `myHalf2Array == float[2](a, b)` should be allowed when narrowing conversions are enabled. To allow this to work, we need a dedicated IR node representing this type coercion. We now allow implicit coercion of array types when the array's component types would be implicitly coercible, and have a new IR node representing that implicit conversion. This CL fixes array comparisons, but array assignment needs additional fixes. It currently results in: "type mismatch: '=' cannot operate on (types)". Bug: skia:12248 Change-Id: I99062486c081f748f65be4b36a3a52e95b559812 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/436571 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-08-05 14:35:01 +00:00
"$_src/sksl/ir/SkSLConstructorArrayCast.cpp",
"$_src/sksl/ir/SkSLConstructorArrayCast.h",
Rename composite constructors to compound constructors. Change-Id: Ic1f5d28651e8de9d9ecea2a0bcfa73063dd90a9d Bug: skia:11032 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/393337 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-04-07 16:31:13 +00:00
"$_src/sksl/ir/SkSLConstructorCompound.cpp",
"$_src/sksl/ir/SkSLConstructorCompound.h",
"$_src/sksl/ir/SkSLConstructorCompoundCast.cpp",
"$_src/sksl/ir/SkSLConstructorCompoundCast.h",
Create a diagonal-matrix Constructor class. This constructor takes a single argument and splats it diagonally across an otherwise-zero matrix. These are also sometimes referred to as a uniform-scale matrix. Change-Id: I1ed8140f55f5cad4029015807b220d6475401daa Bug: skia:11032 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/390716 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-31 02:09:37 +00:00
"$_src/sksl/ir/SkSLConstructorDiagonalMatrix.cpp",
"$_src/sksl/ir/SkSLConstructorDiagonalMatrix.h",
Represent matrix resizes as a dedicated expression type. This shook out a long-standing bug; constant folding would treat a matrix resize as if the cells not covered by the original matrix were all zero. This is wrong; GLSL populates the unknown cells with an identity matrix. We actually tested for the wrong behavior, so the tests were updated to match the correct behavior, and an equivalent test was added that does not constant-fold (to verify that our constant folder matches reality). Change-Id: I03df10ce646fbef0a36e9c1a841a7637182de122 Bug: skia:11032 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/392916 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-06 17:47:19 +00:00
"$_src/sksl/ir/SkSLConstructorMatrixResize.cpp",
"$_src/sksl/ir/SkSLConstructorMatrixResize.h",
Represent scalar-cast constructors with ConstructorScalarCast. Change-Id: Iff8477f3797c83059c823ca9287493b7f30db71b Bug: skia:11032 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/392438 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-05 02:24:40 +00:00
"$_src/sksl/ir/SkSLConstructorScalarCast.cpp",
"$_src/sksl/ir/SkSLConstructorScalarCast.h",
Represent splat constructors with a dedicated ConstructorSplat class. Change-Id: Ic9c3d688b571591d057ab6a4e998f1f9712a1b58 Bug: skia:11032 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/392117 Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-01 22:58:25 +00:00
"$_src/sksl/ir/SkSLConstructorSplat.cpp",
"$_src/sksl/ir/SkSLConstructorSplat.h",
Add support for struct constructors to SkSL. This is allowed in OpenGL ES2, and its absence in SkSL has been a pain point for new users adopting Runtime Effects. Change-Id: Id2ed78261a2cd2b14b49ad22cb74cdc9e0905f8a Bug: skia:11368 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/393418 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-04-09 03:25:52 +00:00
"$_src/sksl/ir/SkSLConstructorStruct.cpp",
"$_src/sksl/ir/SkSLConstructorStruct.h",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLContinueStatement.h",
"$_src/sksl/ir/SkSLDiscardStatement.h",
Convert IRGenerator::convertDo to DoStatement::Make. We currently don't have any optimizations for do-statements so the primary benefit is moving code out of IRGenerator. Change-Id: Ibc4d1ecd87ebef572e742dfdb15821cf4ac0f047 Bug: skia:11342 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/376179 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-26 16:18:20 +00:00
"$_src/sksl/ir/SkSLDoStatement.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLDoStatement.h",
Report incomplete expression-statements as errors. Previously, a dangling type or function reference would be eliminated silently with optimizations on, or would assert when optimizations were off. Change-Id: Ib2e273b6f069724e8872c9cb97351b647b875a62 Bug: skia:12472 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/469525 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-11-09 21:29:13 +00:00
"$_src/sksl/ir/SkSLExpression.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLExpression.h",
Convert make_unique<ExpressionStatement> to ExpressionStatement::Make. This allows for elimination expression-statements with no side effects when they are first created, rather than later on in the control-flow optimization pass. Change-Id: I09ec8421a3af7fa37f98b0405657198c0a24f2ac Bug: skia:11342, skia:11319 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/376136 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-26 01:52:03 +00:00
"$_src/sksl/ir/SkSLExpressionStatement.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLExpressionStatement.h",
"$_src/sksl/ir/SkSLExtension.h",
Migrate SkSLExternalFunction to the ir/ directory. Change-Id: I8ca4fbba551624c61a4ebe7a4716750fe0b48196 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/395818 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-13 13:42:05 +00:00
"$_src/sksl/ir/SkSLExternalFunction.h",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLExternalFunctionCall.h",
Strip down SkSL::ExternalValues, limit them to functions Previously ExternalValues were flexible, and could be used as raw values (with the ability to chain access via dot notation), or they could be callable. The only non-test use-case has been for functions (in particles) for a long time. With the push towards SkVM, limiting ourselves to this interface simplifies things: external functions are basically custom intrinsics (and with the SkVM backend, they'll just get access to the builder, and be able to do any math, as well as loads/stores, etc). By narrowing the feature set, we can rename everything to reflect that, and it's overall clearer (the SkSL types now mirror FunctionReference and FunctionCall directly, particularly in how they're handled by the CFG and inliner). Change-Id: Ib5dd34158ff85aae6c297408a92ace5485a08190 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/350704 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-01-06 19:27:35 +00:00
"$_src/sksl/ir/SkSLExternalFunctionReference.h",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLField.h",
Add Convert/Make factory functions to FieldAccess. Change-Id: Ib1f5296c017374b833654f988ff89d11d8f78b4d Bug: skia:11342 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/380458 Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-08 14:18:21 +00:00
"$_src/sksl/ir/SkSLFieldAccess.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLFieldAccess.h",
Convert IRGenerator::convertFor to ForStatement::Make. Since while statements are implemented in terms of a for loop, also added ForStatement::MakeWhile() which assumes null for the init-stmt and the next-expr. We currently don't have any optimizations for for-statements so the primary benefit is moving code out of IRGenerator. Change-Id: I4b3fc3482e28b7d28065e85670a6037b511847ff Bug: skia:11342 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375203 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-25 21:24:19 +00:00
"$_src/sksl/ir/SkSLForStatement.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLForStatement.h",
Migrate FunctionCall conversion out of IRGenerator. We don't currently do FunctionCall optimization, but implementing something along the lines of skia:10835 would probably involve doing rewrites for optimization in FunctionCall::Make. This CL is the first step down that road. Change-Id: I249b02412e7ebac21bb98d6c5d61af3dcd6f1e69 Bug: skia:11342 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/387156 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-19 14:54:59 +00:00
"$_src/sksl/ir/SkSLFunctionCall.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLFunctionCall.h",
Refactored SkSL function creation and error handling This breaks up the giant IRGenerator::convertFunction method into more- manageable chunks, moves the functionality into FunctionDeclaration, and funnels the DSL through it so it receives the same error checking. Change-Id: Icf2ac650ab3d5276d8c0134062a4e7e220f9bf32 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402778 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-05-04 18:30:02 +00:00
"$_src/sksl/ir/SkSLFunctionDeclaration.cpp",
Convert expression arrays from std::vector to SkSTArray. This will help us avoid allocations for simple expressions. Nanobench shows ~5% improvement with an array size of 2: http://screen/8oDEY7hjrhY8C6k Other array sizes will show different levels of improvement, but I haven't done an exhaustive trial. (2 was noticeably better than 1.) Change-Id: I005a7896a0db83df4e3c2d3c0fa3321203f8a0b3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/325861 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-10-13 15:14:08 +00:00
"$_src/sksl/ir/SkSLFunctionDeclaration.h",
Migrate function-body finalization out of IRGenerator. This is a first step towards replacing `finalizeFunction` with a `FunctionDefinition::Convert` method living outside of the IRGenerator. Previously this code would assert that we had no early returns from a vertex-program main() method; this has been turned into an error. (The original assertion was also tied to fRTFlip, because the *problem* with early-returns in main is tied to the lack of RTFlip fixups, but we fundamentally don't allow early returns, so it makes more sense to just universally disallow it.) Change-Id: Iba0742f7ef3cbc83995ea130fec1eb1ef2556c44 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/442691 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-08-27 16:42:45 +00:00
"$_src/sksl/ir/SkSLFunctionDefinition.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLFunctionDefinition.h",
Improve support for function prototypes in SkSL. Previously, when a prototype was parsed, this added a function declaration to the symbol table, but the prototype itself was not re-emitted during code generation. This meant that the final code might not be valid, since the absence of prototypes meant that the code might attempt to invoke a function before its declaration. Now, prototypes are stored in the ProgramElement list and re-emitted during code generation for GLSL/Metal/CPP. (SPIR-V doesn't name its functions at all.) Change-Id: I76446c796000eb0b56f964d82457122182c28b87 Bug: skia:10872 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/331136 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-03 17:18:22 +00:00
"$_src/sksl/ir/SkSLFunctionPrototype.h",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLFunctionReference.h",
Convert IRGenerator::convertIf to IfStatement::Make. This lets the Rehydrator and Inliner benefit from static optimization opportunities, like converting `if (false) {...}` to a Nop. Change-Id: I70b4fceab84c50ea270dc894b0d6fe0e7e2369eb Bug: skia:11342 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375777 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-25 19:27:02 +00:00
"$_src/sksl/ir/SkSLIfStatement.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLIfStatement.h",
Add Convert/Make factory functions to IndexExpression. Change-Id: I7a7874e58bf53978afce8a41b26092406b6490ed Bug: skia:11342 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/380360 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-08 14:18:07 +00:00
"$_src/sksl/ir/SkSLIndexExpression.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLIndexExpression.h",
Add a new statement type 'InlineMarker' to indicate inlined functions. This will be leveraged in followup CLs to avoid recursive inlining death spirals. Change-Id: Icf99c88c4acaaa766e0dc0971830329e24d70509 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/315861 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-09-09 18:18:53 +00:00
"$_src/sksl/ir/SkSLInlineMarker.h",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLInterfaceBlock.h",
Replace trio of XxxxLiteral types with a single Literal type. Throughout SkSL we've begun using doubles as a convenient way to store any SkSL value (int, float, bool) in a single type. This idea has now been extended to literals. Rather than having three expression kinds for integers, floats and boolean literals, we can have just one. These can be accessed in a type-specific way (`floatValue`, `intValue`, and `boolValue` return the expected type, or assert if it's not the matching type), or in a type-agnostic way (`value` will return a double and works on any type of Literal). This allows us to remove a complex template trick (Literal<T> is gone), removes two redundant Expression types, and and lets us reduce our code size in ConstantFolder, FunctionCall, etc. Most of the conversion process was pretty straightforward: * `IntLiteral::Make` becomes `Literal::MakeInt` * `x.is<IntLiteral>()` becomes `x.isIntLiteral()` * `x.as<IntLiteral>.value()` becomes `x.as<Literal>.intValue()` Change-Id: Ic328533611e4551669c7fc9d7f9c03e34699f3f6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/447836 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-09-13 17:32:06 +00:00
"$_src/sksl/ir/SkSLLiteral.h",
SkSL: Add support for method calls on effect objects Includes .eval() as a new alternative syntax for sample/shade. Bug: skia:12302 Change-Id: Ia921c141b3eeeba7e5309d921967b941f9cd055e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/444756 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-09-01 17:12:16 +00:00
"$_src/sksl/ir/SkSLMethodReference.h",
Moved CheckModifiers out of IRGenerator Change-Id: Ic9288665fd31bde986720cd259b132a5cb9d87a6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/459178 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-10-14 13:38:06 +00:00
"$_src/sksl/ir/SkSLModifiers.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLModifiersDeclaration.h",
"$_src/sksl/ir/SkSLNop.h",
Added Poison values to SkSL to improve DSL error handling This also tightens up the rules around releasing DSL objects. Bug: skia:12133 Change-Id: I11a6d8fbcec58374f7b5ed5ced1c5c112e2b7cc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/421323 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-06-25 16:31:44 +00:00
"$_src/sksl/ir/SkSLPoison.h",
Convert IRGenerator::convertPostfixExpr to PostfixExpr::Make. We have no optimizations on postfix-expressions at all so this is a very straightforward cut-and-paste. Change-Id: I73b3bc73ad833e668306301e6d6859e44230393a Bug: skia:11342 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/376846 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-26 20:56:48 +00:00
"$_src/sksl/ir/SkSLPostfixExpression.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLPostfixExpression.h",
Allow constant propagation for negated constant-vectors and ints. This CL improves on the previous fix for oss-fuzz:26789 by actually propagating the negation from the PrefixExpression inside the constructor, which unblocks further optimizations. Interestingly, this fix also exposes a further missing optimization--we optimize away comparisons of constant-vectors for floats, but fail to do the same for ints. Change-Id: I9d4cb92b10452a74db96ff264322cdc8a8f2a41f Bug: oss-fuzz:26830, oss-fuzz:26789, skia:10908 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/332263 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-05 16:56:03 +00:00
"$_src/sksl/ir/SkSLPrefixExpression.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLPrefixExpression.h",
"$_src/sksl/ir/SkSLProgram.h",
"$_src/sksl/ir/SkSLReturnStatement.h",
Re-re-land sksl fragment processor support This reverts commit 5ce397205528f82084fc650c2ce27d246c01da33. Bug: skia: Change-Id: I88260c90004610a1cf8ad1a87c2b4b222525bbb6 Reviewed-on: https://skia-review.googlesource.com/21108 Reviewed-by: Ben Wagner <benjaminwagner@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2017-06-29 14:03:38 +00:00
"$_src/sksl/ir/SkSLSetting.cpp",
Add headers to SkSL GN file. This makes it easier to work with SkSL files when using an IDE. Change-Id: I30665478a9cde63b4c9ba7e5a9948e9647f7ef81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293571 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-06-02 16:29:20 +00:00
"$_src/sksl/ir/SkSLSetting.h",
Add global struct definitions to SkSL. Previously, GLSL and Metal code generators would emit a struct wherever the type was first used in the code, regardless of where it was originally defined or what scope the type needs to live in. This CL adds a ProgramElement for struct definitions, so that structs will now appear at the top-level as they were originally defined. In the case of Metal, some special handling is also needed to handle the Globals struct properly. Not yet fully supported: - No special handling for structs declared inside functions yet - No support for structs in separate scopes with overlapping names The severity of the remaining issues depends mostly on whether we want to support structs inside functions in Runtime Effects. Change-Id: Ia95d4529506cb3fa6da63f5cb548199a93e1c0c5 Bug: skia:10922, skia:10923, skia:10925, skia:10926 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338600 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-11-25 21:24:55 +00:00
"$_src/sksl/ir/SkSLStructDefinition.h",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLSwitchCase.h",
Migrate convertSwitch to SwitchStatement::Make. This splits switch() construction into two stages. - One version of Make takes an array of case-values and case-statement lists, and is responsible for reporting errors if the case-values are not unique or are improperly typed. This is what the IR generator or DSL will start with on its first encounter with the switch statement. - The other version of Make takes an array of already-processed SwitchCases and can assume the invariant that they're all correctly- typed with unique values. This is what we will have when a statement is inlined or otherwise cloned. (We still assert this invariant, for correctness' sake, but in release mode we assume it.) This CL doesn't perform any optimizations at Make time yet; it does work equivalent to how `switch` works in the IR generator today. It does improve duplicate case-label checking slightly; duplicate case labels are now reported, and duplicate `default:` labels are detected. (Multiple `default` labels won't pass the parser, but they can be constructed in DSL.) Change-Id: I537ce2c8236152d58641fb1793619d66a62c01a8 Bug: skia:11342 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372616 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-23 18:44:36 +00:00
"$_src/sksl/ir/SkSLSwitchStatement.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLSwitchStatement.h",
Migrate convertSwizzle to Swizzle::Make. There are two forms. Swizzle::Make supports components XYZW only; Swizzle::MakeWith01 also supports the 01 components, and restructures the zeros and ones into a constructor (as IRGenerator::convertSwizzle has historically done). This means that once we are past the initial IR generation stage, and we know that the 01 components have been eliminated, we can avoid the extra 01-handling logic and just call Swizzle::Make directly. This isn't a huge deal but it means that call sites like the inliner can avoid some extra work that will never happen. Change-Id: I46690c3d6b07feb6327ee72e8f66f15592a35554 Bug: skia:11342 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/371398 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-19 19:09:38 +00:00
"$_src/sksl/ir/SkSLSwizzle.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLSwizzle.h",
SkSL sample() now permits specification of coordinates Bug: skia: Change-Id: I16073008ac852f1864bd1d2bd38087a5b661d05a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/232581 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2019-08-29 20:10:13 +00:00
"$_src/sksl/ir/SkSLSymbolTable.cpp",
Add headers to SkSL GN file. This makes it easier to work with SkSL files when using an IDE. Change-Id: I30665478a9cde63b4c9ba7e5a9948e9647f7ef81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293571 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-06-02 16:29:20 +00:00
"$_src/sksl/ir/SkSLSymbolTable.h",
Convert IRGenerator::convertTernaryExpr to TernaryExpr::Make. Change-Id: I3a9e8b278709485de51dca18b19f6fc7768dde51 Bug: skia:11342 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/377098 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-27 01:44:54 +00:00
"$_src/sksl/ir/SkSLTernaryExpression.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLTernaryExpression.h",
Split SkSL and utils apart again into .gni files. Also extend GN format presubmit check to .gni files. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3976 Change-Id: I292f3136437101e3e2c3271e260536ab7a24b192 Reviewed-on: https://skia-review.googlesource.com/3976 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
2016-10-26 18:17:04 +00:00
"$_src/sksl/ir/SkSLType.cpp",
Add headers to SkSL GN file. This makes it easier to work with SkSL files when using an IDE. Change-Id: I30665478a9cde63b4c9ba7e5a9948e9647f7ef81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293571 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-06-02 16:29:20 +00:00
"$_src/sksl/ir/SkSLType.h",
Reland "Disallow constructors of ES3 types in ES2 code." This is a reland of 36f53ec7e10e16ad6c33156a5d5fa25975cc7fac Original change's description: > Disallow constructors of ES3 types in ES2 code. > > The fuzzer found that we constructed TypeReferences without first > checking for disallowed tyoes. (In fact, TypeReference creation had no > error checking at all; it didn't even have Convert/Make functions.) > > Added proper Convert/Make to TypeReference, and used those calls to > report errors or cause assertions if trying to make a TypeReference to a > type that the program did not support. > > (While tracking down this bug, I added strict-ES2 type assertions to our > constructor IR nodes as well. This helped pinpoint the error and seem > reasonable to leave in, just in case.) > > Change-Id: I896b68ae9d3d9e1f30d7eba9fa594617ab851c74 > Bug: oss-fuzz:39540 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/455498 > Commit-Queue: John Stiles <johnstiles@google.com> > Commit-Queue: Brian Osman <brianosman@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: oss-fuzz:39540 Change-Id: Id8e323c22b18726214613b6061c08873048b7c69 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/455617 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-10-04 16:43:39 +00:00
"$_src/sksl/ir/SkSLTypeReference.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLTypeReference.h",
"$_src/sksl/ir/SkSLUnresolvedFunction.h",
Migrate VarDeclaration conversion out of IRGenerator. Change-Id: If5fb4f99d327bb429f60e8d6c526720dd02b0928 Bug: skia:11342 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/386800 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-03-19 22:39:25 +00:00
"$_src/sksl/ir/SkSLVarDeclarations.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLVarDeclarations.h",
SkSL vars now track their declaration instead of their initial value This should not cause any functional changes, and is just a prerequisite for upcoming DSL work. Change-Id: Iea165d3b7ede39ccc9cf5f5d78f623bc883b391e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/356816 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-01-21 18:12:01 +00:00
"$_src/sksl/ir/SkSLVariable.cpp",
Add missing IR headers to the .gn file. Change-Id: I7ba287b5d8e34571b5ca3e502413b2aafa27acc7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310059 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-08-13 16:04:15 +00:00
"$_src/sksl/ir/SkSLVariable.h",
added frexp support to SkSL This includes an optimizer fix for the situation: int i; float f = frexp(foo, i); If we don't read the variable i, it is considered dead and eliminated - which then causes an error when we try to write the expression frexmp(foo, i). Bug: skia: Change-Id: Iac385e38e215455346fab62e1f4ec46fa65b3c21 Reviewed-on: https://skia-review.googlesource.com/116521 Reviewed-by: Chris Dalton <csmartdalton@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2018-03-26 18:24:27 +00:00
"$_src/sksl/ir/SkSLVariableReference.cpp",
Add headers to SkSL GN file. This makes it easier to work with SkSL files when using an IDE. Change-Id: I30665478a9cde63b4c9ba7e5a9948e9647f7ef81 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/293571 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-06-02 16:29:20 +00:00
"$_src/sksl/ir/SkSLVariableReference.h",
Move code generators to codegen/ directory. We are up to having seven distinct types of codegen, and will soon have an 8th (DSL C++). Change-Id: I6758328390c234ba1d5c30c118199dbc820af52a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/395817 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-04-13 14:41:57 +00:00
"$_src/sksl/spirv.h",
Move SkVMDebugTrace into src/sksl/tracing. Change-Id: Id4fc455f0eb23aa8d9b6f5474be7f6eba71c48de Reviewed-on: https://skia-review.googlesource.com/c/skia/+/482698 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-12-10 17:03:35 +00:00
"$_src/sksl/tracing/SkVMDebugTrace.cpp",
"$_src/sksl/tracing/SkVMDebugTrace.h",
Moved findAndDeclareBuiltinVariables out of IRGenerator No functional changes, just continuing the process of moving code out of IRGenerator in hopes of its eventual disappearance. Change-Id: I3507b85c5493c61812869c9bae53de8af89ee129 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/453941 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-09-30 16:47:04 +00:00
"$_src/sksl/transform/SkSLBuiltinVariableScanner.cpp",
Migrate compiler elimination passes to Transform. Change-Id: Ibb8695917d0a8ff43467542ee7a7b36f573513f8 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/456798 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-10-07 00:37:39 +00:00
"$_src/sksl/transform/SkSLEliminateDeadFunctions.cpp",
"$_src/sksl/transform/SkSLEliminateDeadGlobalVariables.cpp",
Migrate EliminateDeadLocalVariables into Transform. Change-Id: Idc0c51c0d293121fd306e7153b2e47f7e7dec222 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/456646 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-10-06 20:51:57 +00:00
"$_src/sksl/transform/SkSLEliminateDeadLocalVariables.cpp",
Migrate EliminateUnreachableCode into Transform. Change-Id: Ib32895a78a8de4c49ce1208f0c1b9b111d092b42 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/456643 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-10-06 19:54:55 +00:00
"$_src/sksl/transform/SkSLEliminateUnreachableCode.cpp",
Moved findAndDeclareBuiltinVariables out of IRGenerator No functional changes, just continuing the process of moving code out of IRGenerator in hopes of its eventual disappearance. Change-Id: I3507b85c5493c61812869c9bae53de8af89ee129 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/453941 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-09-30 16:47:04 +00:00
"$_src/sksl/transform/SkSLTransform.h",
Split SkSL and utils apart again into .gni files. Also extend GN format presubmit check to .gni files. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3976 Change-Id: I292f3136437101e3e2c3271e260536ab7a24b192 Reviewed-on: https://skia-review.googlesource.com/3976 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
2016-10-26 18:17:04 +00:00
]
Re-re-land sksl fragment processor support This reverts commit 5ce397205528f82084fc650c2ce27d246c01da33. Bug: skia: Change-Id: I88260c90004610a1cf8ad1a87c2b4b222525bbb6 Reviewed-on: https://skia-review.googlesource.com/21108 Reviewed-by: Ben Wagner <benjaminwagner@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2017-06-29 14:03:38 +00:00
[sksl] Make sksl tracing optional This removes the required dependency on our JSON code. In the Bazel rules, this dependency is pushed down into sksl instead of required by the cc_binary rules. It adds a stub version of SkVMDebugTrace.cpp and removes SkVMDebugTracePlayer unless the appropriate GN or Bazel flag is set (skia_enable_sksl_tracing and enable_sksl_tracing, respectively). There was an existing #define that CanvasKit used (CK_INCLUDE_SKSL_TRACE) and this was changed to SKSL_ENABLE_TRACING. Users of //:skia_core no longer need to specify a JSON dep, if sksl needs it (e.g. for tracing), then it will specify the dependency. This is a reland of https://skia-review.googlesource.com/c/skia/+/528837 Bug: skia:12541 Change-Id: I79612c69fdbefd3db9822a2b66df7552f7c13865 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/529278 Reviewed-by: John Stiles <johnstiles@google.com>
2022-04-12 12:23:07 +00:00
skia_sksl_tracing_sources = [
"$_src/sksl/tracing/SkVMDebugTracePlayer.cpp",
"$_src/sksl/tracing/SkVMDebugTracePlayer.h",
]
Revert "Revert "Shuffle SkSL sources around so compiler and bytecode can be used w/o GPU"" This reverts commit 37a59ef1af685fea0942f0dbc27f20a722ed18e1. Change-Id: If38da265ebbb196e72c7d035ba51028438787e2e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221541 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-06-18 14:14:20 +00:00
skia_sksl_gpu_sources = [
Move code generators to codegen/ directory. We are up to having seven distinct types of codegen, and will soon have an 8th (DSL C++). Change-Id: I6758328390c234ba1d5c30c118199dbc820af52a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/395817 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-04-13 14:41:57 +00:00
"$_src/sksl/codegen/SkSLCodeGenerator.h",
"$_src/sksl/codegen/SkSLGLSLCodeGenerator.cpp",
"$_src/sksl/codegen/SkSLGLSLCodeGenerator.h",
"$_src/sksl/codegen/SkSLMetalCodeGenerator.cpp",
"$_src/sksl/codegen/SkSLMetalCodeGenerator.h",
"$_src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp",
"$_src/sksl/codegen/SkSLPipelineStageCodeGenerator.h",
"$_src/sksl/codegen/SkSLSPIRVCodeGenerator.cpp",
"$_src/sksl/codegen/SkSLSPIRVCodeGenerator.h",
"$_src/sksl/codegen/SkSLSPIRVtoHLSL.cpp",
"$_src/sksl/codegen/SkSLSPIRVtoHLSL.h",
[sksl][wgsl] Introduce SkSLWGSLCodeGenerator Introduce a new WGSL codegen backend. It currently only supports fragment/vertex stage input and output variable declarations. Bug: skia:13092 Change-Id: If9e4e432794eb95fd33719be5c0141dfc2cb5680 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/526757 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-03-28 23:34:52 +00:00
"$_src/sksl/codegen/SkSLWGSLCodeGenerator.cpp",
"$_src/sksl/codegen/SkSLWGSLCodeGenerator.h",
Revert "Revert "Shuffle SkSL sources around so compiler and bytecode can be used w/o GPU"" This reverts commit 37a59ef1af685fea0942f0dbc27f20a722ed18e1. Change-Id: If38da265ebbb196e72c7d035ba51028438787e2e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221541 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-06-18 14:14:20 +00:00
]
Move skslc dependencies into a dedicated list. I'm considering migrating SkSL precompilation/dehydration into a separate binary from skslc. It would need the exact same set of Skia dependencies. So let's factor them out. Change-Id: I9b000ef058f7253e142cf5a8a603e468beb4d6f6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/526020 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2022-03-30 18:20:13 +00:00
skslc_deps = [
"$_src/core/SkArenaAlloc.cpp",
"$_src/core/SkBlockAllocator.cpp",
"$_src/core/SkCpu.cpp",
"$_src/core/SkData.cpp",
"$_src/core/SkHalf.cpp",
"$_src/core/SkMalloc.cpp",
"$_src/core/SkMath.cpp",
"$_src/core/SkMatrixInvert.cpp",
"$_src/core/SkSemaphore.cpp",
"$_src/core/SkStream.cpp",
"$_src/core/SkString.cpp",
"$_src/core/SkStringUtils.cpp",
"$_src/core/SkThreadID.cpp",
"$_src/core/SkUtils.cpp",
"$_src/core/SkVM.cpp",
Move all Ganesh source files into ganesh subdirectory. Change-Id: I238d29ba0250224fa593845ae65192653f58faff Reviewed-on: https://skia-review.googlesource.com/c/skia/+/528156 Reviewed-by: Kevin Lubick <kjlubick@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
2022-04-07 15:20:24 +00:00
"$_src/gpu/ganesh/GrMemoryPool.cpp",
Move skslc dependencies into a dedicated list. I'm considering migrating SkSL precompilation/dehydration into a separate binary from skslc. It would need the exact same set of Skia dependencies. So let's factor them out. Change-Id: I9b000ef058f7253e142cf5a8a603e468beb4d6f6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/526020 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2022-03-30 18:20:13 +00:00
"$_src/ports/SkMemory_malloc.cpp",
"$_src/ports/SkOSFile_stdio.cpp",
"$_src/utils/SkJSON.cpp",
"$_src/utils/SkJSONWriter.cpp",
Remove complex path simplification code. Now that we can call into Skia utils directly, we can use the preexisting code from SkOSPath instead. Change-Id: I67e3099e97ec0e93acc08c7f2142a01a2af48f15 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/531416 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2022-04-19 03:04:30 +00:00
"$_src/utils/SkOSPath.cpp",
Move skslc dependencies into a dedicated list. I'm considering migrating SkSL precompilation/dehydration into a separate binary from skslc. It would need the exact same set of Skia dependencies. So let's factor them out. Change-Id: I9b000ef058f7253e142cf5a8a603e468beb4d6f6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/526020 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2022-03-30 18:20:13 +00:00
"$_src/utils/SkParse.cpp",
"$_src/utils/SkShaderUtils.cpp",
"$_src/utils/SkUTF.cpp",
"$_src/utils/SkVMVisualizer.cpp",
]
Reference in New Issue Copy Permalink