Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit ab4ab20

Browse files
johnstiles-googleSkia Commit-Bot
authored andcommitted
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>
1 parent 081fcc7 commit ab4ab20

File tree

185 files changed

+96
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+96
-93
lines changed

gn/sksl_tests.gni

Lines changed: 96 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -130,104 +130,107 @@ sksl_error_tests = [
130130
"$_tests/sksl/errors/WhileTypeMismatch.sksl",
131131
]
132132

133-
sksl_common_tests = [
134-
"$_tests/sksl/glsl/ArrayConstructors.sksl",
135-
"$_tests/sksl/glsl/ArrayIndexTypes.sksl",
136-
"$_tests/sksl/glsl/ArrayTypes.sksl",
137-
"$_tests/sksl/glsl/AssignmentTypeMatch.sksl",
138-
"$_tests/sksl/glsl/BoolFolding.sksl",
139-
"$_tests/sksl/glsl/Caps.sksl",
140-
"$_tests/sksl/glsl/CastsRoundTowardZero.sksl",
141-
"$_tests/sksl/glsl/ClipDistanceFragment.sksl",
142-
"$_tests/sksl/glsl/ClipDistanceVertex.vert",
143-
"$_tests/sksl/glsl/Clockwise.sksl",
144-
"$_tests/sksl/glsl/ComplexDelete.sksl",
145-
"$_tests/sksl/glsl/ConstArray.sksl",
146-
"$_tests/sksl/glsl/ConstVariableComparison.sksl",
147-
"$_tests/sksl/glsl/ConstantIf.sksl",
148-
"$_tests/sksl/glsl/Control.sksl",
149-
"$_tests/sksl/glsl/DeadDoWhileLoop.sksl",
150-
"$_tests/sksl/glsl/DeadLoopVariable.sksl",
151-
"$_tests/sksl/glsl/DependentInitializers.sksl",
152-
"$_tests/sksl/glsl/DerivativesUnused.sksl",
153-
"$_tests/sksl/glsl/Discard.sksl",
154-
"$_tests/sksl/glsl/FloatFolding.sksl",
133+
sksl_glsl_tests = [
155134
"$_tests/sksl/glsl/ForceHighPrecision.sksl",
156-
"$_tests/sksl/glsl/FrExp.sksl",
157-
"$_tests/sksl/glsl/FragCoordsFlipY.sksl",
158-
"$_tests/sksl/glsl/FragCoordsNew.sksl",
159-
"$_tests/sksl/glsl/FragCoordsOld.sksl",
160-
"$_tests/sksl/glsl/FunctionArgumentMatch.sksl",
161-
"$_tests/sksl/glsl/FunctionPrototype.sksl",
162-
"$_tests/sksl/glsl/Functions.sksl",
163-
"$_tests/sksl/glsl/Geometry.geom",
164-
"$_tests/sksl/glsl/GeometryExtension.geom",
165-
"$_tests/sksl/glsl/GeometryGSInvocations.geom",
166-
"$_tests/sksl/glsl/GeometryNoGSInvocations.geom",
167-
"$_tests/sksl/glsl/Height.sksl",
168-
"$_tests/sksl/glsl/HelloWorld.sksl",
169-
"$_tests/sksl/glsl/Hex.sksl",
170135
"$_tests/sksl/glsl/IncompleteShortIntPrecision.sksl",
171-
"$_tests/sksl/glsl/InstanceID.vert",
172-
"$_tests/sksl/glsl/IntFolding.sksl",
173-
"$_tests/sksl/glsl/InterfaceBlockAnonymous.sksl",
174-
"$_tests/sksl/glsl/InterfaceBlockArray.sksl",
175-
"$_tests/sksl/glsl/InterfaceBlockNamed.sksl",
176-
"$_tests/sksl/glsl/Matrices.sksl",
177-
"$_tests/sksl/glsl/MatrixFolding.sksl",
178-
"$_tests/sksl/glsl/ModifiersDeclaration.sksl",
179-
"$_tests/sksl/glsl/MultipleAssignments.sksl",
180-
"$_tests/sksl/glsl/NegatedVectorLiteral.sksl",
181-
"$_tests/sksl/glsl/NoFragCoordsPos.vert",
182-
"$_tests/sksl/glsl/NoFragCoordsPosRT.vert",
183-
"$_tests/sksl/glsl/NormalizationGeo.geom",
184-
"$_tests/sksl/glsl/NormalizationVert.vert",
185-
"$_tests/sksl/glsl/NumberConversions.sksl",
186-
"$_tests/sksl/glsl/Offset.sksl",
187-
"$_tests/sksl/glsl/Operators.sksl",
188-
"$_tests/sksl/glsl/OutParams.sksl",
189-
"$_tests/sksl/glsl/RectangleTexture.sksl",
190-
"$_tests/sksl/glsl/ResizeMatrix.sksl",
191-
"$_tests/sksl/glsl/SampleMask.sksl",
192-
"$_tests/sksl/glsl/ScopedSymbol.sksl",
193-
"$_tests/sksl/glsl/ShortCircuitBoolFolding.sksl",
194136
"$_tests/sksl/glsl/ShortIntPrecision.sksl",
195-
"$_tests/sksl/glsl/StackingVectorCasts.sksl",
196-
"$_tests/sksl/glsl/StaticIf.sksl",
197-
"$_tests/sksl/glsl/StaticSwitch.sksl",
198-
"$_tests/sksl/glsl/StaticSwitchWithBreak.sksl",
199-
"$_tests/sksl/glsl/StaticSwitchWithBreakInsideBlock.sksl",
200-
"$_tests/sksl/glsl/StaticSwitchWithConditionalBreak.sksl",
201-
"$_tests/sksl/glsl/StaticSwitchWithConditionalBreakInsideBlock.sksl",
202-
"$_tests/sksl/glsl/StaticSwitchWithFallthroughA.sksl",
203-
"$_tests/sksl/glsl/StaticSwitchWithFallthroughB.sksl",
204-
"$_tests/sksl/glsl/StaticSwitchWithStaticConditionalBreak.sksl",
205-
"$_tests/sksl/glsl/StaticSwitchWithStaticConditionalBreakInsideBlock.sksl",
206-
"$_tests/sksl/glsl/Structs.sksl",
207-
"$_tests/sksl/glsl/Switch.sksl",
208-
"$_tests/sksl/glsl/SwitchContainingDeadCode.sksl",
209-
"$_tests/sksl/glsl/SwitchWithFallthrough.sksl",
210-
"$_tests/sksl/glsl/SwizzleBoolConstants.sksl",
211-
"$_tests/sksl/glsl/SwizzleConstants.sksl",
212-
"$_tests/sksl/glsl/SwizzleLTRB.sksl",
213-
"$_tests/sksl/glsl/SwizzleOpt.sksl",
214-
"$_tests/sksl/glsl/SwizzleScalar.sksl",
215-
"$_tests/sksl/glsl/TernaryAsLValueEntirelyFoldable.sksl",
216-
"$_tests/sksl/glsl/TernaryAsLValueFoldableTest.sksl",
217-
"$_tests/sksl/glsl/TernaryAsLValueUnfoldable.sksl",
218-
"$_tests/sksl/glsl/Texture.sksl",
219-
"$_tests/sksl/glsl/TextureSharpen.sksl",
220137
"$_tests/sksl/glsl/TextureSharpenVersion110.sksl",
221138
"$_tests/sksl/glsl/TextureVersion110.sksl",
222-
"$_tests/sksl/glsl/UnaryPositiveNegative.sksl",
223-
"$_tests/sksl/glsl/UnusedVariables.sksl",
224139
"$_tests/sksl/glsl/UsesPrecisionModifiers.sksl",
225-
"$_tests/sksl/glsl/VectorConstructors.sksl",
226-
"$_tests/sksl/glsl/VectorFolding.sksl",
227140
"$_tests/sksl/glsl/Version110.sksl",
228141
"$_tests/sksl/glsl/Version450Core.sksl",
229-
"$_tests/sksl/glsl/VertexID.vert",
230-
"$_tests/sksl/glsl/Width.sksl",
142+
]
143+
144+
sksl_shared_tests = [
145+
"$_tests/sksl/shared/ArrayConstructors.sksl",
146+
"$_tests/sksl/shared/ArrayIndexTypes.sksl",
147+
"$_tests/sksl/shared/ArrayTypes.sksl",
148+
"$_tests/sksl/shared/AssignmentTypeMatch.sksl",
149+
"$_tests/sksl/shared/BoolFolding.sksl",
150+
"$_tests/sksl/shared/Caps.sksl",
151+
"$_tests/sksl/shared/CastsRoundTowardZero.sksl",
152+
"$_tests/sksl/shared/ClipDistanceFragment.sksl",
153+
"$_tests/sksl/shared/ClipDistanceVertex.vert",
154+
"$_tests/sksl/shared/Clockwise.sksl",
155+
"$_tests/sksl/shared/ComplexDelete.sksl",
156+
"$_tests/sksl/shared/ConstArray.sksl",
157+
"$_tests/sksl/shared/ConstVariableComparison.sksl",
158+
"$_tests/sksl/shared/ConstantIf.sksl",
159+
"$_tests/sksl/shared/Control.sksl",
160+
"$_tests/sksl/shared/DeadDoWhileLoop.sksl",
161+
"$_tests/sksl/shared/DeadLoopVariable.sksl",
162+
"$_tests/sksl/shared/DependentInitializers.sksl",
163+
"$_tests/sksl/shared/DerivativesUnused.sksl",
164+
"$_tests/sksl/shared/Discard.sksl",
165+
"$_tests/sksl/shared/FloatFolding.sksl",
166+
"$_tests/sksl/shared/FrExp.sksl",
167+
"$_tests/sksl/shared/FragCoordsFlipY.sksl",
168+
"$_tests/sksl/shared/FragCoordsNew.sksl",
169+
"$_tests/sksl/shared/FragCoordsOld.sksl",
170+
"$_tests/sksl/shared/FunctionArgumentMatch.sksl",
171+
"$_tests/sksl/shared/FunctionPrototype.sksl",
172+
"$_tests/sksl/shared/Functions.sksl",
173+
"$_tests/sksl/shared/Geometry.geom",
174+
"$_tests/sksl/shared/GeometryExtension.geom",
175+
"$_tests/sksl/shared/GeometryGSInvocations.geom",
176+
"$_tests/sksl/shared/GeometryNoGSInvocations.geom",
177+
"$_tests/sksl/shared/Height.sksl",
178+
"$_tests/sksl/shared/HelloWorld.sksl",
179+
"$_tests/sksl/shared/Hex.sksl",
180+
"$_tests/sksl/shared/InstanceID.vert",
181+
"$_tests/sksl/shared/IntFolding.sksl",
182+
"$_tests/sksl/shared/InterfaceBlockAnonymous.sksl",
183+
"$_tests/sksl/shared/InterfaceBlockArray.sksl",
184+
"$_tests/sksl/shared/InterfaceBlockNamed.sksl",
185+
"$_tests/sksl/shared/Matrices.sksl",
186+
"$_tests/sksl/shared/MatrixFolding.sksl",
187+
"$_tests/sksl/shared/ModifiersDeclaration.sksl",
188+
"$_tests/sksl/shared/MultipleAssignments.sksl",
189+
"$_tests/sksl/shared/NegatedVectorLiteral.sksl",
190+
"$_tests/sksl/shared/NoFragCoordsPos.vert",
191+
"$_tests/sksl/shared/NoFragCoordsPosRT.vert",
192+
"$_tests/sksl/shared/NormalizationGeo.geom",
193+
"$_tests/sksl/shared/NormalizationVert.vert",
194+
"$_tests/sksl/shared/NumberConversions.sksl",
195+
"$_tests/sksl/shared/Offset.sksl",
196+
"$_tests/sksl/shared/Operators.sksl",
197+
"$_tests/sksl/shared/OutParams.sksl",
198+
"$_tests/sksl/shared/RectangleTexture.sksl",
199+
"$_tests/sksl/shared/ResizeMatrix.sksl",
200+
"$_tests/sksl/shared/SampleMask.sksl",
201+
"$_tests/sksl/shared/ScopedSymbol.sksl",
202+
"$_tests/sksl/shared/ShortCircuitBoolFolding.sksl",
203+
"$_tests/sksl/shared/StackingVectorCasts.sksl",
204+
"$_tests/sksl/shared/StaticIf.sksl",
205+
"$_tests/sksl/shared/StaticSwitch.sksl",
206+
"$_tests/sksl/shared/StaticSwitchWithBreak.sksl",
207+
"$_tests/sksl/shared/StaticSwitchWithBreakInsideBlock.sksl",
208+
"$_tests/sksl/shared/StaticSwitchWithConditionalBreak.sksl",
209+
"$_tests/sksl/shared/StaticSwitchWithConditionalBreakInsideBlock.sksl",
210+
"$_tests/sksl/shared/StaticSwitchWithFallthroughA.sksl",
211+
"$_tests/sksl/shared/StaticSwitchWithFallthroughB.sksl",
212+
"$_tests/sksl/shared/StaticSwitchWithStaticConditionalBreak.sksl",
213+
"$_tests/sksl/shared/StaticSwitchWithStaticConditionalBreakInsideBlock.sksl",
214+
"$_tests/sksl/shared/Structs.sksl",
215+
"$_tests/sksl/shared/Switch.sksl",
216+
"$_tests/sksl/shared/SwitchContainingDeadCode.sksl",
217+
"$_tests/sksl/shared/SwitchWithFallthrough.sksl",
218+
"$_tests/sksl/shared/SwizzleBoolConstants.sksl",
219+
"$_tests/sksl/shared/SwizzleConstants.sksl",
220+
"$_tests/sksl/shared/SwizzleLTRB.sksl",
221+
"$_tests/sksl/shared/SwizzleOpt.sksl",
222+
"$_tests/sksl/shared/SwizzleScalar.sksl",
223+
"$_tests/sksl/shared/TernaryAsLValueEntirelyFoldable.sksl",
224+
"$_tests/sksl/shared/TernaryAsLValueFoldableTest.sksl",
225+
"$_tests/sksl/shared/TernaryAsLValueUnfoldable.sksl",
226+
"$_tests/sksl/shared/Texture.sksl",
227+
"$_tests/sksl/shared/TextureSharpen.sksl",
228+
"$_tests/sksl/shared/UnaryPositiveNegative.sksl",
229+
"$_tests/sksl/shared/UnusedVariables.sksl",
230+
"$_tests/sksl/shared/VectorConstructors.sksl",
231+
"$_tests/sksl/shared/VectorFolding.sksl",
232+
"$_tests/sksl/shared/VertexID.vert",
233+
"$_tests/sksl/shared/Width.sksl",
231234
]
232235

233236
sksl_inliner_tests = [
@@ -296,10 +299,10 @@ sksl_blend_tests = [
296299
]
297300

298301
sksl_settings_tests = [
299-
"$_tests/sksl/glsl/Derivatives.sksl",
300-
"$_tests/sksl/glsl/DerivativesFlipY.sksl",
301302
"$_tests/sksl/glsl/TypePrecision.sksl",
302303
"$_tests/sksl/inliner/InlinerWrapsEarlyReturnsWithDoWhileBlock.sksl",
304+
"$_tests/sksl/shared/Derivatives.sksl",
305+
"$_tests/sksl/shared/DerivativesFlipY.sksl",
303306
"$_tests/sksl/workarounds/AbsInt.sksl",
304307
"$_tests/sksl/workarounds/FractNegative.sksl",
305308
"$_tests/sksl/workarounds/FragCoords.sksl",
@@ -318,7 +321,7 @@ sksl_fp_tests_sources = sksl_fp_error_tests + sksl_fp_tests
318321
# Tests in sksl_glsl_tests_sources will be compiled with --settings on, and are expected to generate
319322
# a .glsl output file.
320323
sksl_glsl_tests_sources =
321-
sksl_error_tests + sksl_common_tests + sksl_inliner_tests
324+
sksl_error_tests + sksl_glsl_tests + sksl_inliner_tests + sksl_shared_tests
322325

323326
# Tests in sksl_glsl_settings_tests_sources will be compiled twice, once with --settings and once
324327
# using --nosettings. In the latter mode, StandaloneSettings is appended to the output filename.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)