AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
0378307904
skia2/gn/sksl_tests.gni

742 lines
29 KiB
Plaintext
Raw Normal View History

Generate SkSL golden output files from test inputs during the build. Golden SkSL outputs are intended to eventually replace the majority of our unit tests, since they can automatically update themselves when we change implementation details of the compiler. If you change the compiler output without updating the Golden files, the CheckGeneratedFiles housekeeper will be triggered. Set `skia_compile_processors` or `skia_compile_sksl_tests` to true in your GN args to regenerate them. Almost all of the tests from SkSLFPTests.cpp and SkSLGLSLTests.cpp can be migrated into separate unit-test .fp/.sksl files in a followup CL. hcm@ has signed off on removing the copyright boilerplate preamble from our unit test files. Change-Id: I9e24a944bbac8f8efd62c92481b022a0b1ecdd0b Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316336 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2020-09-14 14:21:44 +00:00
# Copyright 2020 Google LLC
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
Clean up SkSL test compilation in preparation for Metal support. Now uses a GN template to avoid copy-pasting the same logic for each type of test we want to perform, and the same file to be compiled in more than one way at a time via an extra flag to compile_sksl_tests.py. Change-Id: I8aadedeb140d78d58a345a2bac0da3d9c77e9a19 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319347 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 20:42:09 +00:00
sksl_error_tests = [
Rename Runtime Effect-compatible ES2 error tests to .rts. This is useful because it will allow these tests to be supported in Android CTS, where only Runtime Effects are API-accessible. This CL updates the C++ test harness so that .rts files in the error/ directory are found, and tweaks error tests as necessary to make them Runtime Effect-compatible. For instance, Runtime Effects enforce the parameters on main(), which adds extra errors that we don't want. And some error tests require ES3 (e.g. array constructors) and so those tests remain as .sksl files. In this CL, only tests beginning with A are updated. The remaining tests will be updated in followup CLs. Change-Id: I70b064df4f0b3ed02d6bc8cc9add7ee844a78691 Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522424 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2022-03-21 14:56:03 +00:00
"/sksl/errors/ArgumentCountMismatch.rts",
"/sksl/errors/ArgumentMismatch.rts",
"/sksl/errors/ArgumentModifiers.rts",
Reject array constructors with the wrong number of elements. We now catch this error at IR generation time; previously we'd send it to the driver (where it would fail to compile). Change-Id: I45890214ffa164be1c0f359320f942bc4dc479ca Bug: skia:11265 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365697 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-03 20:11:18 +00:00
"/sksl/errors/ArrayConstructorElementCount.sksl",
Rename Runtime Effect-compatible ES2 error tests to .rts. This is useful because it will allow these tests to be supported in Android CTS, where only Runtime Effects are API-accessible. This CL updates the C++ test harness so that .rts files in the error/ directory are found, and tweaks error tests as necessary to make them Runtime Effect-compatible. For instance, Runtime Effects enforce the parameters on main(), which adds extra errors that we don't want. And some error tests require ES3 (e.g. array constructors) and so those tests remain as .sksl files. In this CL, only tests beginning with A are updated. The remaining tests will be updated in followup CLs. Change-Id: I70b064df4f0b3ed02d6bc8cc9add7ee844a78691 Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522424 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2022-03-21 14:56:03 +00:00
"/sksl/errors/ArrayIndexOutOfRange.rts",
Improve array-indexing tests. Previously, we didn't have tests which leveraged constant-evaluation of array indexing (because we didn't support it), and our test files commingled constant-indexing into vectors with constant-indexing into arrays. The test files now separate vector- and array-handling into separate tests, and a ton of new cases have been added to ArrayFolding. The ArrayFolding tests now require constant-evaluation of array indexing, so they fail in this CL, but will be fixed in the followup CL. Change-Id: I3b663e743d97d6db80627bc9b7808f88c99917a7 Bug: skia:12472 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/469528 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-11-10 14:58:32 +00:00
"/sksl/errors/ArrayInlinedIndexOutOfRange.sksl",
Rename Runtime Effect-compatible ES2 error tests to .rts. This is useful because it will allow these tests to be supported in Android CTS, where only Runtime Effects are API-accessible. This CL updates the C++ test harness so that .rts files in the error/ directory are found, and tweaks error tests as necessary to make them Runtime Effect-compatible. For instance, Runtime Effects enforce the parameters on main(), which adds extra errors that we don't want. And some error tests require ES3 (e.g. array constructors) and so those tests remain as .sksl files. In this CL, only tests beginning with A are updated. The remaining tests will be updated in followup CLs. Change-Id: I70b064df4f0b3ed02d6bc8cc9add7ee844a78691 Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522424 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2022-03-21 14:56:03 +00:00
"/sksl/errors/ArrayNegation.rts",
"/sksl/errors/ArrayOfInvalidSize.rts",
"/sksl/errors/ArrayOfVoid.rts",
"/sksl/errors/ArrayPlus.rts",
"/sksl/errors/ArrayReturnTypes.rts",
"/sksl/errors/ArraySplitDimensions.rts",
"/sksl/errors/ArraySplitDimensionsInFuncBody.rts",
"/sksl/errors/ArraySplitDimensionsInFuncDecl.rts",
"/sksl/errors/ArraySplitDimensionsInStruct.rts",
"/sksl/errors/ArrayTooManyDimensions.rts",
"/sksl/errors/ArrayTooManyDimensionsInFuncBody.rts",
"/sksl/errors/ArrayTooManyDimensionsInFuncDecl.rts",
"/sksl/errors/ArrayTooManyDimensionsInStruct.rts",
"/sksl/errors/ArrayTypeTooManyDimensions.rts",
"/sksl/errors/ArrayTypeTooManyDimensionsInFuncBody.rts",
"/sksl/errors/ArrayTypeTooManyDimensionsInFuncDecl.rts",
"/sksl/errors/ArrayTypeTooManyDimensionsInStruct.rts",
"/sksl/errors/ArrayUnspecifiedDimensions.rts",
"/sksl/errors/AssignmentTypeMismatch.rts",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/BadCaps.sksl",
Rename ES2 error tests starting with 'B' to .rts. A few tests received minor tweaks to make them Runtime Effect-friendly. Change-Id: Icbcedb84b7882e42f21425b2d40d7819705c359e Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522918 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-03-21 16:03:15 +00:00
"/sksl/errors/BadConstInitializers.rts",
"/sksl/errors/BadFieldAccess.rts",
"/sksl/errors/BadIndex.rts",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/BadModifiers.sksl",
Rename ES2 error tests starting with 'B' to .rts. A few tests received minor tweaks to make them Runtime Effect-friendly. Change-Id: Icbcedb84b7882e42f21425b2d40d7819705c359e Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522918 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-03-21 16:03:15 +00:00
"/sksl/errors/BadOctal.rts",
"/sksl/errors/BinaryInvalidType.rts",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/BinaryTypeCoercion.sksl",
Rename ES2 error tests starting with 'B' to .rts. A few tests received minor tweaks to make them Runtime Effect-friendly. Change-Id: Icbcedb84b7882e42f21425b2d40d7819705c359e Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522918 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-03-21 16:03:15 +00:00
"/sksl/errors/BinaryTypeMismatch.rts",
"/sksl/errors/BitShiftFloat.rts",
"/sksl/errors/BitShiftFloatMatrix.rts",
"/sksl/errors/BitShiftFloatVector.rts",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/BooleanArithmetic.sksl",
Rename ES2 error tests starting with 'B' to .rts. A few tests received minor tweaks to make them Runtime Effect-friendly. Change-Id: Icbcedb84b7882e42f21425b2d40d7819705c359e Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522918 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-03-21 16:03:15 +00:00
"/sksl/errors/BreakOutsideLoop.rts",
Rename ES2 error tests from 'C' through 'G' to .rts. A few tests received minor tweaks to make them Runtime Effect-friendly. Change-Id: I9b4f66b0974c41d38324dfbb31ac9849338f600a Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/523186 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Arman Uguray <armansito@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-03-21 21:42:49 +00:00
"/sksl/errors/CallNonFunction.rts",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/CanExitWithoutReturningValue.sksl",
Rename ES2 error tests from 'C' through 'G' to .rts. A few tests received minor tweaks to make them Runtime Effect-friendly. Change-Id: I9b4f66b0974c41d38324dfbb31ac9849338f600a Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/523186 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Arman Uguray <armansito@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-03-21 21:42:49 +00:00
"/sksl/errors/ComparisonDimensional.rts",
"/sksl/errors/ConstructorArgumentCount.rts",
"/sksl/errors/ConstructorTypeMismatch.rts",
"/sksl/errors/ContinueOutsideLoop.rts",
"/sksl/errors/DivideByZero.rts",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/DoTypeMismatch.sksl",
Rename ES2 error tests from 'C' through 'G' to .rts. A few tests received minor tweaks to make them Runtime Effect-friendly. Change-Id: I9b4f66b0974c41d38324dfbb31ac9849338f600a Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/523186 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Arman Uguray <armansito@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-03-21 21:42:49 +00:00
"/sksl/errors/DuplicateFunction.rts",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/DuplicateOutput.sksl",
Rename ES2 error tests from 'C' through 'G' to .rts. A few tests received minor tweaks to make them Runtime Effect-friendly. Change-Id: I9b4f66b0974c41d38324dfbb31ac9849338f600a Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/523186 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Arman Uguray <armansito@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-03-21 21:42:49 +00:00
"/sksl/errors/DuplicateSymbol.rts",
"/sksl/errors/EmptyArray.rts",
"/sksl/errors/EmptyStruct.rts",
"/sksl/errors/ErrorsInDeadCode.rts",
"/sksl/errors/FloatRemainder.rts",
Simplify for init-stmts at the IR level. Most backends don't like init-stmts with multiple VarDeclarations inside them, so we no longer emit IR that does this. This lets us avoid doing backend-level fixups. Change-Id: Ide839de18953a73e0f9c7a690df59a7bc3523f89 Bug: skia:11860 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/398221 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-04-19 18:56:49 +00:00
"/sksl/errors/ForInitStmt.sksl",
Rename ES2 error tests from 'C' through 'G' to .rts. A few tests received minor tweaks to make them Runtime Effect-friendly. Change-Id: I9b4f66b0974c41d38324dfbb31ac9849338f600a Bug: skia:13042 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/523186 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Arman Uguray <armansito@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-03-21 21:42:49 +00:00
"/sksl/errors/ForTypeMismatch.rts",
"/sksl/errors/FunctionParameterOfVoid.rts",
"/sksl/errors/GenericArgumentMismatch.rts",
Honor lowp/mediump/highp precision qualifiers in IRGenerator. This CL does not update the DSLParser to honor these precision qualifiers; that will be done in a followup. Change-Id: Ib629bc99c0e6c7afb550a381d4e3b6ccc26aa64e Bug: skia:12248 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/436337 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-08-04 20:26:47 +00:00
"/sksl/errors/PrecisionQualifiersDisallowed.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/IfTypeMismatch.sksl",
"/sksl/errors/InVarWithInitializerExpression.sksl",
Add test for incomplete expressions. The ExpressionStatement currently eliminates dangling references without reporting them as an error. This happens due to optimization; these expressions (being meaningless) have no side effects, and so the optimizer replaces them with Nop. When the optimizer is off, these programs trigger an assert: https://osscs.corp.google.com/skia/skia/+/main:src/sksl/SkSLAnalysis.cpp;l=582;drc=e7a953524787e3bd0c437ec52de4e40986689825 A followup CL will fix ExpressionStatements so that they report incomplete expressions as an error. Change-Id: Ica49166032e670749fc1b4e7a869fbab03364d4f Bug: skia:12472 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/469524 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-11-09 21:25:46 +00:00
"/sksl/errors/IncompleteExpression.sksl",
"/sksl/errors/IncompleteFunctionCall.sksl",
Add test for structs/interface-blocks with invalid member names. Structs already handled this appropriately, but interface blocks did not guard against naming their member variables built-in type names like "float" or "bool". Change-Id: I12ec054b3f158b83e35031449cf2a088ff8d0dc2 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/489596 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-12-28 19:58:36 +00:00
"/sksl/errors/InterfaceBlockMemberReservedName.sksl",
Add test demonstrating struct/interface-block name conflict. Structs and interface blocks allow a trailing identifier which is added to the symbol table. This identifier should be prohibited from overlapping built-in types; at present, this is not checked. Add a test demonstrating the issue. Change-Id: I99aa915c1715c468cc369c97b7f12e031b86ea4a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/489496 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-12-28 18:46:27 +00:00
"/sksl/errors/InterfaceBlockReservedName.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/InterfaceBlockScope.sksl",
"/sksl/errors/InterfaceBlockStorageModifiers.sksl",
"/sksl/errors/InterfaceBlockWithNoMembers.sksl",
Fix assertion when calling a built-in function at global scope. The fuzzer invented a much more elaborate example, but I was able to winnow it down to a simple otherwise-normal test case. This also fixes a latent DSL bug; DSL functions were not updating the list of referenced intrinsics, so the compiler might emit finished programs that called built-in functions that didn't exist in the code. Change-Id: I095bb566b9db9f87cbe9460732c300b7973eb112 Bug: oss-fuzz:37659 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/442325 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-08-27 16:37:27 +00:00
"/sksl/errors/IntrinsicInGlobalVariable.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/InvalidAssignment.sksl",
"/sksl/errors/InvalidOutParams.sksl",
"/sksl/errors/InvalidToken.sksl",
"/sksl/errors/InvalidUnary.sksl",
Add permittedLayoutFlags to checkModifiers For now, just use this to prevent *any* layout qualifiers from appearing on functions, or their parameters. Bug: skia:11301 Change-Id: I05d8118c7121048c6ef49695a54e3714a8f8687e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/376796 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-02-26 16:52:59 +00:00
"/sksl/errors/LayoutInFunctions.sksl",
Prevent 'binding' and 'set' on struct/interface block fields I should have realized the fuzzer would find this assert when I added it. Now the front-end rejects these layout qualifiers on both struct fields and interface block fields. LayoutInInterfaceBlock.sksl is a reformatted version of the fuzzer input. LayoutInStruct is hand-crafted to trigger the same failure on a different code path. Both would previously assert in the SPIRV generator. Now, neither one gets that far. Bug: oss-fuzz:41347 Change-Id: Iff69d8f5482da7b772e9331c4fd2d58e89813c46 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/476396 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-11-24 19:12:41 +00:00
"/sksl/errors/LayoutInInterfaceBlock.sksl",
"/sksl/errors/LayoutInStruct.sksl",
Add flags for all layout qualifiers, check for duplicates Now, even if a qualifier has a default value, we will know that it appeared in the text. We can use that to check for redundant qualifiers (as is being done here), and in the IR generator to prevent any use of certain qualifiers, depending on context. (eg, runtime effects, wrong shader stage, on a parameter declaration, etc.) Bug: skia:11301 Change-Id: I2cd6ad35c2b4c4d6f87ade97e80aea84dc16ee4b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/374616 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-02-23 17:54:22 +00:00
"/sksl/errors/LayoutRepeatedQualifiers.sksl",
Add tests for matrix constant-expressions. We should support constant-expressions involving matrices (GLSL ES2 does, WebGL does). We currently don't. We do properly report out-of- range indexing, but we don't optimize away valid matrix index expressions or allow matrices to be indexed in a constant-expression context. Change-Id: If58aa4c5f15abef421a412957072f3617b4176df Bug: skia:12472 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/469818 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-11-10 19:02:18 +00:00
"/sksl/errors/MatrixIndexOutOfRange.sksl",
"/sksl/errors/MatrixInlinedIndexOutOfRange.sksl",
Add support for matrix-to-vector conversions in SkSL. GLSL supports casting vec4 into mat2 and vice versa, so SkSL should have equivalent support. This CL allows the Compound constructor to take a matrix as input, and fixes up backends to do the right thing when a matrix shows up in the compound-constructor path. Change-Id: I13289ad0a27ba59bddc3706093820594efebc693 Bug: skia:12067 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426003 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-07-09 16:41:55 +00:00
"/sksl/errors/MatrixToVectorCast3x3.sksl",
Shore up matrix/vector conversion tests. The tests now check bool4-mat2 conversions, which fortunately do work, and the vector-to-matrix tests include int and bool conversions as well. Change-Id: I971271838a93081b9258deb7c1d13b7732fb2440 Bug: skia:12067 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426757 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-07-10 16:48:51 +00:00
"/sksl/errors/MatrixToVectorCastBoolean.sksl",
Add support for mat2-to-ivec4 conversions in SkSL. The fuzzer quickly discovered that the newly introduced mat2-to-vec4 conversion code did not account for integer vectors. We now handle `ivec4(mat2)` casts properly. This required some non-trivial restructuring of the logic, but in the vast majority of cases, the types will match and the end result will be identical. Change-Id: If07c2fe4b4345bd767384b1802374910f65cd3f0 Bug: oss-fuzz:35998 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426756 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-07-10 15:45:29 +00:00
"/sksl/errors/MatrixToVectorCastInteger.sksl",
Add support for matrix-to-vector conversions in SkSL. GLSL supports casting vec4 into mat2 and vice versa, so SkSL should have equivalent support. This CL allows the Compound constructor to take a matrix as input, and fixes up backends to do the right thing when a matrix shows up in the compound-constructor path. Change-Id: I13289ad0a27ba59bddc3706093820594efebc693 Bug: skia:12067 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426003 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-07-09 16:41:55 +00:00
"/sksl/errors/MatrixToVectorCastTooSmall.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/MismatchedNumbers.sksl",
Test: duplicate fields in the same struct allowed As @johnstiles suggested I add the test first and the fix after. bug: skia:12712 Change-Id: I9316cf40f71e756fc1730ee630bc0d0377f200d6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/491936 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Julia Lavrova <jlavrova@google.com>
2022-01-06 16:12:51 +00:00
"/sksl/errors/MultipleFields.sksl",
Test: Interface blocks allow duplicate fields bug: skia:12793 Change-Id: Ie47b1df381779ed24cab8b05b1ee6947bda82516 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/492396 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Julia Lavrova <jlavrova@google.com>
2022-01-07 15:05:55 +00:00
"/sksl/errors/MultipleFieldsInInterfaceBlocks.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/ModifiersInStruct.sksl",
Add $es3 modifier to SkSL. This modifier is currently allowed on built-in functions only. The presence of this modifier will be used to indicate intrinsics which are ES3-specific (and therefore, not allowed in user code under typical circumstances). Change-Id: Ice6be8d9d1b2bf0c8f07f2a89f335bb2f90f6681 Bug: skia:12202 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/439057 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-08-13 03:06:24 +00:00
"/sksl/errors/NoES3ModifierInUserCode.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/OpaqueTypeAssignment.sksl",
"/sksl/errors/OpaqueTypeConstruction.sksl",
"/sksl/errors/OpaqueTypeInArray.sksl",
"/sksl/errors/OpaqueTypeInInterfaceBlock.sksl",
"/sksl/errors/OpaqueTypeInStruct.sksl",
"/sksl/errors/OpenArray.sksl",
"/sksl/errors/Ossfuzz26700.sksl",
Fix fuzzer-discovered error with ~ prefix on literals. The expression `~123` was making a PrefixExpression of type $intLiteral. It should be converted to type `int` when the ~ prefix is applied. This change also changes the output from oss-fuzz:27614. Both programs are essentially nonsense expressions with no real behavior, so this is fine. Change-Id: I586be149ce95136fabee72fdd3473814d54948cf Bug: oss-fuzz:31410 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/376620 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:32:06 +00:00
"/sksl/errors/Ossfuzz27614.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/Ossfuzz27650.sksl",
"/sksl/errors/Ossfuzz27663.sksl",
Fix various fuzzer-generated tests. Two of the tests are now (correctly) detected as invalid code, but were previously checked into /shared/ because they compiled when the fuzzer first reported them (that is, after the crash was fixed). These have been moved into the /errors/ test folder. One of the tests was only generating an error because its main function was named `a` instead of `main`, so I renamed it to `main`. Change-Id: I1a2346fb16e304b0c66ff377a3f9bf7e7ee89ba9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/394899 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-09 21:20:35 +00:00
"/sksl/errors/Ossfuzz28050.sksl",
"/sksl/errors/Ossfuzz29444.sksl",
Fix fuzzer-discovered errors in SkSL parser. The previous change caused varDeclarations() to sometimes return an expression-statement. This only made sense in the context of being called from Parser::statement(). Other places which called varDeclarations() expect vardecls and nothing else. Change-Id: I562657cadfa20dcd77b527f2dc43dca0c6bf389f Bug: oss-fuzz:29845 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358528 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-25 18:49:05 +00:00
"/sksl/errors/Ossfuzz29845.sksl",
Fix fuzzer-discovered error with variable scoping. In GLSL and SkSL, control statements don't require explicit braces around single-statement children. That is, the `match = true` child statement here doesn't need to be braced. if (condition) match = true; Because there are no braces, we never create a Block or a dedicated SymbolTable here. This is normally not a problem, but the fuzzer discovered that it can dump things into the symbol table inside a child statement: if (condition) int newSymbol; This becomes problematic because the symbol name now outlives its block. This means `newSymbol` can be referred to later, which should be illegal (and can cause the optimizer to blow up since the structure is bogus). There doesn't seem to be any reason to allow this code to compile; the user can add an explicit scope here to make it reasonable, and it's (almost) meaningless to declare a symbol that's instantly going to fall out of scope. This code is now rejected with an error message. Change-Id: I44778e5b59652d345b10eecd4c88efbf7d86a5e0 Bug: oss-fuzz:29849 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358960 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-26 15:13:58 +00:00
"/sksl/errors/Ossfuzz29849.sksl",
Fix fuzzer-discovered error with ~ prefix on literals. The expression `~123` was making a PrefixExpression of type $intLiteral. It should be converted to type `int` when the ~ prefix is applied. This change also changes the output from oss-fuzz:27614. Both programs are essentially nonsense expressions with no real behavior, so this is fine. Change-Id: I586be149ce95136fabee72fdd3473814d54948cf Bug: oss-fuzz:31410 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/376620 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:32:06 +00:00
"/sksl/errors/Ossfuzz31410.sksl",
Fix fuzzer-discovered error with inlining. In http://review.skia.org/375776, an optimization was added to the Inliner, causing it to skip generation of unnecessary temporary variables. The fuzzer immediately discovered a flaw in this logic: the "unnecessary" variable was actually used in the rare case that a function failed to actually return a value. The inliner didn't detect this case. Of course, this isn't a valid program either, so now we report the error and cleanly fail. Change-Id: I1f201cfd33f45cace3be93765a4e214e43a46e69 Bug: oss-fuzz:31469, oss-fuzz:31525 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/377101 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-03-01 15:08:08 +00:00
"/sksl/errors/Ossfuzz31469.sksl",
Add regression test for oss-fuzz:32156. The fuzzer found that it could overflow an int via a properly-crafted constant-fold expression, leading to a UBSAN error. Constant-fold expressions now guard against overflow (http://review.skia.org/413138) and UBSAN is no longer triggered. Change-Id: I07dba41e87bb9ceed37b84ec6b8922defbdc6550 Bug: oss-fuzz:32156, skia:12050 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/413836 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-05-29 15:23:07 +00:00
"/sksl/errors/Ossfuzz32156.sksl",
Fix fuzzer-discovered error with variable declarations. As soon as a single VarDeclaration is successfully created, its Variable is added to the current symbol table. However, if a variable-declaration line declared several variables in a row, we would stop if ANY of the declarations contained an error and discard the entire statement, but would continue processing the rest of the program. This left us in a position where some Variables existed in the SymbolTable with valid, reachable names, but their corresponding VarDeclaration statement had been thrown away as erroneous. Since Variables point back to VarDeclarations for their initialValues, this gave us a stale pointer. Any future reference to that variable name which could trigger an access to its initialValue would read from this dead pointer. This CL fixes the conversion of VarDeclarations so that we no longer throw away any VarDeclarations associated with a successfully-parsed Variable. Change-Id: If8ec3c160933e48a0e1f36414234b3a849d8978c Bug: oss-fuzz:32587 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/389636 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-29 13:38:59 +00:00
"/sksl/errors/Ossfuzz32587.sksl",
Add regression test for oss-fuzz finding. The actual fix happened at prior CL http://review.skia.org/392197, which reworked how vector-cast constructors function. Change-Id: Ifb71ec913b349e65d38458dc615441e7a73efddc Bug: oss-fuzz:32851 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/392841 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-04-05 18:45:14 +00:00
"/sksl/errors/Ossfuzz32851.sksl",
Fix assertion discovered by fuzzer. We now stop processing a var-declaration if its array-size expression is invalid. Previously, we'd pass a null array-size expression into convertVar, which would assert (but would fail cleanly afterwards). Change-Id: I976f3326e32afbc7045a86d73c0dcb28f418a6f4 Bug: oss-fuzz:37457 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/441079 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-08-21 21:13:11 +00:00
"/sksl/errors/Ossfuzz37457.sksl",
Fix const function-parameter assertion discovered by fuzzer. During constant-folding, we baked in an assertion stating that any const-typed variable reference ought to have an initial value, because you can't declare a const variable without assigning a value. However, function parameters are an exception to this rule! They are variable references and are allowed to be const, but will not have an initial value. (In this case, `const` just means you can't alter the value.) In this case, all we needed to do was remove the assertion; we already treated this case defensively and with the appropriate care. Change-Id: I61242c6d08c59886c6992898f195771e6334f2b4 Bug: oss-fuzz:37465 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/441239 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-08-23 17:52:17 +00:00
"/sksl/errors/Ossfuzz37465.sksl",
Report intermediate expressions as errors in For next-exprs. We weren't coercing the expression because we don't care about its type, but that allowed intermediate-expressions to pass through without reporting an error. Now we coerce the expression to its present type, which will always fail if the type is disallowed and succeed otherwise. Change-Id: Ic0de0d17f0f5d56360575efe992ce4d74dec2a5a Bug: oss-fuzz:37620 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/441876 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-08-25 16:09:16 +00:00
"/sksl/errors/Ossfuzz37620.sksl",
Fixed DSLParser crash with invalid swizzle In response to a non-identifier token after a dot, DSLParser would attempt to swizzle a zero-length field and fail an assertion. The same basic code path exists in the old compiler, but the resulting parse error causes the process to abort before it attempts to process the zero-length swizzle. Bug: oss-fuzz:38106 Change-Id: Ifd997ce1d564b5f6ef0a9a785d8d9e254785e600 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/446185 Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-09-09 13:32:13 +00:00
"/sksl/errors/Ossfuzz38106.sksl",
Reland "Fixed DSL assertion error on source files containing nulls" This is a reland of db38ad7b142e44aa4718d7c71d47f680d247cff0 Original change's description: > Fixed DSL assertion error on source files containing nulls > > The assertion was there to make sure we weren't running off the end of > the source, but naturally fails in the presence of legitimate embedded > nulls. > > Change-Id: I3b80499e9b182c9ea046c479f35d7a965d548401 > Bug: oss-fuzz:38107 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/447182 > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: oss-fuzz:38107 Change-Id: Idb1a6b7c64d2bb954edadae828d6de808158fd3f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/448660 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-09-10 17:57:48 +00:00
"/sksl/errors/Ossfuzz38107.sksl",
Fixed DSLParser assertion error uncovered by fuzzer Bug: oss-fuzz:38108 Change-Id: I0e055d837923f00b982bc395dbf29b6ff59a3b21 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/448896 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-09-17 20:10:29 +00:00
"/sksl/errors/Ossfuzz38108.sksl",
Fixed duplicate function definition error discovered by fuzzer Bug: oss-fuzz:38140 Change-Id: I76a1b3ef8289b3089192d043d173677c00741a54 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/445836 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-09-10 15:57:46 +00:00
"/sksl/errors/Ossfuzz38140.sksl",
Fix for-statement assertion detected by the fuzzer. The fuzzer found that the `DetectVarDeclarationWithoutScope` check was placed too late in the function, and could be skipped over by for-loops containing multiple variables. This was caught in ForStatement::Make, which mirrors the Convert postconditions with matching assertions. Change-Id: I6e9d97c7c9ca969aba65e601bbcd9fe676105838 Bug: oss-fuzz:38560 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/448116 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-09-13 12:55:40 +00:00
"/sksl/errors/Ossfuzz38560.sksl",
Fixed DSLParser unary expression error handling Missed a case when eliminating optional/wrapper in an earlier CL. Change-Id: If7f80ea6e2172acadf7b0087fe1a05853ccae445 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/449838 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-09-17 16:52:55 +00:00
"/sksl/errors/Ossfuzz38865.sksl",
Fixed DSLParser error uncovered by ossfuzz Missed one more case of Optional<Wrapper<Expression>>. This should be the last one. Bug: oss-fuzz:38944 Change-Id: Ic7f790cd99e2a3ee1c3874cc767a4702265d1723 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/450476 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2021-09-20 14:18:58 +00:00
"/sksl/errors/Ossfuzz38944.sksl",
Fixed fuzzer-discovered bug with interface blocks While I was in this code, I realized that the setVariable method of InterfaceBlock was unused and there was therefore no reason to be storing a pointer instead of a reference. Bug: oss-fuzz:39000 Change-Id: If7505ba87f4060370cfd32ca2e30c76648965101 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/450446 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-09-21 13:18:47 +00:00
"/sksl/errors/Ossfuzz39000.sksl",
Fix for fuzzer-discovered error with negation. Yesterday's negation-related changes (http://review.skia.org/464123) exposed a flaw that the fuzzer was able to exploit. We were previously able to assume that `simplify_negation` would always return a non-null expression; in some cases, that is no longer true. Change-Id: Ia585232b0e35fafe0c642384a59ef94ce743ffd5 Bug: oss-fuzz:40427 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/464916 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-28 15:27:36 +00:00
"/sksl/errors/Ossfuzz40427.sksl",
Fix for fuzzer-discovered error with bitwise-not. A recent CL (http://review.skia.org/464121) made it an error to coerce a literal value to a type that cannot hold the value. The fuzzer found a case where we assumed type-coercion of a literal would always succeed, and failed to null-check the result. We now null-check the result. Change-Id: Id97c6016e56c20ef724028f71bbf4688dde3c064 Bug: oss-fuzz:40428 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/464919 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-10-28 15:57:16 +00:00
"/sksl/errors/Ossfuzz40428.sksl",
Detect and properly handle swizzles of out-of-range literal values. Change-Id: Ic30c48dce0cb0072f07defcdb0b9e60b94f50818 Bug: oss-fuzz:40479 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/465392 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-29 18:28:32 +00:00
"/sksl/errors/Ossfuzz40479.sksl",
Fix fuzzer-discovered error with no-op arithmetic. The fuzzer triggered this error in a strange way that involves parsing a TK_INVALID token. The fuzzer's original input used \xFF bytes in the shader text to do this. I replaced these with the ` character since it behaved the same, but allows our test inputs to remain basic ASCII. The root problem is that `cast_expression`, part of no-op arithmetic simplification, can now fail because expressions like `int(4000000000)` no longer get past Constructor::Convert. Previously we had assumed `cast_expression` could never return null; now we check its result for null before using it. Change-Id: I7335395bab0daf1f788b0c7c154904b2372ae13f Bug: oss-fuzz:40660 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/467316 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-11-03 14:15:18 +00:00
"/sksl/errors/Ossfuzz40660.sksl",
Fix fuzzer-discovered error with swizzles. Some paths through swizzle optimization would replace a swizzles with a constructor--e.g. `float3(1, 2, 3).y` would be replaced with `float(2)`. (Constructor::Convert was responsible for replacing this trivial constructor with the literal `2.0`.) The optimization code asserted that this replacement would succeed, but the fuzzer managed to construct a counterexample where the constructor rejected the value. Specifically, by nesting casts between int3 and float3, it found a case where Constructor::Convert returned null because the literal value was out of range for `int` types. This assertion didn't really add value so removing it was harmless. Constructor::Convert already reports an error when it fails, and null returns are handled properly throughout. Change-Id: I575d441ed90d6b696f6399941c3f6d84698794bc Bug: oss-fuzz:44045 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/499382 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-01-25 15:48:01 +00:00
"/sksl/errors/Ossfuzz44045.sksl",
Fix for fuzzer-discovered error with deeply-nested expressions. The fuzzer constructs a long, valid nonsense expression (x+x+x-x+x-x, etc.) which exceeds parse depth. At that point, the token stream points to a `+` token. The parser attempts to consume a new statement but stops in `unaryExpression`; this fails again, due to the max parse-depth, but doesn't consume a token. The parser continues trying to parse the statement, but stopping in `unaryExpression`, making no forward progress in an infinite loop. I've made a couple of changes as a result. - Exceeding the max parse depth now sets `fEncounteredFatalError`. - Encountering a fatal error causes block() to immediately halt. This actually undoes a few of the arbitrary changes from http://review.skia.org/506463 but not in a bad way. - `unaryExpression()` now consumes a token before checking parse-depth. - `structDeclaration()` had a similar issue where it could potentially fail without consuming any tokens; this is fixed as well. - Some unnecessarily-nested logic in ternaryExpression() was flattened while I tried to ensure that it always consumes a token. Change-Id: I52c2161965ffbcef1185761ca6897ec1cba5df89 Bug: oss-fuzz:44551 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/507436 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-02-11 13:36:33 +00:00
"/sksl/errors/Ossfuzz44551.sksl",
Add more fuzzer-discovered programs to error tests. These all stemmed from the same root cause, but are interesting and distinct enough to include in our error tests. Bug: oss-fuzz:44555, oss-fuzz:44557, oss-fuzz:44559, oss-fuzz:44561, oss-fuzz:44565 Change-Id: I22c1798809754b4b38c77ffbe369a97c64a2f60e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/507636 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2022-02-11 13:37:03 +00:00
"/sksl/errors/Ossfuzz44555.sksl",
"/sksl/errors/Ossfuzz44557.sksl",
"/sksl/errors/Ossfuzz44559.sksl",
"/sksl/errors/Ossfuzz44561.sksl",
"/sksl/errors/Ossfuzz44565.sksl",
Fix OverflowFloatLiteral test in OS X 10.12. std::stringstream has a subtle bug in OS X 10.12. Reading in a too-large floating point value returns INFINITY but does not set failbit. This caused SkSL to report a different error message than expected ("floating point value is infinite" instead of "floating-point value is too large: NNNNN"). We now guard against this case in SkSL::stod by adding an explicit `isfinite` check. Bug: skia:12928 Change-Id: I9996e64b69512ea5710e6fc3ff00ad1ad83c247b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505939 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-02-09 14:36:17 +00:00
"/sksl/errors/OverflowFloatLiteral.sksl",
Fix error with inlined literals overflowing their types. It's possible to write code containing errors that are only apparent once the inliner runs. For instance, a function which takes a short and returns its negative it is valid for most inputs, but undefined for -32768 (because +32768 does not fit in a short). A function which takes floats and casts them to ints is valid for many inputs, but not valid if you pass in 5 billion. This CL restructures our out-of-range integer error detection to report errors cleanly in these cases instead of asserting. It also refactors the range checking code to be usable in situations where we don't yet have a Literal expression. Change-Id: I98f0be63bf9afbbf1ab90233fa86d380cfae42b4 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/466439 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-11-02 13:49:02 +00:00
"/sksl/errors/OverflowInlinedLiteral.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/OverflowIntLiteral.sksl",
Add test for literals that overflow int64. This was handled properly, but lacked a test. Change-Id: I84adc7cb3d37ab85eef945c1e38fc43c6cd8aa01 Bug: skia:10932 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/414437 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-06-01 15:16:34 +00:00
"/sksl/errors/OverflowInt64Literal.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/OverflowParamArraySize.sksl",
"/sksl/errors/OverflowUintLiteral.sksl",
Enforce basic limits on global size in SkSL. Much like http://review.skia.org/467759, this CL defensively guards against programs which consume more space than is reasonable. Globals exist outside of functions, so they wouldn't be caught by the stack size checks. Change-Id: I035f27d57bc329508820a729a1e367ecaadfe156 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/467760 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-11-04 17:34:39 +00:00
"/sksl/errors/ProgramTooLarge_Globals.sksl",
Enforce basic limits on function stack size in SkSL. Functions that declare variables totaling more than 100,000 slots will now generate an error. This is only a partial mitigation to the problem, as a sophisticated attack could still chain/nest multiple functions together to consume extremely large amounts of stack. However, this mitigation is still more sophisticated than our peers; both WebGL and glslang are susceptible to similar problems, and in the general case (ES3+ with full flow control) it's intractable. Change-Id: I153c75267c017a23f59fe9e59f6e391197ee6101 Bug: oss-fuzz:40304, oss-fuzz:40694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/467759 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-11-04 17:32:00 +00:00
"/sksl/errors/ProgramTooLarge_Stack.sksl",
Improve error reporting for invalid var-decls. We now interpret any statement of the form `Type identifier...` as a var-declaration and report errors as such. Previously, if a var-decl statement generated an error during parse, we'd report errors as if it were an expression-statement, which meant that slightly-invalid code could return out-of-context, misleading errors. Bug: skia:11287 Change-Id: I2c6cf2984760eb34593c80cb30f8c4e007d42027 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/370036 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> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-12 21:05:00 +00:00
"/sksl/errors/PrototypeInFuncBody.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/PrivateTypes.sksl",
Reject $ in variable names for non-builtin code. These identifiers are reserved for SkSL internal use (and can't be exposed to GLSL or Metal anyway). Change-Id: Id554cbf21ed2fb66785e77700ff79424ecdf66db Bug: skia:12854 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/498036 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-01-22 20:32:53 +00:00
"/sksl/errors/PrivateVariables.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/RedeclareBasicType.sksl",
"/sksl/errors/RedeclareSamplerType.sksl",
"/sksl/errors/RedeclareStruct.sksl",
"/sksl/errors/RedeclareStructTypeWithName.sksl",
"/sksl/errors/RedeclareUserType.sksl",
"/sksl/errors/RedeclareVariable.sksl",
Reland "Mark GLSL reserved names as reserved in SkSL grammar." This reverts commit 5f15c695f970f35980c859efc56843679ceded45. Reason for revert: landed http://ag/15959743 to fix Android roll Original change's description: > Revert "Mark GLSL reserved names as reserved in SkSL grammar." > > This reverts commit 57f3fc4cde764c098666acdac05a7c905508fb2d. > > Reason for revert: breaking Android roll > > Original change's description: > > Mark GLSL reserved names as reserved in SkSL grammar. > > > > We now reject every reserved name in the ES2 docs as an unexpected > > token, except for the rule that all names beginning with `gl_` are > > reserved. (Unfortunately, sksl_frag bends the rules by directly > > declaring a builtin variable named `gl_SecondaryFragColorEXT`.) > > > > Change-Id: I5dcb40b754720ca97fe3d80e2f9072beaa39fcdb > > Bug: skia:11115 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/454737 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > Bug: skia:11115 > Change-Id: Ica56f48dc76ef1e52780acaf59b8ad9143637637 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/454860 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Bug: skia:11115 Change-Id: I012b8d4e03be7f9c888c26d912552412529b4fb6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/455159 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-10-01 17:49:09 +00:00
"/sksl/errors/ReservedNameAsm.sksl",
Added four more reserved words to SkSL. We now detect attribute, varying, precision and invariant as reserved. Change-Id: I8c90655a70b1bad31bf6143c3fdcb2ce582320b1 Bug: skia:12484 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/459479 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-10-14 15:42:33 +00:00
"/sksl/errors/ReservedNameAttribute.sksl",
Reland "Mark GLSL reserved names as reserved in SkSL grammar." This reverts commit 5f15c695f970f35980c859efc56843679ceded45. Reason for revert: landed http://ag/15959743 to fix Android roll Original change's description: > Revert "Mark GLSL reserved names as reserved in SkSL grammar." > > This reverts commit 57f3fc4cde764c098666acdac05a7c905508fb2d. > > Reason for revert: breaking Android roll > > Original change's description: > > Mark GLSL reserved names as reserved in SkSL grammar. > > > > We now reject every reserved name in the ES2 docs as an unexpected > > token, except for the rule that all names beginning with `gl_` are > > reserved. (Unfortunately, sksl_frag bends the rules by directly > > declaring a builtin variable named `gl_SecondaryFragColorEXT`.) > > > > Change-Id: I5dcb40b754720ca97fe3d80e2f9072beaa39fcdb > > Bug: skia:11115 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/454737 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > Bug: skia:11115 > Change-Id: Ica56f48dc76ef1e52780acaf59b8ad9143637637 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/454860 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Bug: skia:11115 Change-Id: I012b8d4e03be7f9c888c26d912552412529b4fb6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/455159 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-10-01 17:49:09 +00:00
"/sksl/errors/ReservedNameCast.sksl",
"/sksl/errors/ReservedNameDouble.sksl",
"/sksl/errors/ReservedNameDvec2.sksl",
"/sksl/errors/ReservedNameDvec3.sksl",
"/sksl/errors/ReservedNameDvec4.sksl",
"/sksl/errors/ReservedNameEnum.sksl",
"/sksl/errors/ReservedNameExtern.sksl",
"/sksl/errors/ReservedNameExternal.sksl",
"/sksl/errors/ReservedNameFixed.sksl",
"/sksl/errors/ReservedNameFvec2.sksl",
"/sksl/errors/ReservedNameFvec3.sksl",
"/sksl/errors/ReservedNameFvec4.sksl",
"/sksl/errors/ReservedNameGoto.sksl",
"/sksl/errors/ReservedNameHvec2.sksl",
"/sksl/errors/ReservedNameHvec3.sksl",
"/sksl/errors/ReservedNameHvec4.sksl",
"/sksl/errors/ReservedNameInput.sksl",
"/sksl/errors/ReservedNameInterface.sksl",
Added four more reserved words to SkSL. We now detect attribute, varying, precision and invariant as reserved. Change-Id: I8c90655a70b1bad31bf6143c3fdcb2ce582320b1 Bug: skia:12484 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/459479 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-10-14 15:42:33 +00:00
"/sksl/errors/ReservedNameInvariant.sksl",
Reland "Mark GLSL reserved names as reserved in SkSL grammar." This reverts commit 5f15c695f970f35980c859efc56843679ceded45. Reason for revert: landed http://ag/15959743 to fix Android roll Original change's description: > Revert "Mark GLSL reserved names as reserved in SkSL grammar." > > This reverts commit 57f3fc4cde764c098666acdac05a7c905508fb2d. > > Reason for revert: breaking Android roll > > Original change's description: > > Mark GLSL reserved names as reserved in SkSL grammar. > > > > We now reject every reserved name in the ES2 docs as an unexpected > > token, except for the rule that all names beginning with `gl_` are > > reserved. (Unfortunately, sksl_frag bends the rules by directly > > declaring a builtin variable named `gl_SecondaryFragColorEXT`.) > > > > Change-Id: I5dcb40b754720ca97fe3d80e2f9072beaa39fcdb > > Bug: skia:11115 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/454737 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > Bug: skia:11115 > Change-Id: Ica56f48dc76ef1e52780acaf59b8ad9143637637 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/454860 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Bug: skia:11115 Change-Id: I012b8d4e03be7f9c888c26d912552412529b4fb6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/455159 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-10-01 17:49:09 +00:00
"/sksl/errors/ReservedNameLong.sksl",
"/sksl/errors/ReservedNameNamespace.sksl",
"/sksl/errors/ReservedNameOutput.sksl",
"/sksl/errors/ReservedNamePacked.sksl",
Added four more reserved words to SkSL. We now detect attribute, varying, precision and invariant as reserved. Change-Id: I8c90655a70b1bad31bf6143c3fdcb2ce582320b1 Bug: skia:12484 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/459479 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-10-14 15:42:33 +00:00
"/sksl/errors/ReservedNamePrecision.sksl",
Reland "Mark GLSL reserved names as reserved in SkSL grammar." This reverts commit 5f15c695f970f35980c859efc56843679ceded45. Reason for revert: landed http://ag/15959743 to fix Android roll Original change's description: > Revert "Mark GLSL reserved names as reserved in SkSL grammar." > > This reverts commit 57f3fc4cde764c098666acdac05a7c905508fb2d. > > Reason for revert: breaking Android roll > > Original change's description: > > Mark GLSL reserved names as reserved in SkSL grammar. > > > > We now reject every reserved name in the ES2 docs as an unexpected > > token, except for the rule that all names beginning with `gl_` are > > reserved. (Unfortunately, sksl_frag bends the rules by directly > > declaring a builtin variable named `gl_SecondaryFragColorEXT`.) > > > > Change-Id: I5dcb40b754720ca97fe3d80e2f9072beaa39fcdb > > Bug: skia:11115 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/454737 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > Bug: skia:11115 > Change-Id: Ica56f48dc76ef1e52780acaf59b8ad9143637637 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/454860 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Bug: skia:11115 Change-Id: I012b8d4e03be7f9c888c26d912552412529b4fb6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/455159 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-10-01 17:49:09 +00:00
"/sksl/errors/ReservedNamePublic.sksl",
"/sksl/errors/ReservedNameSampler1DShadow.sksl",
"/sksl/errors/ReservedNameSampler2DRectShadow.sksl",
"/sksl/errors/ReservedNameSampler2DShadow.sksl",
"/sksl/errors/ReservedNameSampler3DRect.sksl",
Fix up samplerCube/textureCube for ES2 conformance. `samplerCube` is a type which we don't support at all. It has been added to the reserved-word list. `textureCube` was in our list of built-in types, but was not actually used in any way; it wasn't actually added to the root or private symbol tables, and was totally unreferenced by the code. It's been deleted. Change-Id: I4f79ce5d40ac6ebdb2a7067fa60cc79e316b01b6 Bug: skia:12484 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/459123 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-10-13 21:15:33 +00:00
"/sksl/errors/ReservedNameSamplerCube.sksl",
Reland "Mark GLSL reserved names as reserved in SkSL grammar." This reverts commit 5f15c695f970f35980c859efc56843679ceded45. Reason for revert: landed http://ag/15959743 to fix Android roll Original change's description: > Revert "Mark GLSL reserved names as reserved in SkSL grammar." > > This reverts commit 57f3fc4cde764c098666acdac05a7c905508fb2d. > > Reason for revert: breaking Android roll > > Original change's description: > > Mark GLSL reserved names as reserved in SkSL grammar. > > > > We now reject every reserved name in the ES2 docs as an unexpected > > token, except for the rule that all names beginning with `gl_` are > > reserved. (Unfortunately, sksl_frag bends the rules by directly > > declaring a builtin variable named `gl_SecondaryFragColorEXT`.) > > > > Change-Id: I5dcb40b754720ca97fe3d80e2f9072beaa39fcdb > > Bug: skia:11115 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/454737 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > Bug: skia:11115 > Change-Id: Ica56f48dc76ef1e52780acaf59b8ad9143637637 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/454860 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Bug: skia:11115 Change-Id: I012b8d4e03be7f9c888c26d912552412529b4fb6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/455159 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-10-01 17:49:09 +00:00
"/sksl/errors/ReservedNameSizeof.sksl",
"/sksl/errors/ReservedNameStatic.sksl",
"/sksl/errors/ReservedNameSuperp.sksl",
"/sksl/errors/ReservedNameTemplate.sksl",
"/sksl/errors/ReservedNameThis.sksl",
"/sksl/errors/ReservedNameTypedef.sksl",
"/sksl/errors/ReservedNameUnion.sksl",
"/sksl/errors/ReservedNameUnsigned.sksl",
"/sksl/errors/ReservedNameUsing.sksl",
Added four more reserved words to SkSL. We now detect attribute, varying, precision and invariant as reserved. Change-Id: I8c90655a70b1bad31bf6143c3fdcb2ce582320b1 Bug: skia:12484 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/459479 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-10-14 15:42:33 +00:00
"/sksl/errors/ReservedNameVarying.sksl",
Reland "Mark GLSL reserved names as reserved in SkSL grammar." This reverts commit 5f15c695f970f35980c859efc56843679ceded45. Reason for revert: landed http://ag/15959743 to fix Android roll Original change's description: > Revert "Mark GLSL reserved names as reserved in SkSL grammar." > > This reverts commit 57f3fc4cde764c098666acdac05a7c905508fb2d. > > Reason for revert: breaking Android roll > > Original change's description: > > Mark GLSL reserved names as reserved in SkSL grammar. > > > > We now reject every reserved name in the ES2 docs as an unexpected > > token, except for the rule that all names beginning with `gl_` are > > reserved. (Unfortunately, sksl_frag bends the rules by directly > > declaring a builtin variable named `gl_SecondaryFragColorEXT`.) > > > > Change-Id: I5dcb40b754720ca97fe3d80e2f9072beaa39fcdb > > Bug: skia:11115 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/454737 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > Bug: skia:11115 > Change-Id: Ica56f48dc76ef1e52780acaf59b8ad9143637637 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/454860 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Bug: skia:11115 Change-Id: I012b8d4e03be7f9c888c26d912552412529b4fb6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/455159 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-10-01 17:49:09 +00:00
"/sksl/errors/ReservedNameVolatile.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/ReturnDifferentType.sksl",
"/sksl/errors/ReturnFromVoid.sksl",
"/sksl/errors/ReturnMissingValue.sksl",
"/sksl/errors/ReturnTypeMismatch.sksl",
"/sksl/errors/SelfReferentialInitializerExpression.sksl",
"/sksl/errors/SpuriousFloat.sksl",
"/sksl/errors/StaticIfTest.sksl",
"/sksl/errors/StaticSwitchConditionalBreak.sksl",
"/sksl/errors/StaticSwitchTest.sksl",
Fix switch optimization pass. The optimizer now properly recognizes all types of exits from a switch statement. Break, continue and return are all potential exits and need to be considered when determining the exit path from the switch. Previously, dead code elimination was hiding the effects of this bug from us, but it meant that an optimized switch had the potential to generate lots of worthless IR nodes which then needed to be detected and eliminated by the CFG. In particular, this affected the enum form of blend, causing a catastrophic amount of extra work to be done. Change-Id: If857e38cadfc016884624ea4db25a273ad3dce5b Bug: skia:11352 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372958 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-23 14:58:04 +00:00
"/sksl/errors/StaticSwitchWithConditionalBreak.sksl",
"/sksl/errors/StaticSwitchWithConditionalContinue.sksl",
"/sksl/errors/StaticSwitchWithConditionalReturn.sksl",
Add test for structs/interface-blocks with invalid member names. Structs already handled this appropriately, but interface blocks did not guard against naming their member variables built-in type names like "float" or "bool". Change-Id: I12ec054b3f158b83e35031449cf2a088ff8d0dc2 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/489596 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-12-28 19:58:36 +00:00
"/sksl/errors/StructMemberReservedName.sksl",
Remove ASTNode::TypeData Pre-cleanup as I start looking at how structs are parsed and handled in the IR. Bug: skia:11228 Change-Id: I6334d1073211cbbdf69ddffa8df420c45fd59fcc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/361059 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-01-28 14:46:30 +00:00
"/sksl/errors/StructNameWithoutIdentifier.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/StructTooDeeplyNested.sksl",
Add test demonstrating struct/interface-block name conflict. Structs and interface blocks allow a trailing identifier which is added to the symbol table. This identifier should be prohibited from overlapping built-in types; at present, this is not checked. Add a test demonstrating the issue. Change-Id: I99aa915c1715c468cc369c97b7f12e031b86ea4a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/489496 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-12-28 18:46:27 +00:00
"/sksl/errors/StructVariableReservedName.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/SwitchDuplicateCase.sksl",
Add test for duplicate `default` switch-case. Surprisingly, this error is actually caught by our parser, which interprets the default label in a unique way. From the parser comments: "Requiring default: to be last (in defiance of C and GLSL) was a deliberate decision. Other parts of the compiler may rely upon this assumption." The comment is true--we don't check for duplicate default switch-case labels anywhere else in the code, just here in the parser. We rely on this, so we should have a test for it. Change-Id: I6df5c565aca4d4b8565b96638dce9504efc39ccc Bug: skia:11340 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372617 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-19 20:13:46 +00:00
"/sksl/errors/SwitchDuplicateDefault.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/SwitchTypes.sksl",
Disallow continue inside a switch. This fails on several platforms in practice, and is of very limited real-world utility. Change-Id: Ib476396fc33cb51af6bbcf7fe822d30703ed995d Bug: skia:12467 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/450993 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-09-21 18:36:34 +00:00
"/sksl/errors/SwitchWithContinueInside.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/SwizzleConstantOutput.sksl",
Enforce consistency in swizzle domains. GLSL disallows mixing swizzle domains within a single swizzle: http://screen/93eHNQDbx35hMdk SkSL now disallows it as well. Change-Id: Ied2e11ee04285b143a864e28cac30335f01aad0e Bug: skia:10621 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426458 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-07-09 19:29:10 +00:00
"/sksl/errors/SwizzleDomain.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/SwizzleMatrix.sksl",
"/sksl/errors/SwizzleOnlyLiterals.sksl",
"/sksl/errors/SwizzleOutOfBounds.sksl",
"/sksl/errors/SwizzleTooManyComponents.sksl",
"/sksl/errors/TernaryMismatch.sksl",
Report an error if an out param is never written to. GLSL ES2 behavior is explicitly undefined if an out-param is never written to: "If a function does not write to an out parameter, the value of the actual parameter is undefined when the function returns." We do see divergence here in practice: SkVM's behavior (the parameter is left alone) differs from my GPU's behavior (the parameter is zeroed out). SkSL will now report an error if an out parameter is never assigned-to. There is no control flow analysis performed, so we will not report cases where the out parameter is assigned-to on some paths but not others. (Technically the return-on-all-paths logic could be adapted for this, but it would be a fair amount of work.) Structs are currently exempt from the rule because custom mesh specifications require an `out` parameter for a Varyings struct, even if your mesh program doesn't need Varyings. Bug: skia:12867 Change-Id: Ie828d3ce91c2c67e008ae304fdb163ffa88d744c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/500440 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2022-01-26 19:11:26 +00:00
"/sksl/errors/UnassignedOutParameter.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/UndeclaredFunction.sksl",
"/sksl/errors/UndefinedFunction.sksl",
"/sksl/errors/UndefinedSymbol.sksl",
Disallow initializers on uniform variables Bug: skia:11335 Change-Id: I88c952cbfe2d2c5920e17675da1674928f37b982 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/371480 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-02-17 21:24:04 +00:00
"/sksl/errors/UniformVarWithInitializerExpression.sksl",
Added detection for non-constant-folded divide by zero errors in SkSL. It would previously catch 1 / 0, but fail to detect x / 0. Bug: skia:11051 Change-Id: I3adb5942cce03a7ad40a13a8ca5d5a7f2029d6ad Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366720 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: Ethan Nicholas <ethannicholas@google.com>
2021-02-05 21:21:10 +00:00
"/sksl/errors/UnknownDivideByZero.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/UnsupportedGLSLIdentifiers.sksl",
Fix fuzzer-discovered error with variable scoping. In GLSL and SkSL, control statements don't require explicit braces around single-statement children. That is, the `match = true` child statement here doesn't need to be braced. if (condition) match = true; Because there are no braces, we never create a Block or a dedicated SymbolTable here. This is normally not a problem, but the fuzzer discovered that it can dump things into the symbol table inside a child statement: if (condition) int newSymbol; This becomes problematic because the symbol name now outlives its block. This means `newSymbol` can be referred to later, which should be illegal (and can cause the optimizer to blow up since the structure is bogus). There doesn't seem to be any reason to allow this code to compile; the user can add an explicit scope here to make it reasonable, and it's (almost) meaningless to declare a symbol that's instantly going to fall out of scope. This code is now rejected with an error message. Change-Id: I44778e5b59652d345b10eecd4c88efbf7d86a5e0 Bug: oss-fuzz:29849 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358960 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-26 15:13:58 +00:00
"/sksl/errors/UnscopedVariableInDoWhile.sksl",
"/sksl/errors/UnscopedVariableInElse.sksl",
Disallow unscoped for blocks which declare a variable. This should be legal, and we support this, but some versions of Android do not: http://screen/3bkQewHF3xUMn5v There's no point in allowing these shaders to exist; they can't compile on real-world clients, and these vardecls are borderline meaningless (as the variables being declared aren't reachable by any other statements). Change-Id: Ie1351933c90caee9124eeab8983364ec030b2653 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/379584 Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-04 15:46:39 +00:00
"/sksl/errors/UnscopedVariableInFor.sksl",
Fix fuzzer-discovered error with variable scoping. In GLSL and SkSL, control statements don't require explicit braces around single-statement children. That is, the `match = true` child statement here doesn't need to be braced. if (condition) match = true; Because there are no braces, we never create a Block or a dedicated SymbolTable here. This is normally not a problem, but the fuzzer discovered that it can dump things into the symbol table inside a child statement: if (condition) int newSymbol; This becomes problematic because the symbol name now outlives its block. This means `newSymbol` can be referred to later, which should be illegal (and can cause the optimizer to blow up since the structure is bogus). There doesn't seem to be any reason to allow this code to compile; the user can add an explicit scope here to make it reasonable, and it's (almost) meaningless to declare a symbol that's instantly going to fall out of scope. This code is now rejected with an error message. Change-Id: I44778e5b59652d345b10eecd4c88efbf7d86a5e0 Bug: oss-fuzz:29849 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358960 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-26 15:13:58 +00:00
"/sksl/errors/UnscopedVariableInIf.sksl",
"/sksl/errors/UnscopedVariableInWhile.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/UsingInvalidValue.sksl",
Improve array-indexing tests. Previously, we didn't have tests which leveraged constant-evaluation of array indexing (because we didn't support it), and our test files commingled constant-indexing into vectors with constant-indexing into arrays. The test files now separate vector- and array-handling into separate tests, and a ton of new cases have been added to ArrayFolding. The ArrayFolding tests now require constant-evaluation of array indexing, so they fail in this CL, but will be fixed in the followup CL. Change-Id: I3b663e743d97d6db80627bc9b7808f88c99917a7 Bug: skia:12472 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/469528 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-11-10 14:58:32 +00:00
"/sksl/errors/VectorIndexOutOfRange.sksl",
"/sksl/errors/VectorInlinedIndexOutOfRange.sksl",
Add test for SkSL vector-slice constructors. SkSL does not support shrinking a vector via casting. Use a swizzle instead. Change-Id: Ieba78a05dad9c55f44c765924e28f0c7e1667a67 Bug: skia:12193 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/427198 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-07-12 19:48:27 +00:00
"/sksl/errors/VectorSlice.sksl",
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
"/sksl/errors/VertexEarlyReturn.vert",
Add test for construction of void. This fails exactly as it should, but we had no test for it. Change-Id: I0aa3307c444f2c9bc3512ff43b784a56a7c09856 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/472449 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-11-17 14:46:28 +00:00
"/sksl/errors/VoidConstructor.sksl",
Add test for void type in struct. Mysteriously, I had written a test which put arrays of void inside a struct, but had neglected to include the non-array case. It causes an okay-not-great error (referring to void as an "opaque type"). Change-Id: Id20a9d3512d29aecea81d46877dce708b7b2f973 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/472450 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-11-17 14:57:11 +00:00
"/sksl/errors/VoidInStruct.sksl",
Add test for variables of type void. We should, of course, detect this and report an error. Change-Id: I42b3be6e714a1f367d3251842506a384f2afe019 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/472447 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-11-16 23:03:31 +00:00
"/sksl/errors/VoidVariable.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/WhileTypeMismatch.sksl",
Clean up SkSL test compilation in preparation for Metal support. Now uses a GN template to avoid copy-pasting the same logic for each type of test we want to perform, and the same file to be compiled in more than one way at a time via an extra flag to compile_sksl_tests.py. Change-Id: I8aadedeb140d78d58a345a2bac0da3d9c77e9a19 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319347 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 20:42:09 +00:00
]
Migrate most SkSL tests currently in /glsl/ to /shared/. These tests will also be used for Metal and SPIR-V testing. A small handful of GLSL-specific stragglers (#version-specific or type-precision related) will remain in /glsl/. Change-Id: I7f2b2bd92825c327922c8ce74e438d2daa440dff Bug: skia:10649 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319408 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 21:22:42 +00:00
sksl_glsl_tests = [
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/glsl/ForceHighPrecision.sksl",
"/sksl/glsl/IncompleteShortIntPrecision.sksl",
Report an error if sk_LastFragColor is referenced without fbFetchSupport Adjusted default caps in skslc to be consistent with runtime behavior, and added optional settings mode to enable the feature. Tests for both scenarios. (The error test crashed prior to the fix). Bug: oss-fuzz:38726 Change-Id: I5270d4837ac982085d7baf5abd4b361f7bfb8562 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/449062 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-09-15 14:28:27 +00:00
"/sksl/glsl/LastFragColor.sksl",
Move backend-specific error tests out of errors/ test folder. These tests only generate an error in the SPIR-V or GLSL backends. We will soon enforce that everything in errors/ must actually fail to compile. Change-Id: Ic54707eb3bfa19287b4ed52335066fc0fbf19ec1 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505397 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2022-02-08 04:25:26 +00:00
"/sksl/glsl/LastFragColorWithoutCaps.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/glsl/LayoutQualifiers.sksl",
"/sksl/glsl/ShortIntPrecision.sksl",
"/sksl/glsl/TextureSharpenVersion110.sksl",
"/sksl/glsl/TextureVersion110.sksl",
"/sksl/glsl/UsesPrecisionModifiers.sksl",
"/sksl/glsl/Version110.sksl",
"/sksl/glsl/Version450Core.sksl",
Migrate most SkSL tests currently in /glsl/ to /shared/. These tests will also be used for Metal and SPIR-V testing. A small handful of GLSL-specific stragglers (#version-specific or type-precision related) will remain in /glsl/. Change-Id: I7f2b2bd92825c327922c8ce74e438d2daa440dff Bug: skia:10649 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319408 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 21:22:42 +00:00
]
Convert remaining Metal tests to golden outputs. Metal-specific tests are pretty thin on the ground here, and some of the remaining tests no longer added value as they were already covered pretty well by existing tests in Shared. The majority of remaining tests were specific to Metal's lack of flexible matrix casting (and SkSL's ability to paper over this with helper functions). Change-Id: I7b3c445268b95320e7f46ec88d793c315d43ee8a Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/334956 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-11-13 23:14:11 +00:00
sksl_metal_tests = [
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/metal/CastHalf4ToMat2x2.sksl",
"/sksl/metal/CastMat2x2ToMat3x3.sksl",
"/sksl/metal/CastMat2x3ToMat4x4.sksl",
"/sksl/metal/CastMat4x4ToMat3x4.sksl",
"/sksl/metal/CastMat4x4ToMat4x3.sksl",
"/sksl/metal/NumericGlobals.sksl",
"/sksl/metal/OpaqueTypeInInterfaceBlock.sksl",
"/sksl/metal/OpaqueTypeInStruct.sksl",
"/sksl/metal/OutParams.sksl",
"/sksl/metal/OutVarsRequireLocation.sksl",
"/sksl/metal/SamplerGlobals.sksl",
"/sksl/metal/SwizzleHelper.sksl",
Convert remaining Metal tests to golden outputs. Metal-specific tests are pretty thin on the ground here, and some of the remaining tests no longer added value as they were already covered pretty well by existing tests in Shared. The majority of remaining tests were specific to Metal's lack of flexible matrix casting (and SkSL's ability to paper over this with helper functions). Change-Id: I7b3c445268b95320e7f46ec88d793c315d43ee8a Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/334956 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-11-13 23:14:11 +00:00
]
Migrate dedicated SPIR-V tests to golden outputs. There were a surprisingly small number of dedicated SPIR-V tests. SkSLSPIRVBadOffset was the only test that didn't already exist in the golden outputs, although it actually contained two tests. The SPIRVTest.cpp file has been converted to SPIRVTestbed.cpp, which can be used for local debugging of SPIR-V issues via dm (like GLSLTestbed and MetalTestbed). Change-Id: I978d8a7cf5735af7f537113d2b9411ce42cfcf88 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338756 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-11-25 21:55:37 +00:00
sksl_spirv_tests = [
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/spirv/ConstantVectorFromVector.sksl",
Improve memory layout handling in SPIRV generator Added asserts that verify we don't try to emit the same struct or array with two different memory layout rules. Some code paths were failing to inspect the associated variable, leading to incorrect errors about the attached offsets of members. Added a test case that triggered that error, and also triggers the new asserts. Then, fixed the underlying cause: writing out the struct definition as a side effect of accessing a member in getLValue(). Bug: skia:11205 Change-Id: I6e5fb76ea918ec9ff10425f2d519ddbc54404b27 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357436 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-01-22 18:41:40 +00:00
"/sksl/spirv/InterfaceBlockPushConstant.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/spirv/LayoutMultipleOf4.sksl",
"/sksl/spirv/LayoutOutOfOrder.sksl",
"/sksl/spirv/OpaqueTypeInArray.sksl",
Improve SPIR-V handling of RTFlip when running the fuzzer. If the passed-in shader references RTFlip (i.e., sk_FragCoord is used), the settings must contain RTFlip layout info; otherwise, an error occurs. Originally, the fuzzer detected this as a problem because the error was being delivered via SK_ABORT, but it's failing more cleanly now that Ethan's new error handling code is in place (causing the fuzzer to report that the bug was "fixed"). With this CL, the oss-fuzz shader will actually compile successfully in SPIR-V instead of leading to an error. Change-Id: I3268e84bd8e01c95a25ed0845a37324e98033c4b Bug: oss-fuzz:35916 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/439779 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-08-16 18:46:10 +00:00
"/sksl/spirv/Ossfuzz35916.sksl",
Fix parsing error with SPIR-V negating a uint. Our SPIR-V code generator did not implement support for negating a uint. However, this is something that GLSL allows (as does the rest of SkSL). I checked glslang and it uses OpSNegate here. The SPIR-V docs indicate that OpSNegate allows any type of integer, and the validator lets it pass, so we now use OpSNegate here as well. http://screen/33mkq92uxAT5Xu8 http://screen/4YBTh3gCWz8eZx7 http://screen/388HtXyytcN5vLZ Change-Id: I8c142018fd5e162dcd051abe1bc5d69a6e034794 Bug: oss-fuzz:37627 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/441880 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-08-25 16:43:22 +00:00
"/sksl/spirv/Ossfuzz37627.sksl",
Move backend-specific error tests out of errors/ test folder. These tests only generate an error in the SPIR-V or GLSL backends. We will soon enforce that everything in errors/ must actually fail to compile. Change-Id: Ic54707eb3bfa19287b4ed52335066fc0fbf19ec1 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/505397 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2022-02-08 04:25:26 +00:00
"/sksl/spirv/Ossfuzz44096.sksl",
"/sksl/spirv/UnusedInterfaceBlock.sksl",
Add caps bit for RewriteMatrixVectorMultiply. On ARM GPUs, the Vulkan driver does not honor relaxed precision when evaluating SpvOpMatrixTimesVector. This leads to reduced performance (compared to GLSL, where mediump matrices and floats do evaluate all intermediate values at mediump). This caps bit will be enabled on ARM GPUs and, in a followup CL, will be used to toggle a workaround where `m*v` is rewritten as the sum of (m[0]*v[0] + m[1]*v[1] + ... + m[N]*v[N]). Change-Id: I310fa73639b6498552c9672e76860f2eded15d0a Bug: skia:11769 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388459 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-23 21:12:03 +00:00
"/sksl/workarounds/RewriteMatrixVectorMultiply.sksl",
Prevent 'binding' and 'set' on struct/interface block fields I should have realized the fuzzer would find this assert when I added it. Now the front-end rejects these layout qualifiers on both struct fields and interface block fields. LayoutInInterfaceBlock.sksl is a reformatted version of the fuzzer input. LayoutInStruct is hand-crafted to trigger the same failure on a different code path. Both would previously assert in the SPIRV generator. Now, neither one gets that far. Bug: oss-fuzz:41347 Change-Id: Iff69d8f5482da7b772e9331c4fd2d58e89813c46 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/476396 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-11-24 19:12:41 +00:00
"/sksl/errors/LayoutInInterfaceBlock.sksl",
"/sksl/errors/LayoutInStruct.sksl",
Fix fuzzer-discovered error with SPIR-V interface arrays. OSSFuzz discovered a minor variation of oss-fuzz:36770 which tickled a different bug in SPIR-V RTFlip handling; we did not properly handle the case where the InterfaceBlock is an array. SPIR-V does not support this at all, but the IRGenerator allows it, and we don't detect it an an error until later in the compilation process. Change-Id: I80bd67a13dad878717dc122462132a2ed675532d Bug: oss-fuzz:36850 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/437018 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-08-05 16:19:35 +00:00
"/sksl/errors/Ossfuzz36850.sksl",
Added reportPendingErrors to SkSL code generation This fixes an assertion failure uncovered by the fuzzer. Bug: oss-fuzz:37469 Change-Id: I626c003cfa8a0bc65851899df3a7695dbe29200b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/441311 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-08-23 19:40:20 +00:00
"/sksl/errors/Ossfuzz37469.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/errors/UndefinedFunction.sksl",
Migrate dedicated SPIR-V tests to golden outputs. There were a surprisingly small number of dedicated SPIR-V tests. SkSLSPIRVBadOffset was the only test that didn't already exist in the golden outputs, although it actually contained two tests. The SPIRVTest.cpp file has been converted to SPIRVTestbed.cpp, which can be used for local debugging of SPIR-V issues via dm (like GLSLTestbed and MetalTestbed). Change-Id: I978d8a7cf5735af7f537113d2b9411ce42cfcf88 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338756 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-11-25 21:55:37 +00:00
]
Revert "[skslc] Generate .hlsl test output files" This reverts commit a97a6769b5c4f43edc2331990f271674bf99c4fb. Reason for revert: breaking bot Housekeeper-PerCommit-CheckGeneratedFiles -- see http://screen/5FN75fF9tvcQFKR Based on the diff, I think this just needs to be synced up to latest code and a rebuild should fix it. Original change's description: > [skslc] Generate .hlsl test output files > > - The build now generates HLSL output when `skia_compile_sksl_tests` is > enabled. > - The "blend" and "shared" tests have been enabled for HLSL with the > exception of 6 tests that exercise intrinsic inverse hyperbolic > functions, which don't have HLSL equivalents. > > Bug: skia:12691, skia:12352 > Change-Id: Ia970f878f75ff58e8e3d47249c2dc2f756c165b4 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/482778 > Reviewed-by: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Auto-Submit: Arman Uguray <armansito@google.com> > Commit-Queue: Arman Uguray <armansito@google.com> > Commit-Queue: Brian Osman <brianosman@google.com> Bug: skia:12691, skia:12352 Change-Id: Iaad607d48edd136eee2b60e48c0643b6e90179e9 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/499216 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
2022-01-25 04:56:00 +00:00
sksl_shared_tests = [
"/sksl/intrinsics/AbsFloat.sksl",
"/sksl/intrinsics/AbsInt.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/intrinsics/Acos.sksl",
"/sksl/intrinsics/Acosh.sksl",
Revert "[skslc] Generate .hlsl test output files" This reverts commit a97a6769b5c4f43edc2331990f271674bf99c4fb. Reason for revert: breaking bot Housekeeper-PerCommit-CheckGeneratedFiles -- see http://screen/5FN75fF9tvcQFKR Based on the diff, I think this just needs to be synced up to latest code and a rebuild should fix it. Original change's description: > [skslc] Generate .hlsl test output files > > - The build now generates HLSL output when `skia_compile_sksl_tests` is > enabled. > - The "blend" and "shared" tests have been enabled for HLSL with the > exception of 6 tests that exercise intrinsic inverse hyperbolic > functions, which don't have HLSL equivalents. > > Bug: skia:12691, skia:12352 > Change-Id: Ia970f878f75ff58e8e3d47249c2dc2f756c165b4 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/482778 > Reviewed-by: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Auto-Submit: Arman Uguray <armansito@google.com> > Commit-Queue: Arman Uguray <armansito@google.com> > Commit-Queue: Brian Osman <brianosman@google.com> Bug: skia:12691, skia:12352 Change-Id: Iaad607d48edd136eee2b60e48c0643b6e90179e9 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/499216 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
2022-01-25 04:56:00 +00:00
"/sksl/intrinsics/All.sksl",
"/sksl/intrinsics/Any.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/intrinsics/Asin.sksl",
"/sksl/intrinsics/Asinh.sksl",
"/sksl/intrinsics/Atan.sksl",
"/sksl/intrinsics/Atanh.sksl",
"/sksl/intrinsics/BitCount.sksl",
"/sksl/intrinsics/Ceil.sksl",
Implement additional Runtime Effect intrinsic tests. Tested in dm: - max(halfN, halfN) - max(halfN, half) - min(halfN, halfN) - min(halfN, half) - clamp(halfN, halfN, halfN) - clamp(halfN, half, half) - mix(halfN, halfN, halfN) - mix(halfN, halfN, half) Compiled outputs only (not in ES2): - max(intN, intN) - max(intN, int) - min(intN, intN) - min(intN, int) - clamp(intN, intN, intN) - clamp(intN, int, int) - mix(halfN, halfN, boolN) - broken in Metal/SPIR-V (skia:11222) - mix(intN, intN, boolN) - broken in Metal/SPIR-V (skia:11222) Change-Id: Iaafc5429b16d2a8710b9d171ae281c268c0fd70d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/361438 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-29 16:51:47 +00:00
"/sksl/intrinsics/ClampFloat.sksl",
"/sksl/intrinsics/ClampInt.sksl",
Add support for clamp($genUType, ...) in SkSL. We never used it internally, but the shaders used by Filament rely on it. It doesn't exist in ES2 so this doesn't affect Runtime Effects. Change-Id: Idb2afb15ff160b950ad02101bf6381a5d5c56468 Bug: skia:12635, skia:11209 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/470156 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-11-10 22:20:21 +00:00
"/sksl/intrinsics/ClampUInt.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/intrinsics/Cos.sksl",
"/sksl/intrinsics/Cosh.sksl",
"/sksl/intrinsics/Cross.sksl",
Mangle function names in GLSL. This will be implemented in Metal and SPIR-V in followup CLs. Change-Id: I397b4db40b15dd54cf1d8a17f414c3fe184b48d2 Bug: skia:10851 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/387638 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-22 15:43:11 +00:00
"/sksl/intrinsics/CrossNoInline.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/intrinsics/Degrees.sksl",
"/sksl/intrinsics/Determinant.sksl",
"/sksl/intrinsics/DFdx.sksl",
"/sksl/intrinsics/DFdy.sksl",
"/sksl/intrinsics/Distance.sksl",
"/sksl/intrinsics/Dot.sksl",
"/sksl/intrinsics/Equal.sksl",
"/sksl/intrinsics/Exp.sksl",
"/sksl/intrinsics/Exp2.sksl",
"/sksl/intrinsics/FaceForward.sksl",
"/sksl/intrinsics/FindLSB.sksl",
"/sksl/intrinsics/FindMSB.sksl",
"/sksl/intrinsics/FloatBitsToInt.sksl",
"/sksl/intrinsics/FloatBitsToUint.sksl",
"/sksl/intrinsics/Floor.sksl",
"/sksl/intrinsics/Fma.sksl",
"/sksl/intrinsics/Fract.sksl",
"/sksl/intrinsics/Frexp.sksl",
"/sksl/intrinsics/Fwidth.sksl",
"/sksl/intrinsics/GreaterThan.sksl",
"/sksl/intrinsics/GreaterThanEqual.sksl",
"/sksl/intrinsics/IntBitsToFloat.sksl",
"/sksl/intrinsics/Inverse.sksl",
"/sksl/intrinsics/Inversesqrt.sksl",
"/sksl/intrinsics/IsInf.sksl",
"/sksl/intrinsics/IsNan.sksl",
"/sksl/intrinsics/Ldexp.sksl",
"/sksl/intrinsics/Length.sksl",
"/sksl/intrinsics/LessThan.sksl",
"/sksl/intrinsics/LessThanEqual.sksl",
"/sksl/intrinsics/Log.sksl",
"/sksl/intrinsics/Log2.sksl",
Add non-square MatrixCompMult support to public SkSL in ES3 mode. We already had a test case here, but it wasn't actually in operation. The test has been split into ES2 (square) and ES3 (non-square) halves, returns the color like a proper runtime effect, and it's now running in dm. Also, Metal doesn't natively support matrixCompMult, so it injects a helper function; I tweaked the helper so it no longer requires an extra result variable. Change-Id: Ie79242768966fcbe879ad73461d17b4fb8e55670 Bug: skia:12202 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/448117 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-09-14 17:09:36 +00:00
"/sksl/intrinsics/MatrixCompMultES2.sksl",
"/sksl/intrinsics/MatrixCompMultES3.sksl",
Implement additional Runtime Effect intrinsic tests. Tested in dm: - max(halfN, halfN) - max(halfN, half) - min(halfN, halfN) - min(halfN, half) - clamp(halfN, halfN, halfN) - clamp(halfN, half, half) - mix(halfN, halfN, halfN) - mix(halfN, halfN, half) Compiled outputs only (not in ES2): - max(intN, intN) - max(intN, int) - min(intN, intN) - min(intN, int) - clamp(intN, intN, intN) - clamp(intN, int, int) - mix(halfN, halfN, boolN) - broken in Metal/SPIR-V (skia:11222) - mix(intN, intN, boolN) - broken in Metal/SPIR-V (skia:11222) Change-Id: Iaafc5429b16d2a8710b9d171ae281c268c0fd70d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/361438 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-29 16:51:47 +00:00
"/sksl/intrinsics/MaxFloat.sksl",
"/sksl/intrinsics/MaxInt.sksl",
"/sksl/intrinsics/MinFloat.sksl",
"/sksl/intrinsics/MinInt.sksl",
"/sksl/intrinsics/MixFloat.sksl",
"/sksl/intrinsics/MixBool.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/intrinsics/Mod.sksl",
"/sksl/intrinsics/Modf.sksl",
"/sksl/intrinsics/Normalize.sksl",
"/sksl/intrinsics/Not.sksl",
"/sksl/intrinsics/NotEqual.sksl",
"/sksl/intrinsics/OuterProduct.sksl",
"/sksl/intrinsics/Pack.sksl",
Add support for pack/unpackUnorm2x16 to public SkSL. This includes compile-time optimization and tests. The unit test is disabled in a followup CL (http://review.skia.org/447057) because it exposes a Radeon 5300M bug in OpenGL. Change-Id: I8b2f0411358aeb68c4edfeb0bd7a2814c4be1f40 Bug: skia:12202 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/447056 Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-09-09 13:58:42 +00:00
"/sksl/intrinsics/PackUnorm2x16.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/intrinsics/Pow.sksl",
"/sksl/intrinsics/Radians.sksl",
"/sksl/intrinsics/Reflect.sksl",
"/sksl/intrinsics/Refract.sksl",
"/sksl/intrinsics/Round.sksl",
"/sksl/intrinsics/RoundEven.sksl",
"/sksl/intrinsics/Saturate.sksl",
Reland "Add some SkSL intrinsics to our dm tests." This reverts commit b576168c8ca86daa494f2d64f2967e83bd65efa9. Reason for revert: disabled floor test due to undiagnosed ANGLE + DX9 + Intel6000 failures Original change's description: > Revert "Add some SkSL intrinsics to our dm tests." > > This reverts commit 0492a744a52db0eaf360d2d3fce3ec5ca75dc5f0. > > Reason for revert: Intel HD6000 + ANGLE DX9 fails the floor() test. > > Original change's description: > > Add some SkSL intrinsics to our dm tests. > > > > This CL adds dm coverage for: > > - abs(half) > > - sign(half) > > - floor > > - ceil > > > > And creates test output for abs(int) and sign(int); these aren't covered > > by dm because they don't exist in ES2 and so are unsupported by Runtime > > Effects. > > > > Change-Id: Ia3e660408cef50dec8fa4b6bdc12906e96179f6e > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360419 > > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > Auto-Submit: John Stiles <johnstiles@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I62121efee9315b16e61e7d38659b6f629bdf8bd8 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362056 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I22f22f631d85d93a8fe5686a99311ec2cf85fa4d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362103 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-29 16:44:13 +00:00
"/sksl/intrinsics/SignFloat.sksl",
"/sksl/intrinsics/SignInt.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/intrinsics/Sin.sksl",
"/sksl/intrinsics/Sinh.sksl",
"/sksl/intrinsics/Smoothstep.sksl",
"/sksl/intrinsics/Sqrt.sksl",
"/sksl/intrinsics/Step.sksl",
"/sksl/intrinsics/Tan.sksl",
"/sksl/intrinsics/Tanh.sksl",
"/sksl/intrinsics/Transpose.sksl",
"/sksl/intrinsics/Trunc.sksl",
"/sksl/intrinsics/UintBitsToFloat.sksl",
"/sksl/intrinsics/Unpack.sksl",
Add support for array-cast syntax in SkSL. Compiling a program with "allow narrowing conversions" actually fixes up narrowing casts in the program by inserting casts wherever they would be needed for type-correctness. For instance, compiling the statement `half h = myFloat;` inserts an appropriate narrowing cast: `half h = half(myFloat);`. The Pipeline stage code generator relies on this behavior, as when it re-emits a runtime effect into a complete SkSL program, the narrowing- conversions flag will no longer be set, but that is okay, because the emitted code now contains typecasts anywhere they would be necessary. Logically, this implies that anything which supports narrowing conversions must be castable between high and low precision. In GLSL and SPIR-V, such a cast is trivial, because the types are the same and the precision qualifiers are treated as individual hints on each variable. In Metal, we dodge the issue by only emitting full-precision types. But we also need to emit raw SkSL from an SkSL program (that is what the Pipeline stage generator does). SkSL already supported every typical cast, but GLSL lacked any syntax for casting an array to a different type. This meant SkSL had no array casting syntax as well. SkSL now has array-cast syntax, but it is only allowed for casting low/high-precision arrays to the same base type. (You can't cast an int array to float, or a signed array to unsigned.) Change-Id: Ia20933541c3bd4a946c1ea38209f93008acdb9cb Bug: skia:12248 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/437687 Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-08-10 20:03:44 +00:00
"/sksl/shared/ArrayCast.sksl",
Implement array == and != on SPIR-V. GLSL (post-ES2) allows array comparison: http://screen/8gryPvb9T7gndyb Unfortunately, because ES2 does not support array comparisons, we can't add this test to the dm test suite. Change-Id: I06b71683e49b2631669cff801dc647951a81a299 Bug: skia:11849 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/394162 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-04-09 03:30:51 +00:00
"/sksl/shared/ArrayComparison.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/ArrayConstructors.sksl",
Demonstrate parsing error with structs and arrays. The fuzzer detected a serious parsing error; a struct containing a vardecl with multiple declarations would interpret arrays incorrectly. An array would be applied to ALL variables in the decl after its initial appearance. That is, `int w, x[10], y, z;` would be interpreted as `int w, x[10], y[10], z[10];`. The fuzzer caught this by putting two arrayed variables in a row; the second variable was interpreted as a nested array, which led to an assertion. This CL contains a simple hand-written test case demonstrating the bug, with the fix coming in a followup. Change-Id: I42d7372ba77fa1528ae24eb8c29a2e5903784139 Bug: oss-fuzz:37622 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/441878 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-08-25 15:54:16 +00:00
"/sksl/shared/ArrayFollowedByScalar.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/ArrayIndexTypes.sksl",
Write test demonstrating bug with array narrowing conversions. We don't currently support this. There's no explicit syntax to cast an array's type, but it can be implicitly required in some situations, like `halfArray == floatArray` (when fAllowNarrowingConversions is on). Change-Id: I00fe0ddd4f2682b2950e828dd78bb941d5f0430e Bug: skia:12248 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/436560 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-08-04 17:27:05 +00:00
"/sksl/shared/ArrayNarrowingConversions.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/ArrayTypes.sksl",
"/sksl/shared/Assignment.sksl",
"/sksl/shared/Caps.sksl",
"/sksl/shared/CastsRoundTowardZero.sksl",
"/sksl/shared/Clockwise.sksl",
Add more dm tests for the comma operator. Change-Id: I37a95fd95c23a91c3510f922bab0569093e612a5 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/364604 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-02 18:58:42 +00:00
"/sksl/shared/CommaMixedTypes.sksl",
Add test to verify side effects from the comma operator. SkVMCodeGenerator was lacking support for the comma operator entirely; this has now been implemented. Change-Id: I9350f54e6ee52764c620116e6dbfe4ca3e9cd47e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/363096 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-01-30 16:06:18 +00:00
"/sksl/shared/CommaSideEffects.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/ComplexDelete.sksl",
"/sksl/shared/ConstArray.sksl",
"/sksl/shared/ConstVariableComparison.sksl",
"/sksl/shared/ConstantIf.sksl",
"/sksl/shared/Control.sksl",
"/sksl/shared/DeadDoWhileLoop.sksl",
"/sksl/shared/DeadIfStatement.sksl",
"/sksl/shared/DeadLoopVariable.sksl",
Fix SPIR-V code generation of dead return statements. If we encounter code like `return 1; return 2;` we need to synthesize a label, even though the second return statement isn't actually reachable. This is harmless and satisfies the SPIR-V validator. Ideally we'd eliminate the dead code entirely, but this case is rare and isn't likely to cause any problems as-is. Change-Id: I2d6219dff6868011353e19a662301bec44a015d6 Bug: skia:12009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/409402 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-05-17 18:46:05 +00:00
"/sksl/shared/DeadReturn.sksl",
Reland "Eliminate unreachable code during optimization." This is a reland of c6260f974261ee9fb5dc9573669559d728a856e8 Problematic DeadReturn.sksl test cases have been moved to DeadReturnES3. Original change's description: > Eliminate unreachable code during optimization. > > The Adreno 5xx and 6xx previously failed the SkSLStaticSwitchInline > test; the driver struggled to interpret code with multiple return > statements in a row. We now detect unreachable statements and eliminate > them. > > Change-Id: I344d632f2488ca65b0635b37bebffe6e4fb607c5 > Bug: skia:12012 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/410256 > Auto-Submit: John Stiles <johnstiles@google.com> > Commit-Queue: Brian Osman <brianosman@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> Bug: skia:12012 Change-Id: I748e8761cbc71c811b5ad8fe49186f980261d8b9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/410793 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-20 18:38:40 +00:00
"/sksl/shared/DeadReturnES3.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/DeadStripFunctions.sksl",
"/sksl/shared/DependentInitializers.sksl",
"/sksl/shared/DerivativesUnused.sksl",
"/sksl/shared/Discard.sksl",
Add unit test for control statements in do-while loop. Change-Id: I8309940f8e40d0e84847ae272830896d010c39de Bug: skia:11219 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/359138 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-26 15:37:41 +00:00
"/sksl/shared/DoWhileControlFlow.sksl",
Update various shared/ tests to run in dm. These tests have updated to return green on success, or red on failure. Some tests were modified slightly to conform to ES2 limitations, or split into separate ES2 and ES3 parts. Change-Id: Ib47aeca217aef33f3c4b5999d93afed5d42a1e62 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/363876 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-01 16:52:10 +00:00
"/sksl/shared/EmptyBlocksES2.sksl",
"/sksl/shared/EmptyBlocksES3.sksl",
Add unit test for control statements in for loops. Change-Id: I94094be7163a04bf48e86406230156a5433469b6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/359140 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>
2021-01-26 16:06:42 +00:00
"/sksl/shared/ForLoopControlFlow.sksl",
Add unit test for for-loop with multiple variables. We lacked test coverage for this case, and this was broken when compound VarDeclarations were split from one Statement into several. Change-Id: I561b4d8acc0bfa01161d873a0c022ec58e316903 Bug: skia:11860 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/396817 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-04-14 19:05:49 +00:00
"/sksl/shared/ForLoopMultipleInit.sksl",
Reland "Don't key progams/pipelines on origin."" Reland works around Adreno issue with this formulation of sk_Clockwise: (sk_RTFlip.y < 0.0 ? !gl_FrontFacing : gl_FrontFacing) and instead adds this to the top of the function: bool sk_Clockwise = gl_FrontFacing; if (sk_RTFlip.y < 0.0) { sk_Clockwise = !sk_Clockwise; } Original description: SkSL language features that are origin sensitive now use a uniform to conditionally flip their result rather than generating different code. Previously we would insert a "rt height" uniform if sk_FragCoord needed to be flipped. sk_FragCoord,y was implemented as "realFragCoord.y" or "rtHeight - realFragCoord.y" depending on SkSL::ProgramSettings::fFlipY. Now we instead use a two component vector rtFlip and sk_FragCoord.y is always "rtFlip.x + rtFlip.y*realFragCoord.y". We configure rtFlip as either (0, 1) or (rtHeight, -1). sk_Clockwise and dFdy simiarly use rtFlip.y to emit code that always works with either origin. Bug: skia:12037 Change-Id: I3a2ad6f5667eb4dcd823b939abd5698f89b58929 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/425178 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2021-07-07 13:41:17 +00:00
"/sksl/shared/FragCoords.sksl",
Add test containing anonymous function parameters. SkSL will reject ES2-compatible code because function parameters always require a name in SkSL. (A followup CL relaxes this restriction and allows anonymous parameters in SkSL.) Change-Id: Ifdcf0fcbe0f52d16007c018b545631ca4033a8c4 Bug: skia:12769 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/489537 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>
2021-12-28 19:33:45 +00:00
"/sksl/shared/FunctionAnonymousParameters.sksl",
Update function-type-matching tests to work as Runtime Effects. Previously, our only test was invoking `sin(1)` which is a pretty ineffective test. Now, we test args and return types for all the basic scalars/vectors/matrices. Change-Id: I7d335303eef8b9c9c6cfef2265a15bbd9bd73e0c Bug: skia:11246 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/363943 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-01 21:36:13 +00:00
"/sksl/shared/FunctionArgTypeMatch.sksl",
"/sksl/shared/FunctionReturnTypeMatch.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/FunctionPrototype.sksl",
"/sksl/shared/Functions.sksl",
"/sksl/shared/GaussianBlur.sksl",
"/sksl/shared/GeometricIntrinsics.sksl",
"/sksl/shared/HelloWorld.sksl",
"/sksl/shared/Hex.sksl",
Migrate more SkSL tests to run in dm. - CastsRoundTowardZero - Functions - GeometricIntrinsics - HelloWorld - Hex Other test updates: - DeadLoopVariable (for-loop structure incompatible with ES2) - FunctionPrototype (RTE currently disallows calling undef'd functions) - HexUnsigned (unsigned types incompatible with ES2) Change-Id: I794bee24dfac55281c9b8b130529888ba2546290 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/364678 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-03 22:44:47 +00:00
"/sksl/shared/HexUnsigned.sksl",
Fix up test SkSLInlineWithInoutArgument. The test has been moved to shared/, since it's a valid test, but it is no longer related to inlining, as the inliner no longer attempts to inline functions with inouts at all. Also, one function here (outParameterIgnore) actually invoked undefined behavior and has been removed. According to the GLSL ES2 docs: "If a function does not write to an out parameter, the value of the actual parameter is undefined when the function returns." SkVM leaves the value unchanged, so SKSL_TEST_CPU would pass, but a GPU might clear it (and in fact, my GPU does). Change-Id: I77c77ed1354bc980344ec5c406992bd62015f5e5 Bug: skia:11919 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/499752 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2022-01-25 20:54:24 +00:00
"/sksl/shared/InoutParameters.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/InstanceID.vert",
"/sksl/shared/InterfaceBlockNamed.sksl",
Add default uniform binding value for Metal/SPIR-V. This allows interface blocks in Metal to compile even if `layout(binding=...)` is not specified. It will also be used in SPIR-V in the followup CL, when an interface block is automatically synthesized for top-level uniforms. This CL also reorganizes the unit tests around uniforms a bit. Change-Id: Ia898c536b454dda6f51677e232a8f6e6c3606022 Bug: skia:11225 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360778 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-28 16:47:29 +00:00
"/sksl/shared/InterfaceBlockNamedArray.sksl",
Migrate matrix SkSL test to dm. This uncovered a bug in Metal code generation of `matX *= matY` which is now fixed. (It was emitting the helper function more than once.) Change-Id: I0aeb0efe7ab5fbf5592a8ca6f4f5b50354d3d7f4 Bug: skia:11262 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365489 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-03 18:03:29 +00:00
"/sksl/shared/Matrices.sksl",
"/sksl/shared/MatricesNonsquare.sksl",
Revert "Disallow matrix ctors which overflow a column." This reverts commit eb68973c2f5ac8f8dd169037cfc32885a024448d. Reason for revert: ES2 conformance test checks this Original change's description: > Disallow matrix ctors which overflow a column. > > The GLSL spec allows matrix constructors containing vectors that would > split between multiple columns of the matrix. However, in practice, this > does not actually work well on a lot of GPUs! > > - "cast not allowed", "internal error": > Tegra 3 > Quadro P400 > GTX 660 > GTX 960 > - Compiles, but generates wrong result: > RadeonR9M470X > RadeonHD7770 > > Since this isn't a pattern we expect to see in user code, we now report > it as an error at compile time. mat2(vec4) is treated as an exceptional > case and still allowed. > > Change-Id: Id6925984a2d1ec948aec4defcc790a197a96cf86 > Bug: skia:12443 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/449518 > Commit-Queue: John Stiles <johnstiles@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Bug: skia:12443 Change-Id: I5a32744c88b9b830ad657488824c8c7dd0b0a652 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/458056 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com>
2021-10-14 00:01:15 +00:00
"/sksl/shared/MatrixConstructorsES2.sksl",
"/sksl/shared/MatrixConstructorsES3.sksl",
Add SkSL test for matrix equality/inequality operators. Disabled on Adreno 5xx/6xx as the tests do not pass on those GPUs: http://screen/3Dkgs9syj37cjBV Change-Id: Ib935d01e8f06dbfe7decd5cc4e52e0688b48be08 Bug: skia:11306, skia:11308 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368805 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-10 17:21:51 +00:00
"/sksl/shared/MatrixEquality.sksl",
Reland "Better Matrix/Scalar testing" This reverts commit 455e580b9c786b923fd4af54fdc84e2b289c1581. Reason for revert: Fixing the build break Original change's description: > Revert "Better Matrix/Scalar testing" > > This reverts commit abb611550eb8e8b82949895395a5a6c3e06ae7ab. > > Reason for revert: Build break > Original change's description: > > Better Matrix/Scalar testing > > > > Adding tests for matrix math and comparison > > bug: skia:12681 > > > > Change-Id: Ia1537ee2e411383749456fd6ff938b7c9a2e1061 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/493416 > > Reviewed-by: John Stiles <johnstiles@google.com> > > Commit-Queue: Julia Lavrova <jlavrova@google.com> > > Change-Id: I70871b4b75c1f10e870dc5e884a42405a80fc0f9 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/494816 > Reviewed-by: John Stiles <johnstiles@google.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Julia Lavrova <jlavrova@google.com> Change-Id: Idef8dbcd6f5a5bbe84d3fd86888e3eab0f0521ee Reviewed-on: https://skia-review.googlesource.com/c/skia/+/494817 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Julia Lavrova <jlavrova@google.com>
2022-01-13 18:53:00 +00:00
"/sksl/shared/MatrixScalarMath.sksl",
Reland "Add tests for matrix-vector conversions." This reverts commit f009db5b854b350e9f884fd5268e80271537578b. Reason for revert: test disabled on Win10 + Intel 4400/6100 Original change's description: > Revert "Add tests for matrix-vector conversions." > > This reverts commit a89781215a8182beb0893a004654fef157313259. > > Reason for revert: breakage on Windows > > Original change's description: > > Add tests for matrix-vector conversions. > > > > GLSL supports casting vec4 into mat2 and vice versa, so SkSL should have > > equivalent support. Adding tests as a starting point. > > > > Change-Id: If8bcbf99afcec94d948d5da9e6205cb4a232af18 > > Bug: skia:12067 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/425837 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I2563041f538b1b20074385f1b61af5fc506ffad5 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:12067 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426057 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> Bug: skia:12067 Change-Id: I1379914ee39ce340f09b11b3754820db9c645378 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426058 Reviewed-by: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-07-08 22:20:21 +00:00
"/sksl/shared/MatrixToVectorCast.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/MultipleAssignments.sksl",
"/sksl/shared/NoFragCoordsPos.vert",
"/sksl/shared/NoFragCoordsPosRT.vert",
"/sksl/shared/NormalizationVert.vert",
"/sksl/shared/NumberCasts.sksl",
"/sksl/shared/NumberConversions.sksl",
Add basic unit test for octal parsing support. This is required by the ES2 standard: http://screen/Qysv4fPW5r5LA9e This actually already worked fine because `strtoull` natively recognizes octal values without any work on our part. However, we lacked a test. Change-Id: I3033de899918abe99c63a9b7b79bd4c3374ee315 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/471716 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-11-16 13:14:54 +00:00
"/sksl/shared/Octal.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/Offset.sksl",
Run the SkSL Operators test as a Runtime Effect. The test has been split into an ES2 version and ES3 version; the ES2 side omits unsupported integer ops like << >> & | ^ %. Change-Id: Iba16d469a477809b17a823b1c68ae8937624c68e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362616 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-01-30 16:08:13 +00:00
"/sksl/shared/OperatorsES2.sksl",
"/sksl/shared/OperatorsES3.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/Ossfuzz26167.sksl",
Fix up outdated tests. Removed error tests which no longer test anything: - UseWithoutInitialize...: we no longer track variable use-before-init. - InlineDivideByZero: we no longer constant-fold the result of an inlined function call into its parent statement. - Unreachable: we no longer report unreachable statements. And fixed some minor test-case issues: - StaticSwitchConditionalBreak: we still check this, but the function was being dead-stripped before this check could run. Renamed to main. - OssFuzzXxxxx: these cases no longer report errors, but they are still valuable as regression tests; moved to `shared/`. Change-Id: Iade3cff821dc998cacfd02f62d3ac4625e48904c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/387820 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-03-22 19:42:16 +00:00
"/sksl/shared/Ossfuzz26759.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/Ossfuzz28794.sksl",
"/sksl/shared/Ossfuzz28904.sksl",
Fix up outdated tests. Removed error tests which no longer test anything: - UseWithoutInitialize...: we no longer track variable use-before-init. - InlineDivideByZero: we no longer constant-fold the result of an inlined function call into its parent statement. - Unreachable: we no longer report unreachable statements. And fixed some minor test-case issues: - StaticSwitchConditionalBreak: we still check this, but the function was being dead-stripped before this check could run. Renamed to main. - OssFuzzXxxxx: these cases no longer report errors, but they are still valuable as regression tests; moved to `shared/`. Change-Id: Iade3cff821dc998cacfd02f62d3ac4625e48904c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/387820 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-03-22 19:42:16 +00:00
"/sksl/shared/Ossfuzz29085.sksl",
Use unsigned values when constant-folding integer vectors We already had this trick for scalar integers, this extends it to integer vectors. As with prior work in this area, it would be better to detect this case and produce an error, but now we at least produce consistent and well-defined results (rather than undefined signed integer overflow). Bug: skia:10932 Bug: oss-fuzz:29494 Change-Id: I45526fe96b6ea42c0e88b9862f6961b316810321 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/363962 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-02-01 18:48:50 +00:00
"/sksl/shared/Ossfuzz29494.sksl",
Fix for fuzzer-discovered error in SPIR-V with RTFlip. SPIR-V code generation synthesizes some extra variables that don't actually exist in the Program. Checking the ProgramUsage of these variables would fail; ProgramUsage::get doesn't know about these variables, so it asserts (and would consider them as dead even if it didn't assert). We now track our SPIR-V bonus variables in a separate set, and always report them as live. Change-Id: If2f681470654025abf7ca4b3ec8126de2eb01297 Bug: oss-fuzz:36770 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/435625 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-08-02 15:56:16 +00:00
"/sksl/shared/Ossfuzz36770.sksl",
Fix fuzzer-discovered error with swizzling matrices. The optimization logic for swizzling a constructor assumed that every argument to the constructor was a scalar or vector. When it was written, this assumption was true. However, we recently added support for casting mat2x2 to float4 which violates the assumption. We now check every argument and do not attempt to optimize if a non-scalar, non-vector arg is found. Change-Id: Ia2b297bd62dfdf4af56712164fbc80c29c9611eb Bug: oss-fuzz:36852 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/437017 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-08-05 15:49:05 +00:00
"/sksl/shared/Ossfuzz36852.sksl",
Fix inliner bug discovered by fuzzer. The inliner contained a type error when attempting to inline a function that takes an array as input. The scratch copy of the array was created as `float[123] var;` instead of `float var[123];`. This led to an assertion in VarDeclaration::Make. Change-Id: I5128fe71462bb59a015a7b4e59c1a74800828b16 Bug: oss-fuzz:37466 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/441576 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>
2021-08-24 13:59:34 +00:00
"/sksl/shared/Ossfuzz37466.sksl",
Fix invalid variable ref-kind discovered by fuzzer. No-op arithmetic simplification will convert expressions like `x += 0` to `x`. When making this simplification, we will also downgrade the ref- kind of `x` from "write" to "read" since the new expression is no longer an assignment. The fuzzer discovered that the ref-kind downgrade was too aggressive, and would also traverse into nested subexpressions and downgrade them as well. That is, for `x[y=z] += 0` would convert both `x` and `y` into "read" references, which is incorrect; `y` is still being written to. The fuzzer managed to turn this mistake into an assertion by leveraging a separate optimization. It added a leading, side-effect-less comma expression for us to detect as worthless and eliminate. In doing so, we clone the expression with the busted ref-kind, triggering an assertion. Change-Id: I42fc31f6932f679ae875e2b49db2ad2f4e89e2cb Bug: oss-fuzz:37677 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/442536 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-08-27 03:34:59 +00:00
"/sksl/shared/Ossfuzz37677.sksl",
Fix array timeout discovered by the fuzzer. The fuzzer discovered that, when we attempt to verify that an array doesn't contain any literal values that are out-of-range for its base type, we pay a linear-time cost based on the size of the array. This happens even when the array value isn't known at compile time; we still iterate over its slot count and diligently discover that every single constant-subexpression slot in the expression is "null". We now have a helper function on Expression, `allowsConstantSubexpressions`, which only returns true for expression kinds that can contain constant subexpressions. We use this helper to skip over this linear-per-subexpression check when the expression cannot possibly contain a constant subexpression. In particular, `AnyConstructor::compareConstant` and `Type::checkForOutOfRangeLiteral` will now early-out for expressions that can't possibly contain a constant subexpression. Change-Id: Ia34e422afa67b478a8616acb0a0e9cd211b29698 Bug: oss-fuzz:37900 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/444136 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>
2021-08-31 18:58:08 +00:00
"/sksl/shared/Ossfuzz37900.sksl",
Replace getConstantSubexpression with getConstantValue. The only type of expressions that getConstantSubexpression could ever return are Literal and nullptr. getConstantValue now returns an optional<double>; nullopt indicates a non-constant value in the slot. This simplifies most use cases, and allows us to get rid of some extra "zero" and "one" Literal objects in some of our Constructor classes. This change fixes a recent fuzzer issue. The fuzzer had discovered that calling `getConstantSubexpression` on a ConstructorCompoundCast that contained a compile-time-constant value would return literals of the wrong type (the cast was not applied). By nesting repeated matrix casts, this type confusion could be turned into an assertion. Change-Id: Icee69219e6db2822ffdfab4e5ccdaff54584a4b6 Bug: oss-fuzz:41000 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/471376 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-11-15 13:42:15 +00:00
"/sksl/shared/Ossfuzz41000.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/OutParams.sksl",
Fix up SkSL test on Wembley. Test "InlinerHonorsGLSLOutParamSemantics" was failing on Wembley devices and is now disabled on that GPU. Also, it turns out that the inliner has ignored functions with out params for a long time now, but our test names haven't been updated to account for this. So, did some additional cleanup: - "InlinerHonorsGLSLOutParamSemantics" (the test in question) has been moved to shared/ and renamed to "OutParamsAreDistinct." - Removed test "OutParamsNoInline" as it is functionally the same as "OutParams". Change-Id: I1431ed197b9216cb482eee4f5e4eb2579a5303f7 Bug: skia:12858 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/502303 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com> Commit-Queue: Kevin Lubick <kjlubick@google.com>
2022-01-31 19:35:08 +00:00
"/sksl/shared/OutParamsAreDistinct.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/OutParamsTricky.sksl",
Add test demonstrating overflow error in SkSL. Change-Id: Ic6a3ce722c607d4d3c47d37e5749a01ae5fb193f Bug: skia:12050 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/412668 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-26 20:43:19 +00:00
"/sksl/shared/Overflow.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/RectangleTexture.sksl",
"/sksl/shared/ResizeMatrix.sksl",
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
"/sksl/shared/ResizeMatrixNonsquare.sksl",
Support half4 return values from main() in the SPIR-V code generator. This creates a helper function, _entrypoint, which invokes main() and assigns its result into sk_FragColor. We also make sure to prevent sk_FragColor from being dead-stripped from the code during IR generation. At present this is useful for allowing our SkSL test shaders to compile. Change-Id: I2d7fab0e1959a77778ffdb18ca569e869bcaeece Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358525 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-27 00:58:22 +00:00
"/sksl/shared/ReturnBadTypeFromMain.sksl",
"/sksl/shared/ReturnColorFromMain.sksl",
Detect functions that fail to return a value, without using CFG. This check now runs at function finalization time, before constant propagation has occurred; this affected the "DeadIfStatement" test. Our detection isn't smart enough to realize that a loop will run zero times, so it treats `for` and `while` loops as always running at least once. This isn't strictly correct, but it actually mirrors how the CFG implementation works anyway. The only downside is that we would not flag code like `for (i=0; i<0; ++i) { return x; }` as an error. Change-Id: I5e43a6ee3a3993045559f0fb0646d36112543a94 Bug: skia:11377 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/379056 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-03-04 21:00:20 +00:00
"/sksl/shared/ReturnsValueOnEveryPathES2.sksl",
"/sksl/shared/ReturnsValueOnEveryPathES3.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/SampleLocations.vert",
Migrate even more SkSL tests to run in dm. - ResizeMatrix - ScalarConversionConstructorsES2 - StackingVectorCasts - StaticIf - SwizzleBoolConstants Non-ES2 compatible tests: - ResizeMatrixNonsquare - ScalarConversionConstructorsES3 Newly discovered bugs: - skia:11278 SPIR-V does not support casting non-square matrices Change-Id: I7feb78f0380d0a9cb328ec61f96a364ad1281432 Bug: skia:11009, skia:11278 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366408 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-05 14:31:21 +00:00
"/sksl/shared/ScalarConversionConstructorsES2.sksl",
"/sksl/shared/ScalarConversionConstructorsES3.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/ScopedSymbol.sksl",
"/sksl/shared/StackingVectorCasts.sksl",
"/sksl/shared/StaticIf.sksl",
"/sksl/shared/StaticSwitch.sksl",
"/sksl/shared/StaticSwitchWithBreak.sksl",
"/sksl/shared/StaticSwitchWithBreakInsideBlock.sksl",
"/sksl/shared/StaticSwitchWithConditionalBreak.sksl",
"/sksl/shared/StaticSwitchWithConditionalBreakInsideBlock.sksl",
Fix switch optimization pass. The optimizer now properly recognizes all types of exits from a switch statement. Break, continue and return are all potential exits and need to be considered when determining the exit path from the switch. Previously, dead code elimination was hiding the effects of this bug from us, but it meant that an optimized switch had the potential to generate lots of worthless IR nodes which then needed to be detected and eliminated by the CFG. In particular, this affected the enum form of blend, causing a catastrophic amount of extra work to be done. Change-Id: If857e38cadfc016884624ea4db25a273ad3dce5b Bug: skia:11352 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372958 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-23 14:58:04 +00:00
"/sksl/shared/StaticSwitchWithContinue.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/StaticSwitchWithFallthroughA.sksl",
"/sksl/shared/StaticSwitchWithFallthroughB.sksl",
"/sksl/shared/StaticSwitchWithStaticConditionalBreak.sksl",
"/sksl/shared/StaticSwitchWithStaticConditionalBreakInsideBlock.sksl",
Demonstrate parsing error with structs and arrays. The fuzzer detected a serious parsing error; a struct containing a vardecl with multiple declarations would interpret arrays incorrectly. An array would be applied to ALL variables in the decl after its initial appearance. That is, `int w, x[10], y, z;` would be interpreted as `int w, x[10], y[10], z[10];`. The fuzzer caught this by putting two arrayed variables in a row; the second variable was interpreted as a nested array, which led to an assertion. This CL contains a simple hand-written test case demonstrating the bug, with the fix coming in a followup. Change-Id: I42d7372ba77fa1528ae24eb8c29a2e5903784139 Bug: oss-fuzz:37622 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/441878 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-08-25 15:54:16 +00:00
"/sksl/shared/StructArrayFollowedByScalar.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/Structs.sksl",
Add SkSL test for functions that operate on structs This is a known deficiency of runtime effects, next step is to fix how they manage function signatures to solve the problem. Bug: skia:10939 Change-Id: Id934e0acdf774b03bd6edce78d7b2c077bdeae00 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360603 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-01-27 18:53:43 +00:00
"/sksl/shared/StructsInFunctions.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/StructMaxDepth.sksl",
"/sksl/shared/SwizzleBoolConstants.sksl",
Migrate some SkSL swizzle tests to dm. Change-Id: I2bd6bf9c368359a2b21861c1b6f621040d335111 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/367056 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-05 21:24:03 +00:00
"/sksl/shared/SwizzleByConstantIndex.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/SwizzleByIndex.sksl",
"/sksl/shared/SwizzleConstants.sksl",
"/sksl/shared/SwizzleLTRB.sksl",
"/sksl/shared/SwizzleOpt.sksl",
"/sksl/shared/SwizzleScalar.sksl",
Add scalar-swizzling tests for int and bool types. Boolean scalar-swizzling is currently not working. Change-Id: Icd965e4b64a12311d098168f65622110d5fb3437 Bug: skia:12195 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/427038 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>
2021-07-12 18:59:19 +00:00
"/sksl/shared/SwizzleScalarBool.sksl",
"/sksl/shared/SwizzleScalarInt.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/TernaryAsLValueEntirelyFoldable.sksl",
"/sksl/shared/TernaryAsLValueFoldableTest.sksl",
Optimize ternary tests that check a const variable. This enables the ternary to be optimized away in code like: const bool SHINY = true; color = SHINY ? add_shine(x) : x; // to --> `color = add_shine(x);` Without constant propagation. Also, I added a unit test for ternary expression simplification; I wasn't able to find an existing one. When the optimization flag is disabled, this CL actually removes the optimization of `true ? x : y` --> `x` entirely; previously, this substitution would be made regardless of optimization settings. Change-Id: I93a8b9d4027902d35f8a19cfd6417170b209d056 Bug: skia:11343 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/379297 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-03-05 20:22:48 +00:00
"/sksl/shared/TernaryExpression.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/Texture1D.sksl",
"/sksl/shared/Texture2D.sksl",
"/sksl/shared/TextureSharpen.sksl",
"/sksl/shared/UnaryPositiveNegative.sksl",
"/sksl/shared/UniformArray.sksl",
Add default uniform binding value for Metal/SPIR-V. This allows interface blocks in Metal to compile even if `layout(binding=...)` is not specified. It will also be used in SPIR-V in the followup CL, when an interface block is automatically synthesized for top-level uniforms. This CL also reorganizes the unit tests around uniforms a bit. Change-Id: Ia898c536b454dda6f51677e232a8f6e6c3606022 Bug: skia:11225 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360778 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-28 16:47:29 +00:00
"/sksl/shared/UniformBuffers.sksl",
"/sksl/shared/Uniforms.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/UnusedVariables.sksl",
"/sksl/shared/VectorConstructors.sksl",
Add SkSL test for vector-scalar math. We had constant-folding tests for vector-scalar arithmetic, but didn't have an equivalent SkSL unit test for vector-scalar arithmetic that actually needs to be computed at runtime. This exposes two SPIR-V bugs: one was previously known, but the other is a new discovery. Change-Id: I28737128f20b445797c6c29872335d05f94cc95c Bug: skia:11267, skia:11788 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388739 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-03-25 15:43:40 +00:00
"/sksl/shared/VectorScalarMath.sksl",
Reland "Add tests for matrix-vector conversions." This reverts commit f009db5b854b350e9f884fd5268e80271537578b. Reason for revert: test disabled on Win10 + Intel 4400/6100 Original change's description: > Revert "Add tests for matrix-vector conversions." > > This reverts commit a89781215a8182beb0893a004654fef157313259. > > Reason for revert: breakage on Windows > > Original change's description: > > Add tests for matrix-vector conversions. > > > > GLSL supports casting vec4 into mat2 and vice versa, so SkSL should have > > equivalent support. Adding tests as a starting point. > > > > Change-Id: If8bcbf99afcec94d948d5da9e6205cb4a232af18 > > Bug: skia:12067 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/425837 > > Auto-Submit: John Stiles <johnstiles@google.com> > > Commit-Queue: Brian Osman <brianosman@google.com> > > Reviewed-by: Brian Osman <brianosman@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I2563041f538b1b20074385f1b61af5fc506ffad5 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:12067 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426057 > Reviewed-by: John Stiles <johnstiles@google.com> > Commit-Queue: John Stiles <johnstiles@google.com> Bug: skia:12067 Change-Id: I1379914ee39ce340f09b11b3754820db9c645378 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426058 Reviewed-by: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-07-08 22:20:21 +00:00
"/sksl/shared/VectorToMatrixCast.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/shared/VertexID.vert",
Add unit test for control statements in while loops. Change-Id: I924ac75b5f8a397f7af7a06925ef0c9deba5c509 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/359141 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>
2021-01-26 16:16:34 +00:00
"/sksl/shared/WhileLoopControlFlow.sksl",
Clean up SkSL test compilation in preparation for Metal support. Now uses a GN template to avoid copy-pasting the same logic for each type of test we want to perform, and the same file to be compiled in more than one way at a time via an extra flag to compile_sksl_tests.py. Change-Id: I8aadedeb140d78d58a345a2bac0da3d9c77e9a19 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319347 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 20:42:09 +00:00
]
Migrate constant folding tests into a separate directory. This CL also adds tests for vector*scalar and scalar*vector folding. We currently do not constant-fold these, but support will be added in a followup CL. Change-Id: I68d7374ae15ab2f4d805a095803b645c92fb03d9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/352237 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-11 16:07:01 +00:00
sksl_folding_tests = [
Add test for folding of == and != for arrays. We don't directly support this today at all. In practice, though, simple constant arrays are detected as equal in the constant-folding pass because they hit the `x == x` self-equality check (using `IsSameExpressionTree`). This does not work for our inequality tests, though, so those do not fold. Change-Id: I6730a9a2d1da9ac613ee58889d651f3ff65b1d2d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/391057 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-31 14:38:45 +00:00
"/sksl/folding/ArrayFolding.sksl",
Allow non-trivial constant expressions for array sizes. This fixes GLSL ES2 conformance test `array`. Change-Id: I6ebee9253e1e8c394d9ddb6899e3a0940b7a38ef Bug: skia:12495 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/458718 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-10-12 20:53:24 +00:00
"/sksl/folding/ArraySizeFolding.sksl",
Add SkSL test demonstrating missed optimization with +=. Currently, SkSL is able to constant-propagate `x = x + constant` into `x = constant` when the starting value of x is known. However, it is not able to do the same optimization for `x += constant`. This test demonstrates that once += is encountered, we lose track of x's value and can no longer propagate its value. (This is equally true of all the op-assignment operators, += -= *= /= etc.) Change-Id: I3523e96baf9a73982cf3b09f0d23b95adacf106b Bug: skia:11192 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368248 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-02-09 15:38:59 +00:00
"/sksl/folding/AssignmentOps.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/folding/BoolFolding.sksl",
Add test demonstrating missed opportunities with casts. A cast like `float(five)` or `int4(colorGreen)` should detect const variables and replace the expression with its compile-time constant equivalent value. At present, this replacement is missed, which inhibits further optimization opportunities on the expression. (This CL is very similar in spirit to http://review.skia.org/404676) Change-Id: I04b5c435a30d2afcdbdb3d020adc15e9c651cc31 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/405682 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-05-07 15:16:26 +00:00
"/sksl/folding/CastFolding.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/folding/FloatFolding.sksl",
"/sksl/folding/IntFoldingES2.sksl",
"/sksl/folding/IntFoldingES3.sksl",
"/sksl/folding/MatrixFoldingES2.sksl",
"/sksl/folding/MatrixFoldingES3.sksl",
[sksl] Special-case unary negation on matrix types in MSL/SPIR-V MSL does not support the unary "-" operator on matrix types. Similarly the SPIR-V OpFNegate/OpSNegate operations only work on scalar and vector type. * An expression such as "-<mat>" is now transformed to "-1.0 * <mat>" when generating MSL. * The same expression now generates a component-wise negation in SPIR-V, matching what glslang outputs for GLSL. * A unary "+" is now treated as NOP for MSL, matching the SPIR-V backend. An expression such as "+<expr>" is now evaluated as "<expr>". * The shared/Negation.sksl has been moved to folding/ as much of its contents exercise constant-folding of comparison expressions. * The shared/UnaryPositiveNegative.sksl test has been extended to exercise scalar and matrix types. NOTE: The SPIR-V backend changes have caused a minor re-ordering of SSA IDs generated when writing out a prefix-expression. The affected gold files have been updated. Bug: skia:12627, skia:12992 Change-Id: Iec5cdafc591aed7e49b3b52bda42a02661380bab Reviewed-on: https://skia-review.googlesource.com/c/skia/+/513976 Auto-Submit: Arman Uguray <armansito@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-03-01 19:39:57 +00:00
"/sksl/folding/Negation.sksl",
[sksl][test] Add more folding tests for side-effecting expressions Moved the MatrixFoldingES2.sksl test case for matrix construction with side-effects into a new PreserveSideEffects.sksl test and added new test cases for various vector and matrix types and constructors. The new test is written such that none of its contents should be folded away. Note: This test does not pass on NVIDIA GPUs when using OpenGL as discussed in skia:13035. Notably, NONE of the increments are executed on those GPUs as ALL increment expressions seemingly get subjected to constant-folding. The test is disabled on NVIDIA GPU bots. This also means that the remaining MatrixFoldingES2.sksl tests now work on NVIDIA GPUs when using OpenGL (with the exception of Tegra3 + OpenGL ES). Bug: skia:13035, skia:11919 Change-Id: I561bb62fe2b6b814ba80fbc492d3885bbcd6b65b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/518278 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-03-10 17:27:58 +00:00
"/sksl/folding/PreserveSideEffects.sksl",
Reduce self-assignment expressions (`x = x`) into just `x`. Change-Id: I44356aa781f208f4941dbeb617a30318e36c1081 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/367062 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-02-10 19:04:24 +00:00
"/sksl/folding/SelfAssignment.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/folding/ShortCircuitBoolFolding.sksl",
Add test demonstrating swizzled constant folding. At present, this is a missed optimization opportunity. These will be optimized in a followup CL. Change-Id: I8882058900cdc12c8ab0df03e36ebfb9d8022f01 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402580 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>
2021-04-29 15:14:38 +00:00
"/sksl/folding/SwizzleFolding.sksl",
Add test for switch-case folding. Change-Id: I3dabd77890a73ea054bb57d466a6ed8273eae3e8 Bug: skia:12811 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/494196 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-01-12 21:36:02 +00:00
"/sksl/folding/SwitchCaseFolding.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/folding/VectorScalarFolding.sksl",
"/sksl/folding/VectorVectorFolding.sksl",
Migrate constant folding tests into a separate directory. This CL also adds tests for vector*scalar and scalar*vector folding. We currently do not constant-fold these, but support will be added in a followup CL. Change-Id: I68d7374ae15ab2f4d805a095803b645c92fb03d9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/352237 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-11 16:07:01 +00:00
]
Clean up SkSL test compilation in preparation for Metal support. Now uses a GN template to avoid copy-pasting the same logic for each type of test we want to perform, and the same file to be compiled in more than one way at a time via an extra flag to compile_sksl_tests.py. Change-Id: I8aadedeb140d78d58a345a2bac0da3d9c77e9a19 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319347 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 20:42:09 +00:00
sksl_inliner_tests = [
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/inliner/DoWhileBodyMustBeInlinedIntoAScope.sksl",
"/sksl/inliner/DoWhileTestCannotBeInlined.sksl",
"/sksl/inliner/ForBodyMustBeInlinedIntoAScope.sksl",
"/sksl/inliner/ForInitializerExpressionsCanBeInlined.sksl",
"/sksl/inliner/ForWithReturnInsideCannotBeInlined.sksl",
"/sksl/inliner/ForWithoutReturnInsideCanBeInlined.sksl",
"/sksl/inliner/IfBodyMustBeInlinedIntoAScope.sksl",
"/sksl/inliner/IfElseBodyMustBeInlinedIntoAScope.sksl",
"/sksl/inliner/IfElseChainWithReturnsCanBeInlined.sksl",
"/sksl/inliner/IfTestCanBeInlined.sksl",
"/sksl/inliner/IfWithReturnsCanBeInlined.sksl",
"/sksl/inliner/InlineKeywordOverridesThreshold.sksl",
"/sksl/inliner/InlineThreshold.sksl",
"/sksl/inliner/InlinerElidesTempVarForReturnsInsideBlock.sksl",
"/sksl/inliner/InlinerUsesTempVarForMultipleReturns.sksl",
"/sksl/inliner/InlinerUsesTempVarForReturnsInsideBlockWithVar.sksl",
"/sksl/inliner/InlineWithModifiedArgument.sksl",
"/sksl/inliner/InlineWithNestedBigCalls.sksl",
"/sksl/inliner/InlineWithNestedCalls.sksl",
"/sksl/inliner/InlineWithUnmodifiedArgument.sksl",
"/sksl/inliner/InlineWithUnnecessaryBlocks.sksl",
"/sksl/inliner/InlinerAvoidsVariableNameOverlap.sksl",
"/sksl/inliner/InlinerManglesNames.sksl",
Add noinline keyword to SkSL. As you might expect, a function tagged with `noinline` will never be considered as a candidate for inlining. Change-Id: Ia098f8974e6de251d78bb2a76cd71db8a86bc19c Bug: skia:11362 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/382337 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-03-10 03:14:27 +00:00
"/sksl/inliner/NoInline.sksl",
Fix inliner bug discovered by fuzzer. Intrinsic-call optimization can be triggered during inlining. In this case, inlining turned `normalize(x)` into `normalize(constant-value)`. DSL is used to implement optimizations for a handful of intrinsic calls, including `normalize`, which internally relies on `length`. The DSL expects that it can use the IRGenerator to handle function calls. This was not working because we were finished with the initial compilation pass, and the IRGenerator's symbol table is removed when finish() was called. We now temporarily give a symbol table back to the IRGenerator while the inliner runs. We remove it again as soon as inlining is complete. Change-Id: I6da98788d93749ffeb008c1f4c3f72b436e8ceeb Bug: oss-fuzz:37994 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/445956 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-09-07 02:17:58 +00:00
"/sksl/inliner/Ossfuzz37994.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/inliner/ShortCircuitEvaluationsCannotInlineRightHandSide.sksl",
Demonstrate a bug with inlined static switches. When we detect a static switch, the optimizer finds the matching switch- case and eliminates all the other switch-cases. It handles case fall-through by scanning forward and looking for an unconditional break. However, the inliner has an interesting quirk--it can replace `return` statements inside of a switch with `continue` statements, since the body of the inlined function has been wrapped with a for-loop to allow for early exits. The optimizer does not recognize these continue statements as exits from the switch (although they certainly qualify), so it treats continues as fallen-through and keeps emitting switch-cases. The dead-code elimination pass was actually doing us a favor here and eliminating the excess code later. A flag was added to disable DCE in order to reveal the problem in a test. Change-Id: I8ff19fde5e32d0ab73d7c5411da40cb953a446f5 Bug: skia:11352 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372956 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-02-20 13:00:43 +00:00
"/sksl/inliner/StaticSwitch.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/inliner/StructsCanBeInlinedSafely.sksl",
"/sksl/inliner/SwitchWithCastCanBeInlined.sksl",
"/sksl/inliner/SwitchWithoutReturnInsideCanBeInlined.sksl",
"/sksl/inliner/SwizzleCanBeInlinedDirectly.sksl",
"/sksl/inliner/TernaryResultsCannotBeInlined.sksl",
"/sksl/inliner/TernaryTestCanBeInlined.sksl",
"/sksl/inliner/TrivialArgumentsInlineDirectly.sksl",
"/sksl/inliner/WhileBodyMustBeInlinedIntoAScope.sksl",
"/sksl/inliner/WhileTestCannotBeInlined.sksl",
Support testing error cases in our SkSL unit test goldens. Change-Id: I56e19153597e2c4393c5821314b82937828c0d50 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/316569 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-14 20:46:40 +00:00
]
Migrate several GLSL workaround unit tests to golden files. We now support building an SkSL golden output twice, once honoring the custom #pragma settings, and once more ignoring the settings. This allows us to see the output of the workaround technique, alongside the "default-settings" output which should not contain a workaround. To implement this, skslc now supports a flag: --[no]settings. When it's set, /*#pragma settings*/ comments are honored. When it's not set, skslc ignores the comments. compile_sksl_tests.py passes this flag along to skslc. This approach is not strictly limited to workarounds; the "TypePrecision" GLSL test was also updated to use this technique. Change-Id: I79204df047b024533ed6bc1f4c088e0e878d5bb1 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317246 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-16 21:46:37 +00:00
Clean up SkSL test compilation in preparation for Metal support. Now uses a GN template to avoid copy-pasting the same logic for each type of test we want to perform, and the same file to be compiled in more than one way at a time via an extra flag to compile_sksl_tests.py. Change-Id: I8aadedeb140d78d58a345a2bac0da3d9c77e9a19 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319347 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 20:42:09 +00:00
sksl_blend_tests = [
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/blend/BlendClear.sksl",
"/sksl/blend/BlendColor.sksl",
"/sksl/blend/BlendColorBurn.sksl",
"/sksl/blend/BlendColorDodge.sksl",
"/sksl/blend/BlendDarken.sksl",
"/sksl/blend/BlendDifference.sksl",
"/sksl/blend/BlendDst.sksl",
"/sksl/blend/BlendDstAtop.sksl",
"/sksl/blend/BlendDstIn.sksl",
"/sksl/blend/BlendDstOut.sksl",
"/sksl/blend/BlendDstOver.sksl",
"/sksl/blend/BlendExclusion.sksl",
"/sksl/blend/BlendHardLight.sksl",
"/sksl/blend/BlendHue.sksl",
"/sksl/blend/BlendLighten.sksl",
"/sksl/blend/BlendLuminosity.sksl",
"/sksl/blend/BlendModulate.sksl",
"/sksl/blend/BlendMultiply.sksl",
"/sksl/blend/BlendOverlay.sksl",
"/sksl/blend/BlendPlus.sksl",
"/sksl/blend/BlendSaturation.sksl",
"/sksl/blend/BlendScreen.sksl",
"/sksl/blend/BlendSoftLight.sksl",
"/sksl/blend/BlendSrc.sksl",
"/sksl/blend/BlendSrcAtop.sksl",
"/sksl/blend/BlendSrcIn.sksl",
"/sksl/blend/BlendSrcOut.sksl",
"/sksl/blend/BlendSrcOver.sksl",
"/sksl/blend/BlendXor.sksl",
Clean up SkSL test compilation in preparation for Metal support. Now uses a GN template to avoid copy-pasting the same logic for each type of test we want to perform, and the same file to be compiled in more than one way at a time via an extra flag to compile_sksl_tests.py. Change-Id: I8aadedeb140d78d58a345a2bac0da3d9c77e9a19 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319347 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 20:42:09 +00:00
]
sksl_settings_tests = [
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/glsl/TypePrecision.sksl",
"/sksl/inliner/ExponentialGrowth.sksl",
"/sksl/inliner/InlinerCanBeDisabled.sksl",
"/sksl/shared/Derivatives.sksl",
Re-re-reland "Rewrite switch statements in GLSL strict-ES2 mode." This reverts commit 6f06bab632490b82a3cc73be76f8c5ad119ac092. Reason for revert: glslGeneration is more trustworthy than GR_GL_VER Original change's description: > Revert "Re-reland "Rewrite switch statements in GLSL strict-ES2 mode.""" > > This reverts commit 64560c7cd59b369c792f207cb0295b26978e2724. > > Reason for revert: Nexus5, also > > Original change's description: > > Re-reland "Rewrite switch statements in GLSL strict-ES2 mode."" > > > > This reverts commit c4c355940c9f5be879d1c1997724a4cf61e68b53. > > > > Reason for revert: disabled offending tests > > > > Original change's description: > > > Revert "Reland "Rewrite switch statements in GLSL strict-ES2 mode."" > > > > > > This reverts commit c81edd0e8cd999a92ae943f284ee31c25f0f9373. > > > > > > Reason for revert: ANGLE still unhappy > > > Original change's description: > > > > Reland "Rewrite switch statements in GLSL strict-ES2 mode." > > > > > > > > This reverts commit d26d0e6a47aea2575f29b4582a4f662a17a8fff2. > > > > > > > > Reason for revert: uses dedicated caps bit > > > > > > > > Original change's description: > > > > > Revert "Rewrite switch statements in GLSL strict-ES2 mode." > > > > > > > > > > This reverts commit 45e3838006df8bc393fe6f4ca1cff999b41167f4. > > > > > > > > > > Reason for revert: Also need to rewrite them in actual ES2 mode. > > > > > > > > > > Original change's description: > > > > > > Rewrite switch statements in GLSL strict-ES2 mode. > > > > > > > > > > > > Once this lands, switch statements will work everywhere--Metal, SPIR-V, > > > > > > GLSL, and SkVM. > > > > > > > > > > > > Change-Id: I2797d0a872de8be77bb9f7aa6acb93421d571d70 > > > > > > Bug: skia:12450 > > > > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/452356 > > > > > > Commit-Queue: John Stiles <johnstiles@google.com> > > > > > > Auto-Submit: John Stiles <johnstiles@google.com> > > > > > > Reviewed-by: Brian Osman <brianosman@google.com> > > > > > > > > > > Bug: skia:12450 > > > > > Change-Id: I92656ed40289872405c0873f2c56a52b04e35b1d > > > > > No-Presubmit: true > > > > > No-Tree-Checks: true > > > > > No-Try: true > > > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/452556 > > > > > Auto-Submit: Brian Osman <brianosman@google.com> > > > > > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > > > > > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > > > > > > > > Bug: skia:12450 > > > > Change-Id: I0d3b0969d2040dbb4ee808132146687767c97442 > > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/452560 > > > > 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: skia:12450 > > > Change-Id: I869cf3e2c47fe94981aa2ffa6c1f0b3e4d6e6862 > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/452717 > > > Auto-Submit: Brian Osman <brianosman@google.com> > > > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > > > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > > > > Bug: skia:12450 > > Change-Id: Ia0e23e20794ea707e54be50123b5323369354a03 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/452721 > > 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: skia:12450 > Change-Id: Id0c0cdfbf146000ec532e57e380c18ff391ca1da > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/452896 > Auto-Submit: Brian Osman <brianosman@google.com> > Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bug: skia:12450 Change-Id: I4bac3a468ae20967fe6ec372561dd44f67c6b730 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/452897 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-09-25 14:33:00 +00:00
"/sksl/shared/Switch.sksl",
"/sksl/shared/SwitchDefaultOnly.sksl",
"/sksl/shared/SwitchWithFallthrough.sksl",
"/sksl/shared/SwitchWithLoops.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/workarounds/AbsInt.sksl",
"/sksl/workarounds/BlendGuardedDivide.sksl",
"/sksl/workarounds/FractNegative.sksl",
"/sksl/workarounds/FragCoords.sksl",
"/sksl/workarounds/LoopCondition.sksl",
"/sksl/workarounds/MinAndAbsTogether.sksl",
"/sksl/workarounds/NegatedAtan.sksl",
Add a workaround for "ldexp(..., -x)" on Mac/Radeon/GLSL Bug: skia:12076 Change-Id: Ia7aabe2e048a05475d25811af657228ea39d75ba Reviewed-on: https://skia-review.googlesource.com/c/skia/+/416561 Commit-Queue: Chris Dalton <csmartdalton@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-06-08 00:51:42 +00:00
"/sksl/workarounds/NegatedLdexp.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/workarounds/PowWithConstantExponent.sksl",
"/sksl/workarounds/RewriteDoWhileLoops.sksl",
Rename caps bit for matrix comparison rewrites. This was originally designated for 2x2 matrices only, but this was not right--all matrix comparisons actually need to be rewritten to fully work around the bug. Change-Id: I743d16a65bc55e93361a3dd8753653384583f063 Bug: skia:11308 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/411416 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-21 21:27:57 +00:00
"/sksl/workarounds/RewriteMatrixComparisons.sksl",
Add caps bit for RewriteMatrixVectorMultiply. On ARM GPUs, the Vulkan driver does not honor relaxed precision when evaluating SpvOpMatrixTimesVector. This leads to reduced performance (compared to GLSL, where mediump matrices and floats do evaluate all intermediate values at mediump). This caps bit will be enabled on ARM GPUs and, in a followup CL, will be used to toggle a workaround where `m*v` is rewritten as the sum of (m[0]*v[0] + m[1]*v[1] + ... + m[N]*v[N]). Change-Id: I310fa73639b6498552c9672e76860f2eded15d0a Bug: skia:11769 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/388459 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-03-23 21:12:03 +00:00
"/sksl/workarounds/RewriteMatrixVectorMultiply.sksl",
Migrate SkSL test inputs to the resources/ directory. This will allow us to load these inputs for unit testing in `dm`. Change-Id: Id256ba7c30d3ec94b98048e47af44cf9efe580d5 Bug: skia:11009 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/357282 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-01-22 16:55:48 +00:00
"/sksl/workarounds/TernaryShortCircuit.sksl",
Migrate several GLSL workaround unit tests to golden files. We now support building an SkSL golden output twice, once honoring the custom #pragma settings, and once more ignoring the settings. This allows us to see the output of the workaround technique, alongside the "default-settings" output which should not contain a workaround. To implement this, skslc now supports a flag: --[no]settings. When it's set, /*#pragma settings*/ comments are honored. When it's not set, skslc ignores the comments. compile_sksl_tests.py passes this flag along to skslc. This approach is not strictly limited to workarounds; the "TypePrecision" GLSL test was also updated to use this technique. Change-Id: I79204df047b024533ed6bc1f4c088e0e878d5bb1 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317246 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-09-16 21:46:37 +00:00
]
Clean up SkSL test compilation in preparation for Metal support. Now uses a GN template to avoid copy-pasting the same logic for each type of test we want to perform, and the same file to be compiled in more than one way at a time via an extra flag to compile_sksl_tests.py. Change-Id: I8aadedeb140d78d58a345a2bac0da3d9c77e9a19 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319347 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 20:42:09 +00:00
Add .rte -> .skvm unit test framework Includes a handful of test cases to exercise the system Change-Id: I98e73a8bca063f475d2ddb51778e395697392ddb Reviewed-on: https://skia-review.googlesource.com/c/skia/+/346637 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2020-12-22 16:28:59 +00:00
sksl_rte_tests = [
Add test for Runtime Effects and narrowing conversions. This code intentionally mixes half4s and float4s everywhere. Before http://review.skia.org/435916 landed, this resulted in a compile error. Change-Id: I852fef6ee99a8b78623e0e9ddeee2ad84a8c0504 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/436058 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-08-03 15:16:48 +00:00
"/sksl/runtime/AllowNarrowingConversions.rts",
Remove flexible runtime effects entirely All internal usage has migrated to MakeFor..., this removes the old program kind, and updates some tests. Bug: skia:11813 Change-Id: I56733b071270e1ae3fab5d851e23acf6c02e3361 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402536 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-04-28 21:41:57 +00:00
"/sksl/runtime/ArrayIndexing.rts",
Add unit test for array narrowing conversions. Change-Id: Ibadda2a10e19984c7a0efb66fd3187f280666445 Bug: skia:12248 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/436996 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-08-05 14:55:03 +00:00
"/sksl/runtime/ArrayNarrowingConversions.rts",
Add dest-color support to the Pipeline stage. Previously, when converting a program, the pipeline stage could assume that an input to main() of type half4/float4 was always the input color. This was a good assumption since the only possible inputs were coordinates, or the input color. This CL now recognizes that when a second float4 is passed to the main() function, it should be a SK_DEST_COLOR_BUILTIN. This will let blend functions pass in two colors. ProgramToSkVM now takes a dest-color argument as well, but existing call sites won't reference it (since they aren't for blend functions). I've just passed the input-color a second time, since the value will never actually be accessed. Change-Id: I4214586bda605c6d287aa25b1b099e6ef5ba15a4 Bug: skia:12080 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/417261 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-06-09 21:24:31 +00:00
"/sksl/runtime/Blend.rtb",
Add a test runtime effect for child effects. I wasn't able to find any other test which exercised child color-filters or child blenders. (SampleWithExplicitCoord evaluates from a shader.) Change-Id: I58ecee3beca2d3dc11ded5de0eea031e1d7c3e1e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/507922 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Arman Uguray <armansito@google.com> Commit-Queue: Arman Uguray <armansito@google.com>
2022-02-11 21:19:16 +00:00
"/sksl/runtime/ChildEffects.rts",
Add test for commutative operations in SkVM. SkVM should be able to optimize away these equivalent expressions: (intA & intB) <-> (intB & intA) (intA ^ intB) <-> (intB ^ intA) (intA | intB) <-> (intB | intA) (intA + intB) <-> (intB + intA) (intA * intB) <-> (intB * intA) (intA == intB) <-> (intB == intA) (intA != intB) <-> (intB != intA) These should be guaranteed by IEEE754 as well: (floatA + floatB) <-> (floatB + floatA) (floatA * floatB) <-> (floatB * floatA) I've added a test to demonstrate existing behavior, which leaves these optimizations on the table. Change-Id: I01ce1d6f1cfadb3d77db405a83752c9dd52c99bd Reviewed-on: https://skia-review.googlesource.com/c/skia/+/473238 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-11-18 20:26:15 +00:00
"/sksl/runtime/Commutative.rts",
Remove flexible runtime effects entirely All internal usage has migrated to MakeFor..., this removes the old program kind, and updates some tests. Bug: skia:11813 Change-Id: I56733b071270e1ae3fab5d851e23acf6c02e3361 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402536 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-04-28 21:41:57 +00:00
"/sksl/runtime/ConstPreservation.rts",
"/sksl/runtime/ConversionConstructors.rts",
"/sksl/runtime/GLSLTypeNames.rts",
"/sksl/runtime/GlobalVariables.rts",
Add program-too-large test using for loops without blocks. The fuzzer has discovered a bug in our program size-checking logic; for loops that immediately contain another for loop (with no block) were not counting the inner loop's iterations. This allowed it to exceed our maximum program-size threshold (and time out during SkVM compilation). This test demonstrates the issue. A followup will fix it. Change-Id: I3b7d4c8a4f0ed04cf0aba3f1a32fdad7d6d784e7 Bug: oss-fuzz:37837 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/449096 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> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-09-15 13:42:36 +00:00
"/sksl/runtime/LargeProgram_BlocklessLoops.rts",
Enforce an upper bound on Runtime Effect program size. The fuzzer is currently learning to make unboundedly-large programs by nesting medium-size loops repeatedly. SkVM doesn't have a mechanism to limit the ensuing explosion of code and ends up making unreasonably deep stacks and/or unreasonably large programs. SkSL now enforces an upper bound of approximately 100,000 IR nodes on a fully-flattened, fully-inlined strict-ES2 program. The limit is picked out of thin air, but this should be enough to prevent SkVM from going haywire while still being large enough to handle any reasonable program. We can definitely tune this value if we find that it is too large (admitting dangerous code) or too small (rejecting good code). Change-Id: I11735636175721fbc79460b4e194d8e4b42dc47d Bug: skia:12396, oss-fuzz:37827, oss-fuzz:37837 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/444358 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-09-02 13:56:31 +00:00
"/sksl/runtime/LargeProgram_FlatLoop.rts",
"/sksl/runtime/LargeProgram_Functions.rts",
"/sksl/runtime/LargeProgram_NestedLoops.rts",
"/sksl/runtime/LargeProgram_SplitLoops.rts",
Reject programs which exceed 50 stack frames during size analysis. Our program-size analysis pass needs to recurse into called functions; depending on the exact order of functions in the program, this recursion can hypothetically be as deep as the deepest function-call chain. Set an upper bound on recursion here, so we don't overflow the stack while trying to check the program size. In practice, 50 frames is far deeper than a regular shader should ever go. Change-Id: I733ee48dad6f8053facdfd9f6d8a2b9b2a4af188 Bug: skia:12396 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/445279 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-09-02 20:17:07 +00:00
"/sksl/runtime/LargeProgram_StackDepth.rts",
Enforce an upper bound on Runtime Effect program size. The fuzzer is currently learning to make unboundedly-large programs by nesting medium-size loops repeatedly. SkVM doesn't have a mechanism to limit the ensuing explosion of code and ends up making unreasonably deep stacks and/or unreasonably large programs. SkSL now enforces an upper bound of approximately 100,000 IR nodes on a fully-flattened, fully-inlined strict-ES2 program. The limit is picked out of thin air, but this should be enough to prevent SkVM from going haywire while still being large enough to handle any reasonable program. We can definitely tune this value if we find that it is too large (admitting dangerous code) or too small (rejecting good code). Change-Id: I11735636175721fbc79460b4e194d8e4b42dc47d Bug: skia:12396, oss-fuzz:37827, oss-fuzz:37837 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/444358 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-09-02 13:56:31 +00:00
"/sksl/runtime/LargeProgram_ZeroIterFor.rts",
Remove flexible runtime effects entirely All internal usage has migrated to MakeFor..., this removes the old program kind, and updates some tests. Bug: skia:11813 Change-Id: I56733b071270e1ae3fab5d851e23acf6c02e3361 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402536 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-04-28 21:41:57 +00:00
"/sksl/runtime/LoopInt.rts",
"/sksl/runtime/LoopFloat.rts",
Add test demonstrating issue with function calls. If a function is called multiple times on one line, stepping over that line does not show all of the function-call results. It only shows the last result. e.g. in this example, I have just stepped over the first line which calls "get" three times. We should see three results, but we only see one: http://screen/3WfJoZWm77cSexM In this test you can see that all three calls to `get` are assigned to the same slot, $15. Change-Id: Id0c486ef349a1e527001efbcee2ed2b836f56e83 Bug: skia:13011 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/514577 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2022-03-03 03:54:03 +00:00
"/sksl/runtime/MultipleCallsInOneStatement.rts",
Add parser support for highp/mediump Tokens in vardecls. These parse into new modifier bits; the IR generator does not yet support these bits. That's coming in a followup CL. Change-Id: I362e9227694f9b862eaad100f6afca45a9b62a01 Bug: skia:12248 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/436336 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-08-04 20:03:12 +00:00
"/sksl/runtime/PrecisionQualifiers.rts",
Emit qualifiers in the GLSL ES-required order. This should fix a failure in the ES2 conformance suite's "const_in_int". Change-Id: I8b5487749291ef57712b8fe6c3949dc7c3e76883 Bug: skia:12499 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/455157 Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-10-01 18:21:09 +00:00
"/sksl/runtime/QualifierOrder.rts",
Adding test files demonstrating type confusion for arrays/structs. Change-Id: Iacd924471971c3c551648f75c1ecf0f1bfd3ed07 Bug: skia:12642 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/479061 Commit-Queue: Julia Lavrova <jlavrova@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-12-02 19:57:53 +00:00
"/sksl/runtime/RecursiveComparison_Structs.rts",
"/sksl/runtime/RecursiveComparison_Arrays.rts",
"/sksl/runtime/RecursiveComparison_Types.rts",
"/sksl/runtime/RecursiveComparison_Vectors.rts",
Remove flexible runtime effects entirely All internal usage has migrated to MakeFor..., this removes the old program kind, and updates some tests. Bug: skia:11813 Change-Id: I56733b071270e1ae3fab5d851e23acf6c02e3361 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402536 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-04-28 21:41:57 +00:00
"/sksl/runtime/SampleWithExplicitCoord.rts",
Reland "Add switch statement support to PipelineStage." This is a reland of be056f4f62de76c3f3d6ffb2321bf6592841dc46 The Switch test has been restructured to dodge an iOS bug. Original change's description: > Add switch statement support to PipelineStage. > > This allows us to write SKSL_TEST_ES3 tests in SkSLTest and have them > run properly. Previously, such a test would assert inside the pipeline- > stage generator. In ES2 mode, we will rewrite switches as chained ifs, > but in ES3 mode we will want to continue emitting them as-is (they will > be faster than chained ifs on a modern GPU). > > `writeSwitchStatement` is adapted from GLSLCodeGenerator. > > Change-Id: I532ea5ed49869e7cdffced0cdcd0e353af8d4d79 > Bug: skia:12450 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/450478 > 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: skia:12450 Change-Id: I5102081c636ef09cd23f5bc894e6c96e92a4c121 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/450757 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-09-20 23:09:13 +00:00
"/sksl/runtime/Switch.rts",
Implement switch in SkVM. SkVM implements switches as a pseudo-loop; breaks are handled with the condition mask just like a for loop. Fallthrough is handled via a scratch Value in a temporary slot. `writeStore` neeeded to be refactored to support writing into slot(s) without an associated Variable. At IR generation time, SwitchStatements are now emitted without error even in strict-ES2 mode. The GLSL code generator currently reports these as an error in strict-ES2 mode, but this will be fixed in a followup coming shortly (the switch will be rewritten as ifs inside a one-shot loop, similar to our IR-rewrite strategy). Change-Id: I5507257246c42a35d2f46b4b9a89492a5ffeff9b Bug: skia:12450 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/451421 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-09-23 15:07:32 +00:00
"/sksl/runtime/SwitchDefaultOnly.rts",
"/sksl/runtime/SwitchWithFallthrough.rts",
"/sksl/runtime/SwitchWithLoops.rts",
Remove flexible runtime effects entirely All internal usage has migrated to MakeFor..., this removes the old program kind, and updates some tests. Bug: skia:11813 Change-Id: I56733b071270e1ae3fab5d851e23acf6c02e3361 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402536 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-04-28 21:41:57 +00:00
"/sksl/runtime/VectorIndexing.rts",
Add .rte -> .skvm unit test framework Includes a handful of test cases to exercise the system Change-Id: I98e73a8bca063f475d2ddb51778e395697392ddb Reviewed-on: https://skia-review.googlesource.com/c/skia/+/346637 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2020-12-22 16:28:59 +00:00
]
sksl_rte_error_tests = [
Allow derivatives in Runtime Effects when ES3 restrictions are off. We can now add functions to sksl_public.sksl with an $es3 prefix. These will be allowed in a Runtime Effect when strict-ES2 mode is disabled. Note that the CPU backend still doesn't have support for these calls, and will fail ungracefully (assertion, nonsense result) if these intrinsics are used. The testing here is limited, due to an unrelated bug in SPIR-V (skia:12340) Change-Id: I9c911bc2b77f5051e80844607e7fd08ad386ee56 Bug: skia:12202, skia:12340 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/439058 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-08-13 15:43:21 +00:00
"/sksl/runtime_errors/DerivativesES2.rts",
Test that Runtime Effects cannot use non-ES2 types. Surprisingly, we didn't actually have a preexisting test covering this. Error reporting is lackluster in this CL but will be improved in the followup. Change-Id: I0b1cdb5a82f066af6b9d3fd9c39748080c2e18c0 Bug: skia:12348 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/439996 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-08-17 03:00:04 +00:00
"/sksl/runtime_errors/ES3Types.rts",
Remove flexible runtime effects entirely All internal usage has migrated to MakeFor..., this removes the old program kind, and updates some tests. Bug: skia:11813 Change-Id: I56733b071270e1ae3fab5d851e23acf6c02e3361 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402536 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-04-28 21:41:57 +00:00
"/sksl/runtime_errors/FirstClassArrays.rts",
"/sksl/runtime_errors/IllegalArrayOps.rts",
"/sksl/runtime_errors/IllegalIndexing.rts",
"/sksl/runtime_errors/IllegalOperators.rts",
Honor lowp/mediump/highp precision qualifiers in IRGenerator. This CL does not update the DSLParser to honor these precision qualifiers; that will be done in a followup. Change-Id: Ib629bc99c0e6c7afb550a381d4e3b6ccc26aa64e Bug: skia:12248 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/436337 Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-08-04 20:26:47 +00:00
"/sksl/runtime_errors/IllegalPrecisionQualifiers.rts",
Explicitly detect static recursion in SkSL This relaxes our rules to allow calls to declared (but not yet defined) functions. With that rule change, we have to specifically detect static recursion and produce an error. Bug: skia:12137 Change-Id: I39cc281fcd73fb30014bc7b43043552623727e03 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/431537 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-07-21 19:19:34 +00:00
"/sksl/runtime_errors/IllegalRecursionComplex.rts",
"/sksl/runtime_errors/IllegalRecursionMutual.rts",
"/sksl/runtime_errors/IllegalRecursionSimple.rts",
Migrate runtime effect sample tests to golden files Much easier to maintain, especially with an upcoming change to the sampling syntax. Change-Id: I378811b7be0afcce5b7e68a942e7b46d96568155 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/441518 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-08-24 14:11:56 +00:00
"/sksl/runtime_errors/IllegalShaderSampling.rts",
Remove flexible runtime effects entirely All internal usage has migrated to MakeFor..., this removes the old program kind, and updates some tests. Bug: skia:11813 Change-Id: I56733b071270e1ae3fab5d851e23acf6c02e3361 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402536 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-04-28 21:41:57 +00:00
"/sksl/runtime_errors/IllegalShaderUse.rts",
"/sksl/runtime_errors/IllegalStatements.rts",
Add ProgramKind::kRuntimeBlend for Runtime Blend functions. Runtime Blend effects always take two input colors--source and destination--instead of one. This CL adds a new ProgramKind for blend effects, a new program module (empty for now), and adds a test to confirm that the signature for blend functions is checked. Currently these are only accessible via skslc; there's no Runtime Effect API to create one and the dest color isn't hooked up to anything. Change-Id: I5272a811d2d76b878cfdf3429efa78c9c8b3fd97 Bug: skia:12080 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/416798 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-06-08 18:06:22 +00:00
"/sksl/runtime_errors/InvalidBlendMain.rtb",
Add runtime color filter and shader modes to the SkSL compiler These enforce stricter rules about the signature of main, and each one uses a separate pre-include module. That prevents color filters from being able to reference sk_FragCoord (or coords passed to main) at all. It also limits the versions of sample() that are exposed. In the new world, an effect created for a specific stage of the Skia pipeline can only be used to create instances of that stage (SkShader or SkColorFilter). For now, SkRuntimeEffect::Make uses kRuntimeEffect, which continues to be more lenient and allow creation of either shaders or color filters from a single effect. After we migrate all clients, we can deprecate and then delete that mode. Bug: skia:11813 Change-Id: I0afd79a72beeec84da42c86146e8fcd8d0e4c09f Reviewed-on: https://skia-review.googlesource.com/c/skia/+/395716 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2021-04-12 13:49:20 +00:00
"/sksl/runtime_errors/InvalidColorFilterFeatures.rtcf",
"/sksl/runtime_errors/InvalidColorFilterMain.rtcf",
"/sksl/runtime_errors/InvalidShaderMain.rts",
Remove flexible runtime effects entirely All internal usage has migrated to MakeFor..., this removes the old program kind, and updates some tests. Bug: skia:11813 Change-Id: I56733b071270e1ae3fab5d851e23acf6c02e3361 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402536 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-04-28 21:41:57 +00:00
"/sksl/runtime_errors/LoopConditionErrors.rts",
"/sksl/runtime_errors/LoopExpressionErrors.rts",
"/sksl/runtime_errors/LoopInitializerErrors.rts",
"/sksl/runtime_errors/LoopStructureErrors.rts",
Add improved regression test for oss-fuzz:36655. Most of the code generated by the fuzzer is nonsense, but there is a method to its madness. The crash is only triggered under specific conditions: - The runtime effect has enough helper functions to mostly fill up the call graph hash-map. It won't rehash until it gets close to capacity. - There must be several calls to built-in functions, in order to add elements to the call graph to force a rehash. The fuzzer-generated code manages to satisfy both these requirements. Change-Id: I9a1d7535557fedd4e9bfece3930ac86ede291ffe Bug: oss-fuzz:36655 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/437118 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2021-08-05 20:50:56 +00:00
"/sksl/runtime_errors/Ossfuzz36655.rts",
Fixed illegal interface block reporting DSL was improperly allowing interface blocks in runtime shaders, which caused PipelineStageGenerator to get upset. Bug: oss-fuzz:38131 Change-Id: I593e68f2cab3db9151d606e65e2826ffa9c494e2 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/446324 Commit-Queue: Ravi Mistry <rmistry@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-09-07 19:21:13 +00:00
"/sksl/runtime_errors/Ossfuzz38131.rts",
Reject operators =, ==, and != on void types. The fuzzer discovered that we allow == on void types (confusing the SkVM backend). Change-Id: Ia9494642faf67f3f86e3a365807be8bd4a7062e4 Bug: skia:13026 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/516796 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-03-07 12:50:17 +00:00
"/sksl/runtime_errors/Ossfuzz45279.rts",
Add program-too-large test using for loops without blocks. The fuzzer has discovered a bug in our program size-checking logic; for loops that immediately contain another for loop (with no block) were not counting the inner loop's iterations. This allowed it to exceed our maximum program-size threshold (and time out during SkVM compilation). This test demonstrates the issue. A followup will fix it. Change-Id: I3b7d4c8a4f0ed04cf0aba3f1a32fdad7d6d784e7 Bug: oss-fuzz:37837 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/449096 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> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2021-09-15 13:42:36 +00:00
"/sksl/runtime_errors/ProgramTooLarge_BlocklessLoops.rts",
Improve overflow checks in CheckProgramUnrolledSize. The fuzzer discovered that it could overflow the program-size value. Rewrote the logic to use SkSafeMath everywhere, and to early-exit as soon as a statement manages to exceed the program size. Change-Id: I01511b2201173c95ebc1ac602901410ac9d74d73 Bug: oss-fuzz:38697 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/449098 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-09-15 15:41:02 +00:00
"/sksl/runtime_errors/ProgramTooLarge_Extreme.rts",
Enforce an upper bound on Runtime Effect program size. The fuzzer is currently learning to make unboundedly-large programs by nesting medium-size loops repeatedly. SkVM doesn't have a mechanism to limit the ensuing explosion of code and ends up making unreasonably deep stacks and/or unreasonably large programs. SkSL now enforces an upper bound of approximately 100,000 IR nodes on a fully-flattened, fully-inlined strict-ES2 program. The limit is picked out of thin air, but this should be enough to prevent SkVM from going haywire while still being large enough to handle any reasonable program. We can definitely tune this value if we find that it is too large (admitting dangerous code) or too small (rejecting good code). Change-Id: I11735636175721fbc79460b4e194d8e4b42dc47d Bug: skia:12396, oss-fuzz:37827, oss-fuzz:37837 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/444358 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2021-09-02 13:56:31 +00:00
"/sksl/runtime_errors/ProgramTooLarge_FlatLoop.rts",
"/sksl/runtime_errors/ProgramTooLarge_Functions.rts",
"/sksl/runtime_errors/ProgramTooLarge_NestedLoops.rts",
"/sksl/runtime_errors/ProgramTooLarge_SplitLoops.rts",
Reject programs which exceed 50 stack frames during size analysis. Our program-size analysis pass needs to recurse into called functions; depending on the exact order of functions in the program, this recursion can hypothetically be as deep as the deepest function-call chain. Set an upper bound on recursion here, so we don't overflow the stack while trying to check the program size. In practice, 50 frames is far deeper than a regular shader should ever go. Change-Id: I733ee48dad6f8053facdfd9f6d8a2b9b2a4af188 Bug: skia:12396 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/445279 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-09-02 20:17:07 +00:00
"/sksl/runtime_errors/ProgramTooLarge_StackDepth.rts",
Mark private types as invalid in the public symbol table. Previously, in public code, private types didn't exist anywhere in the symbol table chain, and those names were free for the taking. Now, we register them as invalid types in the public symbol table. This prevents them from being used as variable names, and gives a more explicit error if you try to use them as a type. Change-Id: I9a943bf923639b72cbf36b1acf4b4fbe70982786 Bug: skia:12538 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/459119 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-13 19:04:32 +00:00
"/sksl/runtime_errors/ReservedNameISampler2D.rts",
"/sksl/runtime_errors/ReservedNameSampler.rts",
"/sksl/runtime_errors/ReservedNameSampler1D.rts",
"/sksl/runtime_errors/ReservedNameSampler2D.rts",
"/sksl/runtime_errors/ReservedNameSampler2DRect.rts",
"/sksl/runtime_errors/ReservedNameSampler3D.rts",
"/sksl/runtime_errors/ReservedNameSamplerExternalOES.rts",
"/sksl/runtime_errors/ReservedNameSubpassInput.rts",
"/sksl/runtime_errors/ReservedNameSubpassInputMS.rts",
"/sksl/runtime_errors/ReservedNameTexture2D.rts",
Made SkSL type aliases into first-class objects Previously, type aliases ('vec2') were just an additional name which could be used to refer to a type ('float2'). This was simple and worked, except that error messages would be wrong - any type-related error message would refer to the type as 'float2' rather than the 'vec2' that the user actually typed. This CL adds an AliasType class so that we can track which name was used to refer to an aliased type and report messages using the correct type name. Bug: skia:12737 Change-Id: I40e234239ab47557033e0695e4fbbd5f01da354e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/490256 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
2022-01-04 15:46:28 +00:00
"/sksl/runtime_errors/TypeAliases.rts",
Reject #extension in runtime-effect mode Bug: oss-fuzz:43062 Change-Id: I10d8fa40c81c5b1595d30221d89c84f5cc3478fd Reviewed-on: https://skia-review.googlesource.com/c/skia/+/490857 Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2022-01-04 15:34:01 +00:00
"/sksl/runtime_errors/UnsupportedExtension.rts",
Remove flexible runtime effects entirely All internal usage has migrated to MakeFor..., this removes the old program kind, and updates some tests. Bug: skia:11813 Change-Id: I56733b071270e1ae3fab5d851e23acf6c02e3361 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/402536 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-04-28 21:41:57 +00:00
"/sksl/runtime_errors/UnsupportedTypeFragmentProcessor.rts",
"/sksl/runtime_errors/UnsupportedTypeSampler.rts",
"/sksl/runtime_errors/UnsupportedTypeTexture.rts",
Add .rte -> .skvm unit test framework Includes a handful of test cases to exercise the system Change-Id: I98e73a8bca063f475d2ddb51778e395697392ddb Reviewed-on: https://skia-review.googlesource.com/c/skia/+/346637 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2020-12-22 16:28:59 +00:00
]
Clean up SkSL test compilation in preparation for Metal support. Now uses a GN template to avoid copy-pasting the same logic for each type of test we want to perform, and the same file to be compiled in more than one way at a time via an extra flag to compile_sksl_tests.py. Change-Id: I8aadedeb140d78d58a345a2bac0da3d9c77e9a19 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319347 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 20:42:09 +00:00
# Tests in sksl_glsl_tests_sources will be compiled with --settings on, and are expected to generate
# a .glsl output file.
sksl_glsl_tests_sources =
Migrate constant folding tests into a separate directory. This CL also adds tests for vector*scalar and scalar*vector folding. We currently do not constant-fold these, but support will be added in a followup CL. Change-Id: I68d7374ae15ab2f4d805a095803b645c92fb03d9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/352237 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2021-01-11 16:07:01 +00:00
sksl_error_tests + sksl_glsl_tests + sksl_inliner_tests +
Revert "[skslc] Generate .hlsl test output files" This reverts commit a97a6769b5c4f43edc2331990f271674bf99c4fb. Reason for revert: breaking bot Housekeeper-PerCommit-CheckGeneratedFiles -- see http://screen/5FN75fF9tvcQFKR Based on the diff, I think this just needs to be synced up to latest code and a rebuild should fix it. Original change's description: > [skslc] Generate .hlsl test output files > > - The build now generates HLSL output when `skia_compile_sksl_tests` is > enabled. > - The "blend" and "shared" tests have been enabled for HLSL with the > exception of 6 tests that exercise intrinsic inverse hyperbolic > functions, which don't have HLSL equivalents. > > Bug: skia:12691, skia:12352 > Change-Id: Ia970f878f75ff58e8e3d47249c2dc2f756c165b4 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/482778 > Reviewed-by: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Auto-Submit: Arman Uguray <armansito@google.com> > Commit-Queue: Arman Uguray <armansito@google.com> > Commit-Queue: Brian Osman <brianosman@google.com> Bug: skia:12691, skia:12352 Change-Id: Iaad607d48edd136eee2b60e48c0643b6e90179e9 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/499216 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
2022-01-25 04:56:00 +00:00
sksl_folding_tests + sksl_shared_tests
Clean up SkSL test compilation in preparation for Metal support. Now uses a GN template to avoid copy-pasting the same logic for each type of test we want to perform, and the same file to be compiled in more than one way at a time via an extra flag to compile_sksl_tests.py. Change-Id: I8aadedeb140d78d58a345a2bac0da3d9c77e9a19 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319347 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-24 20:42:09 +00:00
# Tests in sksl_glsl_settings_tests_sources will be compiled twice, once with --settings and once
# using --nosettings. In the latter mode, StandaloneSettings is appended to the output filename.
sksl_glsl_settings_tests_sources = sksl_blend_tests + sksl_settings_tests
Add golden outputs for the Metal backend. This CL also updates the blend tests to use sk_FragColor instead of returning a half4, as the Metal backend assumes that a fragment processor's `main` will return void and always synthesizes a `return *_out;` at the end. (context link: https://osscs.corp.google.com/android/platform/superproject/+/master:external/skqp/src/sksl/SkSLMetalCodeGenerator.cpp;l=803;drc=842d31b14159626054e01dd32826563a8f4214bf ) BYPASS_INCLUSIVE_LANGUAGE_REASON=see http://b/168134166 Change-Id: I330a456bf25ee72d3a29c59cd624625378ae80a0 Bug: skia:10649, skia:10757, skia:10758, skia:10759, skia:10760, skia:10761, skia:10762 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319409 Commit-Queue: John Stiles <johnstiles@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-09-25 17:35:58 +00:00
# Tests in sksl_metal_tests_sources will be compiled with --settings on, and are expected to
# generate a .metal output file.
Convert remaining Metal tests to golden outputs. Metal-specific tests are pretty thin on the ground here, and some of the remaining tests no longer added value as they were already covered pretty well by existing tests in Shared. The majority of remaining tests were specific to Metal's lack of flexible matrix casting (and SkSL's ability to paper over this with helper functions). Change-Id: I7b3c445268b95320e7f46ec88d793c315d43ee8a Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/334956 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
2020-11-13 23:14:11 +00:00
sksl_metal_tests_sources =
Revert "[skslc] Generate .hlsl test output files" This reverts commit a97a6769b5c4f43edc2331990f271674bf99c4fb. Reason for revert: breaking bot Housekeeper-PerCommit-CheckGeneratedFiles -- see http://screen/5FN75fF9tvcQFKR Based on the diff, I think this just needs to be synced up to latest code and a rebuild should fix it. Original change's description: > [skslc] Generate .hlsl test output files > > - The build now generates HLSL output when `skia_compile_sksl_tests` is > enabled. > - The "blend" and "shared" tests have been enabled for HLSL with the > exception of 6 tests that exercise intrinsic inverse hyperbolic > functions, which don't have HLSL equivalents. > > Bug: skia:12691, skia:12352 > Change-Id: Ia970f878f75ff58e8e3d47249c2dc2f756c165b4 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/482778 > Reviewed-by: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Auto-Submit: Arman Uguray <armansito@google.com> > Commit-Queue: Arman Uguray <armansito@google.com> > Commit-Queue: Brian Osman <brianosman@google.com> Bug: skia:12691, skia:12352 Change-Id: Iaad607d48edd136eee2b60e48c0643b6e90179e9 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/499216 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
2022-01-25 04:56:00 +00:00
sksl_metal_tests + sksl_blend_tests + sksl_shared_tests
Enable SPIR-V disassembly output from skslc. We now have SPIR-V golden outputs for `blend` and `shared` tests. This exposes a handful of SPIR-V limitations for us to address. Change-Id: Ie5278889b8a61432403d06231b17765885bee0ac Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/337182 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-11-20 21:28:50 +00:00
# Tests in sksl_spirv_tests_sources will be compiled with --settings on, and are expected to
# generate a .asm.(frag|vert|geom) output file.
Migrate dedicated SPIR-V tests to golden outputs. There were a surprisingly small number of dedicated SPIR-V tests. SkSLSPIRVBadOffset was the only test that didn't already exist in the golden outputs, although it actually contained two tests. The SPIRVTest.cpp file has been converted to SPIRVTestbed.cpp, which can be used for local debugging of SPIR-V issues via dm (like GLSLTestbed and MetalTestbed). Change-Id: I978d8a7cf5735af7f537113d2b9411ce42cfcf88 Bug: skia:10694 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338756 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
2020-11-25 21:55:37 +00:00
sksl_spirv_tests_sources =
Revert "[skslc] Generate .hlsl test output files" This reverts commit a97a6769b5c4f43edc2331990f271674bf99c4fb. Reason for revert: breaking bot Housekeeper-PerCommit-CheckGeneratedFiles -- see http://screen/5FN75fF9tvcQFKR Based on the diff, I think this just needs to be synced up to latest code and a rebuild should fix it. Original change's description: > [skslc] Generate .hlsl test output files > > - The build now generates HLSL output when `skia_compile_sksl_tests` is > enabled. > - The "blend" and "shared" tests have been enabled for HLSL with the > exception of 6 tests that exercise intrinsic inverse hyperbolic > functions, which don't have HLSL equivalents. > > Bug: skia:12691, skia:12352 > Change-Id: Ia970f878f75ff58e8e3d47249c2dc2f756c165b4 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/482778 > Reviewed-by: John Stiles <johnstiles@google.com> > Reviewed-by: Brian Osman <brianosman@google.com> > Auto-Submit: Arman Uguray <armansito@google.com> > Commit-Queue: Arman Uguray <armansito@google.com> > Commit-Queue: Brian Osman <brianosman@google.com> Bug: skia:12691, skia:12352 Change-Id: Iaad607d48edd136eee2b60e48c0643b6e90179e9 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/499216 Auto-Submit: John Stiles <johnstiles@google.com> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
2022-01-25 04:56:00 +00:00
sksl_blend_tests + sksl_shared_tests + sksl_spirv_tests
Add .rte -> .skvm unit test framework Includes a handful of test cases to exercise the system Change-Id: I98e73a8bca063f475d2ddb51778e395697392ddb Reviewed-on: https://skia-review.googlesource.com/c/skia/+/346637 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2020-12-22 16:28:59 +00:00
## Tests in sksl_skvm_tests_sources will be compiled with --settings on, and are expected to
## generate a .skvm output file.
sksl_skvm_tests_sources = sksl_rte_tests + sksl_rte_error_tests
Add .stage output to skslc for runtime effects This emits SkSL that is more-or-less what the compiler re-ingests when a runtime effect is used to create a GrFragmentProcessor. Change-Id: I0926be44fc4493e722a5edc18198e161e4192cde Reviewed-on: https://skia-review.googlesource.com/c/skia/+/367883 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: John Stiles <johnstiles@google.com>
2021-02-08 18:49:53 +00:00
## Tests in sksl_stage_tests_sources will be compiled with --settings on, and are expected to
## generate a .stage output file.
sksl_stage_tests_sources = sksl_rte_tests
Reference in New Issue Copy Permalink