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

185 lines
6.8 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 = [
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",
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/SkSLASTFile.h",
Major rearchitecture of SkSL parsing, focused on improving performance. Bug: skia: Change-Id: I83e3a094d26085fc4d586e5d2581e0d61c55634e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/145080 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2019-06-06 14:04:27 +00:00
"$_src/sksl/SkSLASTNode.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/SkSLASTNode.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",
Switch back to stack-based SkSL interpreter It's slower, but code size is quite a bit smaller, memory usage is smaller, and we think that mapping it to SkVM is just as easy. This effectively reverts all of the following commits: "Fix gcc9 warning around size of memset." https://skia-review.googlesource.com/c/skia/+/279861 "Remove unused (and misleading) 'instruction' from SkSLInterpreter.h" https://skia-review.googlesource.com/c/skia/+/278177 "Interpreter: Fix intrinsics when called with vector types" https://skia-review.googlesource.com/c/skia/+/272721 "Make it easier to add vector versions of byte code instructions" https://skia-review.googlesource.com/c/skia/+/272527 "Interpreter: Support returns from runStriped" https://skia-review.googlesource.com/c/skia/+/268941 "add SkSLInterpreter vector instructions" https://skia-review.googlesource.com/c/skia/+/266560 "Fix crash when editing particle scripts" https://skia-review.googlesource.com/c/skia/+/269487 "Revert "Revert "Complete rewrite of the SkSL interpreter""" https://skia-review.googlesource.com/c/skia/+/266205 Change-Id: I4258596399c4ca94489d4faf8aacfec88afeee13 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/281205 Reviewed-by: Mike Klein <mtklein@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2020-04-02 15:38:40 +00:00
"$_src/sksl/SkSLByteCode.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/SkSLByteCode.h",
Initial checkin of new SkSL interpreter. Not quite feature complete yet, but at a point where it's worth checking in. Bug: skia: Change-Id: I21141d30e8582a79e94450d84e56bacc067249e0 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201685 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-03-21 15:05:37 +00:00
"$_src/sksl/SkSLByteCodeGenerator.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/SkSLByteCodeGenerator.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/SkSLCFGGenerator.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/SkSLCFGGenerator.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",
"$_src/sksl/SkSLDefines.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",
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/SkSLErrorReporter.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/SkSLExternalFunction.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/SkSLFileOutputStream.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/SkSLIRGenerator.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/SkSLIRGenerator.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",
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 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",
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",
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/SkSLParser.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/SkSLParser.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",
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/SkSLPosition.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",
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/SkSLSectionAndParameterHelper.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/SkSLSectionAndParameterHelper.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/SkSLString.h",
"$_src/sksl/SkSLStringStream.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",
New SkSL code generator that emits directly to skvm Still TODO: - Function calls. Can do these by inlining everything (recursively). - Additional flow control: ES2 for loops can be supported (via unrolling), and switch() can be implemented. (Was never done in ByteCode). - Uniforms and params have been set up to work very generically (caller just supplies IDs, the generator collates everything into a master working list). Builtins should work the same way (caller supplies a map of builtin ID -> skvm::Val[]?), so that we don't need a special case for device coord. - Figure out integer type policy. Today, it's a mix of only supporting signed integers, and just treating all integers as signed, even if they're not. - Now that defining intrinsics is *much* simpler, stop defining so many of them in sksl_public.sksl, and just implement them here. Change-Id: Id9771444ce54ccf8e6e408c44ebb3780c1170435 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/341980 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2020-12-02 16:12:51 +00:00
"$_src/sksl/SkSLVMGenerator.cpp",
"$_src/sksl/SkSLVMGenerator.h",
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",
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",
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 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",
"$_src/sksl/ir/SkSLBlock.h",
"$_src/sksl/ir/SkSLBoolLiteral.h",
"$_src/sksl/ir/SkSLBreakStatement.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",
"$_src/sksl/ir/SkSLContinueStatement.h",
"$_src/sksl/ir/SkSLDiscardStatement.h",
"$_src/sksl/ir/SkSLDoStatement.h",
"$_src/sksl/ir/SkSLEnum.h",
"$_src/sksl/ir/SkSLExpression.h",
"$_src/sksl/ir/SkSLExpressionStatement.h",
"$_src/sksl/ir/SkSLExtension.h",
"$_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",
"$_src/sksl/ir/SkSLFieldAccess.h",
"$_src/sksl/ir/SkSLFloatLiteral.h",
"$_src/sksl/ir/SkSLForStatement.h",
"$_src/sksl/ir/SkSLFunctionCall.h",
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",
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",
"$_src/sksl/ir/SkSLIRNode.h",
"$_src/sksl/ir/SkSLIfStatement.h",
"$_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/SkSLIntLiteral.h",
"$_src/sksl/ir/SkSLInterfaceBlock.h",
"$_src/sksl/ir/SkSLLayout.h",
"$_src/sksl/ir/SkSLModifiers.h",
"$_src/sksl/ir/SkSLModifiersDeclaration.h",
"$_src/sksl/ir/SkSLNop.h",
"$_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/SkSLProgramElement.h",
"$_src/sksl/ir/SkSLReturnStatement.h",
"$_src/sksl/ir/SkSLSection.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 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/SkSLStatement.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",
"$_src/sksl/ir/SkSLSwitchStatement.h",
"$_src/sksl/ir/SkSLSwizzle.h",
"$_src/sksl/ir/SkSLSymbol.h",
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/ir/SkSLSymbolAlias.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",
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",
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",
"$_src/sksl/ir/SkSLVarDeclarations.h",
"$_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",
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
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 = [
"$_src/sksl/SkSLCPPCodeGenerator.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/SkSLCPPCodeGenerator.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
"$_src/sksl/SkSLCPPUniformCTypes.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/SkSLCPPUniformCTypes.h",
"$_src/sksl/SkSLCodeGenerator.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
"$_src/sksl/SkSLGLSLCodeGenerator.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/SkSLGLSLCodeGenerator.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
"$_src/sksl/SkSLHCodeGenerator.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/SkSLHCodeGenerator.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
"$_src/sksl/SkSLMetalCodeGenerator.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/SkSLMetalCodeGenerator.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
"$_src/sksl/SkSLPipelineStageCodeGenerator.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/SkSLPipelineStageCodeGenerator.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
"$_src/sksl/SkSLSPIRVCodeGenerator.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/SkSLSPIRVCodeGenerator.h",
Reland "Add SkSLCompiler::toHLSL, using SPIRV-Cross" This reverts commit e3f57a4e62d9f447033dcc535e78c18cfd72b9d6. Change-Id: I03293dbee19ef5c9802fc35de8438a87f627cf96 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/272056 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2020-02-19 20:35:26 +00:00
"$_src/sksl/SkSLSPIRVtoHLSL.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/SkSLSPIRVtoHLSL.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
]
Pre-CL so I can prep Chrome for splitting up SkSL sources Change-Id: Ie4c8e8c5df8f3d37ea49d0c0f7e432e6999b7f0b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221243 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@google.com> Auto-Submit: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2019-06-17 14:27:55 +00:00
rewrote GrAlphaThresholdFragmentProcessor in sksl Bug: skia: Change-Id: I641b206fc3bc19ac190ad94ee755ab9e1caab9b3 Reviewed-on: https://skia-review.googlesource.com/21341 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2017-07-05 20:19:09 +00:00
skia_gpu_processor_sources = [
Revert "converted AARectEffect to new FP system" This reverts commit 222e275b0ab4c8a2af152c637bf9dbc28b4a097f. Reason for revert: perf regression Original change's description: > converted AARectEffect to new FP system > > Bug: skia: > Change-Id: I0e4141c7f547bab92c65a6abff120ed04d5c2c66 > Reviewed-on: https://skia-review.googlesource.com/c/153550 > Reviewed-by: Brian Salomon <bsalomon@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> TBR=bsalomon@google.com,ethannicholas@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Bug: skia: Change-Id: I3d7036a78d8582d6790c77b20a60e6e5257d1881 Reviewed-on: https://skia-review.googlesource.com/c/162283 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2018-10-15 20:09:54 +00:00
"$_src/gpu/effects/GrAARectEffect.fp",
Make generated effects from sksl fp files not need SK_SUPPORT_GPU Bug: skia: Change-Id: I42a5c7fe7dc35a23290c8daa754c9fcce07f76fb Reviewed-on: https://skia-review.googlesource.com/119010 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2018-04-06 14:37:55 +00:00
"$_src/gpu/effects/GrAlphaThresholdFragmentProcessor.fp",
Convert the arithmetic runtime effect to a regular .fp effect. The .fp effect has support for passing values to a child processor. Runtime effects do not support passing a color to a processor, which is needed to properly implement `ArithmeticImageFilterImpl` without relying on multiple `addColorFragmentProcesor` calls and/or `RunInSeries`. Change-Id: I47446897f857ce849a8e734ab81ee7aec80734e7 Bug: skia:10217 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/301657 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-07-09 21:13:13 +00:00
"$_src/gpu/effects/GrArithmeticProcessor.fp",
converted GrBlurredEdgeFragmentProcessor to sksl Bug: skia: Change-Id: I028c85f692b2e54e64be301940708387014ee0c7 Reviewed-on: https://skia-review.googlesource.com/23540 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2017-07-14 20:17:04 +00:00
"$_src/gpu/effects/GrBlurredEdgeFragmentProcessor.fp",
move blur impl into core Ever since we added drawShadow to the public api, blurs have necessarily part of the core. This CL just formalizes that. This should also allow us to have builds that exclude all of /effects (for code size) and still be valid. Will follow-up with a change to deprecate SkBlurMaskFilter and SkBlurQuality (both no longer needed). Bug: skia: Change-Id: Ifbbd8b47a30a0386d215726b67bcf1e8b84fb8f5 Reviewed-on: https://skia-review.googlesource.com/113713 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2018-03-12 18:03:47 +00:00
"$_src/gpu/effects/GrCircleBlurFragmentProcessor.fp",
converted CircleEffect to SkSL Bug: skia: Change-Id: I93d117c22ae2b374294f6a5e961c497ac2c92b09 Reviewed-on: https://skia-review.googlesource.com/23301 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2017-07-13 20:00:16 +00:00
"$_src/gpu/effects/GrCircleEffect.fp",
Clamp GrSkSLFP output to valid premul Added this as an option to GrSaturateProcessor (also renamed it to be more generic and end with FragmentProcessor). Added a tweak to the unit test to check the new behavior. (Raster was already doing the clamp). Change-Id: Ic49fa5cd72b6c63430fb773baf8121546bf2b80d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/265580 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2020-01-22 15:39:31 +00:00
"$_src/gpu/effects/GrClampFragmentProcessor.fp",
harmonize rewrite-includes and gn-format checks The CheckGeneratedFiles bot only required rewriting .gn files, while the presubmit wants both .gn and .gni files. It also appears that the #includes rewrite script runs on both the presubmit and CheckGeneratedFiles bots. These presubmits run on the CQ before landing right? If so, no need for them in the CheckGeneratedFIles bot at all. And of course, format .gni files. Change-Id: Icd4526d62f85088862ad93566cc9ace11dc3e33f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/281505 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2020-04-03 15:59:37 +00:00
"$_src/gpu/effects/GrColorMatrixFragmentProcessor.fp",
ComposeShader GPU implementations Bug: skia: Change-Id: I007b46ead1900a8f5cce82dec33b6d662fc63d8e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/206918 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2019-04-09 20:28:19 +00:00
"$_src/gpu/effects/GrComposeLerpEffect.fp",
converted GrConfigConversionEffect to SkSL Bug: skia: Change-Id: If17cf0fc8b857d22f33a462a39a02bcddd15deda Reviewed-on: https://skia-review.googlesource.com/55741 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2017-10-05 16:36:59 +00:00
"$_src/gpu/effects/GrConfigConversionEffect.fp",
converted ConstColorProcessor to SkSL Bug: skia: Change-Id: Ic3b18f82c1ab940637fb26dec1cf376dd859b35d Reviewed-on: https://skia-review.googlesource.com/73720 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2017-11-20 17:12:24 +00:00
"$_src/gpu/effects/GrConstColorProcessor.fp",
Reland "Remove GrDeviceSpaceTextureDecalFragmentProcessor." This is a reland of af5f9f008de060a91d8069c876a765f11c3d36f6 This was reverted due to Metal GMs failing. That is a bug in Metal where pipeline creation fails with "internal error". Reporting to Apple, filing Skia bug, and moving on. Original change's description: > Remove GrDeviceSpaceTextureDecalFragmentProcessor. > > It was used to sample clip masks using device coords. > > Replace with a more generic GrDeviceSpaceEffect that simply calls a > child FP with sk_FragCoord. > > Also fix issue in GrQuadPerEdgeAA GP. It wouldn't setup coord transforms > at all if they are all applied in the FS (explicit coords). Moreover, > the GrGLSLGeometryProcessor::emitTransforms() helper required a valid VS > var for local coords even when all FPs use explicit coords and wouldn't > use a local coords var. > > Make CPP SkSL code gen for clone copy the explicit coord status of > children. > > Change-Id: Ib8bb36028354405c8012f6e91e9eb46db75d16a6 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/271658 > Commit-Queue: Brian Salomon <bsalomon@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Change-Id: Ia4530e6799019cd92863fe983a2d3c71df6f0620 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/273511 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2020-02-26 18:28:42 +00:00
"$_src/gpu/effects/GrDeviceSpaceEffect.fp",
Convert the dither runtime effect into a regular .fp effect. This was previously implemented as a runtime effect in order to dogfood runtime effects when they were new. However, runtime effects do not support passing a color to a FP via `sample(fp, inputColor)`, which is needed to properly implement SkPaintToGrPaint. Change-Id: Ic826860ab06038f13633be677d79a9138d41db85 Bug: skia:10217 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/301547 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-07-09 19:29:33 +00:00
"$_src/gpu/effects/GrDitherEffect.fp",
converted EllipseEffect to sksl Bug: skia: Change-Id: Id089b9ead7a21e903b001006dffff2381efd4ba3 Reviewed-on: https://skia-review.googlesource.com/23582 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2017-07-14 17:11:38 +00:00
"$_src/gpu/effects/GrEllipseEffect.fp",
GPU support for SkColorFilters::HSLAMatrix Change-Id: I5b762811b44861fcedd2fa5c0e48a82718458605 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/232398 Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-10-23 15:44:22 +00:00
"$_src/gpu/effects/GrHSLToRGBFilterEffect.fp",
Convert GLHighContrastFilterEffect to an .fp file. The fuzzer detected a bug in our handling of null child processors. Rather than attempt to further tweak a hand-rolled effect, it seemed more productive to convert it into a full-fledged .fp file. This provides a very high degree of confidence that the basics are done properly, for a relatively low amount of effort. Contrast calculation has also been optimized slightly. The original shader calculated (1+c/1-c) separately for every pixel. This is now done once, in Make(). Also, if contrast adjustment is set to zero, the contrast block is fully omitted. Change-Id: I2af4708536b249e03c3ebede9b10fc1125eadb7b Bug: oss-fuzz:24039 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/301942 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-07-10 19:55:57 +00:00
"$_src/gpu/effects/GrHighContrastFilterEffect.fp",
converted LumaColorFilterEffect to sksl Bug: skia: Change-Id: I208984ec9ad357249ee1b2fe28477f1450b4b69d Reviewed-on: https://skia-review.googlesource.com/67848 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2017-11-07 14:23:38 +00:00
"$_src/gpu/effects/GrLumaColorFilterEffect.fp",
converted GrMagnifierEffect to SkSL Bug: skia: Change-Id: I6dc14ac66d5b911117e71fa23fef49a897082781 Reviewed-on: https://skia-review.googlesource.com/71342 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2017-12-13 19:36:14 +00:00
"$_src/gpu/effects/GrMagnifierEffect.fp",
Reland "SkMixerColorFilter GPU impl" This reverts commit c2949ec67b92e455edd58e470564023c37df6e7a. Reason for revert: not related to crossfade Original change's description: > Revert "SkMixerColorFilter GPU impl" > > This reverts commit e80f7eb9d6a15d42827108700990291d3efb5995. > > Reason for revert: break crossfade in chrome roll? > > Original change's description: > > SkMixerColorFilter GPU impl > > > > Bug: skia: > > Change-Id: Ia1e25e0c99737d9720c17f92f0d76a1cb7897ea8 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/193163 > > Commit-Queue: Florin Malita <fmalita@chromium.org> > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > TBR=bsalomon@google.com,ethannicholas@google.com,fmalita@chromium.org,reed@google.com > > Change-Id: Ib9464fcabc649b95ba131146690d6208af728436 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/197760 > Reviewed-by: Mike Reed <reed@google.com> > Commit-Queue: Mike Reed <reed@google.com> TBR=bsalomon@google.com,ethannicholas@google.com,fmalita@chromium.org,reed@google.com Change-Id: Ie96e80e153aeab16c4ea35d5f1350372060228aa No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/c/skia/+/197763 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-03-05 15:03:20 +00:00
"$_src/gpu/effects/GrMixerEffect.fp",
Avoid multiplication by alpha in fragment shader when known to be 1. Implemented for image shaders, image draws, and gradient shaders. Reimplement GrFragmentProcessor::OverrideInput as GrOverrideInputFragmentProcessor.fp. It allows specification of whether the replacement input color should be a literal in the shader code or a uniform. For above use case use with literal white. Make key in variables in fp files work for 4f colors. Fix issue in CPP code gen from .fp where when + key vars that pushed multiple values into the shader key only skipped the first key value when the when condition is not true. Bug: skia:7722 Change-Id: Id7c865132d620e8cdea8b00f2a627103eef171ac Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201985 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2019-04-10 19:02:11 +00:00
"$_src/gpu/effects/GrOverrideInputFragmentProcessor.fp",
GPU support for SkColorFilters::HSLAMatrix Change-Id: I5b762811b44861fcedd2fa5c0e48a82718458605 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/232398 Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2019-10-23 15:44:22 +00:00
"$_src/gpu/effects/GrRGBToHSLFilterEffect.fp",
converted GrRRectBlurEffect to SkSL Bug: skia: Change-Id: Ifd192db07e02d69d445277a361760ce4a452f603 Reviewed-on: https://skia-review.googlesource.com/87441 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2017-12-20 17:00:11 +00:00
"$_src/gpu/effects/GrRRectBlurEffect.fp",
harmonize rewrite-includes and gn-format checks The CheckGeneratedFiles bot only required rewriting .gn files, while the presubmit wants both .gn and .gni files. It also appears that the #includes rewrite script runs on both the presubmit and CheckGeneratedFiles bots. These presubmits run on the CQ before landing right? If so, no need for them in the CheckGeneratedFIles bot at all. And of course, format .gni files. Change-Id: Icd4526d62f85088862ad93566cc9ace11dc3e33f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/281505 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2020-04-03 15:59:37 +00:00
"$_src/gpu/effects/GrRectBlurEffect.fp",
"$_src/gpu/gradients/GrClampedGradientEffect.fp",
Implement dual interval gradients Adds a new colorizer implementation that supports gradients with two interpolation intervals. The two intervals can share a middle color to represent the usual 3-color gradient, or can have different colors to represent a hard stop at an arbitrary point. Bug: skia: Change-Id: I8c73705e83b99e28ad5c834230ced4e3b7b9d1c4 Reviewed-on: https://skia-review.googlesource.com/150700 Commit-Queue: Michael Ludwig <michaelludwig@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-09-12 19:23:33 +00:00
"$_src/gpu/gradients/GrDualIntervalGradientColorizer.fp",
Reland "Base Gradient FP Refactor" This reverts commit 1ea5656a285bcfef445d6f69eaab477e68595b54. Reason for revert: Fixed google3 build failure Original change's description: > Revert "Base Gradient FP Refactor" > > This reverts commit 10f7a1e07554a362aef979d32ba288a009bdff90. > > Reason for revert: broke google3 roll > Original change's description: > > Base Gradient FP Refactor > > > > -- > > > > Redefines how gradients will be written in the GPU back-end: > > > > They are split into three fragment processor components: master, layout, and colorizer. > > The layout FP is responsible for converting the fragment position into an interpolant value, t. > > Each high-level gradient--such as linear, radial, etc.--are implemented solely in a layout FP. > > The colorizer FP is responsible for converting t into a color. > > The master FP invokes the layout, clamps t into the proper domain, and then invokes the colorizer. > > GrGradientShader provides factory functions to create FP graphs from SkGradientShader instances. > > This pattern is documented in gpu/gradients/README.md. > > > > Goals for current CL > > ==================== > > > > Outline the FP components by providing .fp implementations for the simplest gradients. > > Defines a two-color single interval colorizer and a linear gradient layout, and the master effect. > > A MakeLinear() factory function is provided that can convert SkGradientShaders that fit these constraints. > > SkLinearGradient first attempts to use the new system, falling back to the original GrGradientEffect. > > > > Future CLs > > ========== > > > > To keep the CL reviews manageable, additional dependent CLs will be added that gradually replace past functionality. > > A CL for each layout will be defined. > > CLs for the different analytic colorizer cases and the textured gradient case will be defined. > > Once the new system supports all current layouts and colorizer capabilities, all old GPU gradient code will be removed. > > After this clean-up, analytic colorization can hopefully be expanded to reduce the usage of textured gradients. > > > > Bug: skia: > > Change-Id: Iafe7b8b4071491a71c473babcd7bedda659150c1 > > Reviewed-on: https://skia-review.googlesource.com/148120 > > Commit-Queue: Michael Ludwig <michaelludwig@google.com> > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > TBR=bsalomon@google.com,michaelludwig@google.com > > Change-Id: Ib735e323795ac8874cb00b007a915786b50517a6 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/153600 > Reviewed-by: Cary Clark <caryclark@google.com> > Commit-Queue: Cary Clark <caryclark@google.com> TBR=bsalomon@google.com,caryclark@google.com,michaelludwig@google.com Change-Id: Ibf6ffbcb1af0dfbdac7317151aeb08f18f84c7fd No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/153887 Commit-Queue: Michael Ludwig <michaelludwig@google.com> Reviewed-by: Michael Ludwig <michaelludwig@google.com>
2018-09-12 19:22:16 +00:00
"$_src/gpu/gradients/GrLinearGradientLayout.fp",
Implement radial gradient layout Adds a radial gradient FP in the same vein as the prior linear gradient FP. It updates SkRadialGradient to try and use the new system before falling back to the original GPU gradient code. Bug: skia: Change-Id: I0739832beeae18d0a7178ada44014d7885478031 Reviewed-on: https://skia-review.googlesource.com/148803 Commit-Queue: Michael Ludwig <michaelludwig@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-09-12 19:22:37 +00:00
"$_src/gpu/gradients/GrRadialGradientLayout.fp",
harmonize rewrite-includes and gn-format checks The CheckGeneratedFiles bot only required rewriting .gn files, while the presubmit wants both .gn and .gni files. It also appears that the #includes rewrite script runs on both the presubmit and CheckGeneratedFiles bots. These presubmits run on the CQ before landing right? If so, no need for them in the CheckGeneratedFIles bot at all. And of course, format .gni files. Change-Id: Icd4526d62f85088862ad93566cc9ace11dc3e33f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/281505 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2020-04-03 15:59:37 +00:00
"$_src/gpu/gradients/GrSingleIntervalGradientColorizer.fp",
Implement sweep gradient layout Add an FP that implements the sweep gradient effect and updates SkSweepGradient to use the new system if possible. Bug: skia: Change-Id: I3f65da01afafae54c45848a6a78fd758f65eb4a6 Reviewed-on: https://skia-review.googlesource.com/148806 Commit-Queue: Michael Ludwig <michaelludwig@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-09-12 19:22:50 +00:00
"$_src/gpu/gradients/GrSweepGradientLayout.fp",
Reland "Base Gradient FP Refactor" This reverts commit 1ea5656a285bcfef445d6f69eaab477e68595b54. Reason for revert: Fixed google3 build failure Original change's description: > Revert "Base Gradient FP Refactor" > > This reverts commit 10f7a1e07554a362aef979d32ba288a009bdff90. > > Reason for revert: broke google3 roll > Original change's description: > > Base Gradient FP Refactor > > > > -- > > > > Redefines how gradients will be written in the GPU back-end: > > > > They are split into three fragment processor components: master, layout, and colorizer. > > The layout FP is responsible for converting the fragment position into an interpolant value, t. > > Each high-level gradient--such as linear, radial, etc.--are implemented solely in a layout FP. > > The colorizer FP is responsible for converting t into a color. > > The master FP invokes the layout, clamps t into the proper domain, and then invokes the colorizer. > > GrGradientShader provides factory functions to create FP graphs from SkGradientShader instances. > > This pattern is documented in gpu/gradients/README.md. > > > > Goals for current CL > > ==================== > > > > Outline the FP components by providing .fp implementations for the simplest gradients. > > Defines a two-color single interval colorizer and a linear gradient layout, and the master effect. > > A MakeLinear() factory function is provided that can convert SkGradientShaders that fit these constraints. > > SkLinearGradient first attempts to use the new system, falling back to the original GrGradientEffect. > > > > Future CLs > > ========== > > > > To keep the CL reviews manageable, additional dependent CLs will be added that gradually replace past functionality. > > A CL for each layout will be defined. > > CLs for the different analytic colorizer cases and the textured gradient case will be defined. > > Once the new system supports all current layouts and colorizer capabilities, all old GPU gradient code will be removed. > > After this clean-up, analytic colorization can hopefully be expanded to reduce the usage of textured gradients. > > > > Bug: skia: > > Change-Id: Iafe7b8b4071491a71c473babcd7bedda659150c1 > > Reviewed-on: https://skia-review.googlesource.com/148120 > > Commit-Queue: Michael Ludwig <michaelludwig@google.com> > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > TBR=bsalomon@google.com,michaelludwig@google.com > > Change-Id: Ib735e323795ac8874cb00b007a915786b50517a6 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/153600 > Reviewed-by: Cary Clark <caryclark@google.com> > Commit-Queue: Cary Clark <caryclark@google.com> TBR=bsalomon@google.com,caryclark@google.com,michaelludwig@google.com Change-Id: Ibf6ffbcb1af0dfbdac7317151aeb08f18f84c7fd No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/153887 Commit-Queue: Michael Ludwig <michaelludwig@google.com> Reviewed-by: Michael Ludwig <michaelludwig@google.com>
2018-09-12 19:22:16 +00:00
"$_src/gpu/gradients/GrTiledGradientEffect.fp",
harmonize rewrite-includes and gn-format checks The CheckGeneratedFiles bot only required rewriting .gn files, while the presubmit wants both .gn and .gni files. It also appears that the #includes rewrite script runs on both the presubmit and CheckGeneratedFiles bots. These presubmits run on the CQ before landing right? If so, no need for them in the CheckGeneratedFIles bot at all. And of course, format .gni files. Change-Id: Icd4526d62f85088862ad93566cc9ace11dc3e33f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/281505 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Mike Klein <mtklein@google.com>
2020-04-03 15:59:37 +00:00
"$_src/gpu/gradients/GrTwoPointConicalGradientLayout.fp",
"$_src/gpu/gradients/GrUnrolledBinaryGradientColorizer.fp",
rewrote GrAlphaThresholdFragmentProcessor in sksl Bug: skia: Change-Id: I641b206fc3bc19ac190ad94ee755ab9e1caab9b3 Reviewed-on: https://skia-review.googlesource.com/21341 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2017-07-05 20:19:09 +00:00
]
Reference in New Issue Copy Permalink