[PATCH 0/1] MR248: tests: Move HLSL tests to a subdirectory.
This probably can be seen as pointless moving, but I at least appreciate the structure. Besides structure, part of my motivation here is that I will soon want to introduce tests for d3d assembly. I'd also like to stop once and for all the inconsistency between whether tests have "hlsl" prefixed or not. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/248
From: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 278 +++++++++--------- tests/{ => hlsl}/abs.shader_test | 0 tests/{ => hlsl}/all.shader_test | 0 tests/{ => hlsl}/any.shader_test | 0 .../arithmetic-float-uniform.shader_test | 0 tests/{ => hlsl}/arithmetic-float.shader_test | 0 .../arithmetic-int-uniform.shader_test | 0 tests/{ => hlsl}/arithmetic-int.shader_test | 0 tests/{ => hlsl}/arithmetic-uint.shader_test | 0 .../array-dimension.shader_test} | 0 tests/{ => hlsl}/array-index-expr.shader_test | 0 tests/{ => hlsl}/array-parameters.shader_test | 0 .../array-size-expr.shader_test} | 0 tests/{ => hlsl}/asfloat.shader_test | 0 tests/{ => hlsl}/asuint.shader_test | 0 .../attributes.shader_test} | 0 tests/{ => hlsl}/bitwise.shader_test | 0 .../bool-cast.shader_test} | 0 tests/{ => hlsl}/bool-semantics.shader_test | 0 tests/{ => hlsl}/cast-broadcast.shader_test | 0 .../cast-componentwise-compatible.shader_test | 0 .../cast-componentwise-equal.shader_test | 0 tests/{ => hlsl}/cast-to-float.shader_test | 0 tests/{ => hlsl}/cast-to-half.shader_test | 0 tests/{ => hlsl}/cast-to-int.shader_test | 0 tests/{ => hlsl}/cast-to-uint.shader_test | 0 tests/{ => hlsl}/cbuffer.shader_test | 0 .../clamp.shader_test} | 0 .../comma.shader_test} | 0 tests/{ => hlsl}/compute.shader_test | 0 tests/{ => hlsl}/conditional.shader_test | 0 .../cross.shader_test} | 0 .../d3dcolor-to-ubyte4.shader_test} | 0 tests/{ => hlsl}/ddxddy.shader_test | 0 .../discard.shader_test} | 0 tests/{ => hlsl}/distance.shader_test | 0 .../dot.shader_test} | 0 .../duplicate-modifiers.shader_test} | 0 .../entry-point-semantics.shader_test | 0 tests/{ => hlsl}/exp.shader_test | 0 tests/{ => hlsl}/expr-indexing.shader_test | 0 tests/{ => hlsl}/floor.shader_test | 0 tests/{ => hlsl}/fmod.shader_test | 0 .../for.shader_test} | 0 tests/{ => hlsl}/frac.shader_test | 0 .../function-cast.shader_test} | 0 .../function-overload.shader_test} | 0 tests/{ => hlsl}/function-return.shader_test | 0 .../function.shader_test} | 0 .../gather-offset.shader_test} | 0 .../gather.shader_test} | 0 .../initializer-flatten.shader_test} | 0 .../initializer-implicit-array.shader_test} | 0 ...initializer-invalid-arg-count.shader_test} | 0 .../initializer-local-array.shader_test} | 0 .../initializer-matrix.shader_test} | 0 .../initializer-nested.shader_test} | 0 .../initializer-numeric.shader_test} | 0 .../initializer-objects.shader_test} | 0 .../initializer-static-array.shader_test} | 0 .../initializer-struct.shader_test} | 0 .../intrinsic-override.shader_test} | 0 .../invalid.shader_test} | 0 .../is-front-face.shader_test} | 0 .../ldexp.shader_test} | 0 .../length.shader_test} | 0 .../lerp.shader_test} | 0 tests/{ => hlsl}/lit.shader_test | 0 tests/{ => hlsl}/load-level.shader_test | 0 tests/{ => hlsl}/log.shader_test | 0 tests/{ => hlsl}/logic-operations.shader_test | 0 tests/{ => hlsl}/loop.shader_test | 0 .../majority-pragma.shader_test} | 0 tests/{ => hlsl}/majority-syntax.shader_test | 0 .../majority-typedef.shader_test} | 0 tests/{ => hlsl}/math.shader_test | 0 .../matrix-indexing.shader_test} | 0 tests/{ => hlsl}/matrix-semantics.shader_test | 0 tests/{ => hlsl}/max.shader_test | 0 .../{ => hlsl}/minimum-precision.shader_test | 0 .../mul.shader_test} | 0 tests/{ => hlsl}/multiple-rt.shader_test | 0 .../nested-arrays.shader_test} | 0 tests/{ => hlsl}/nointerpolation.shader_test | 0 .../normalize.shader_test} | 0 ...umeric-constructor-truncation.shader_test} | 0 .../numeric-types.shader_test} | 0 .../numthreads.shader_test} | 0 .../object-field-offsets.shader_test | 0 .../{ => hlsl}/object-parameters.shader_test | 0 .../{ => hlsl}/object-references.shader_test | 0 tests/{ => hlsl}/pow.shader_test | 0 tests/{ => hlsl}/reflect.shader_test | 0 .../register-reservations.shader_test | 0 .../return-implicit-conversion.shader_test} | 0 tests/{ => hlsl}/return.shader_test | 0 tests/{ => hlsl}/round.shader_test | 0 tests/{ => hlsl}/sample-bias.shader_test | 0 tests/{ => hlsl}/sample-grad.shader_test | 0 tests/{ => hlsl}/sample-level.shader_test | 0 tests/{ => hlsl}/sampler-offset.shader_test | 0 tests/{ => hlsl}/sampler.shader_test | 0 tests/{ => hlsl}/saturate.shader_test | 0 .../shader-interstage-interface.shader_test | 0 .../shape.shader_test} | 0 tests/{ => hlsl}/side-effects.shader_test | 0 tests/{ => hlsl}/sign.shader_test | 0 .../single-numeric-initializer.shader_test} | 0 .../smoothstep.shader_test} | 0 tests/{ => hlsl}/sqrt.shader_test | 0 .../state-block-syntax.shader_test} | 0 .../static-initializer.shader_test} | 0 tests/{ => hlsl}/step.shader_test | 0 .../storage-qualifiers.shader_test} | 0 .../struct-array.shader_test} | 0 .../struct-assignment.shader_test} | 0 .../struct-semantics.shader_test} | 0 .../swizzle-constant-prop.shader_test | 0 tests/{ => hlsl}/swizzles.shader_test | 0 .../ternary.shader_test} | 0 .../texture-load-offset.shader_test | 0 .../{ => hlsl}/texture-load-typed.shader_test | 0 tests/{ => hlsl}/texture-load.shader_test | 0 .../transpose.shader_test} | 0 tests/{ => hlsl}/trigonometry.shader_test | 0 .../trunc.shader_test} | 0 .../type-names.shader_test} | 0 tests/{ => hlsl}/uav-load.shader_test | 0 tests/{ => hlsl}/uav-out-param.shader_test | 0 tests/{ => hlsl}/uav-rwbuffer.shader_test | 0 .../uav-rwstructuredbuffer.shader_test | 0 tests/{ => hlsl}/uav-rwtexture.shader_test | 0 .../vector-indexing-uniform.shader_test} | 0 .../vector-indexing.shader_test} | 0 .../writemask-assignop-0.shader_test | 0 .../writemask-assignop-1.shader_test | 0 .../writemask-assignop-2.shader_test | 0 .../writemask-assignop-3.shader_test | 0 138 files changed, 139 insertions(+), 139 deletions(-) rename tests/{ => hlsl}/abs.shader_test (100%) rename tests/{ => hlsl}/all.shader_test (100%) rename tests/{ => hlsl}/any.shader_test (100%) rename tests/{ => hlsl}/arithmetic-float-uniform.shader_test (100%) rename tests/{ => hlsl}/arithmetic-float.shader_test (100%) rename tests/{ => hlsl}/arithmetic-int-uniform.shader_test (100%) rename tests/{ => hlsl}/arithmetic-int.shader_test (100%) rename tests/{ => hlsl}/arithmetic-uint.shader_test (100%) rename tests/{hlsl-array-dimension.shader_test => hlsl/array-dimension.shader_test} (100%) rename tests/{ => hlsl}/array-index-expr.shader_test (100%) rename tests/{ => hlsl}/array-parameters.shader_test (100%) rename tests/{hlsl-array-size-expr.shader_test => hlsl/array-size-expr.shader_test} (100%) rename tests/{ => hlsl}/asfloat.shader_test (100%) rename tests/{ => hlsl}/asuint.shader_test (100%) rename tests/{hlsl-attributes.shader_test => hlsl/attributes.shader_test} (100%) rename tests/{ => hlsl}/bitwise.shader_test (100%) rename tests/{hlsl-bool-cast.shader_test => hlsl/bool-cast.shader_test} (100%) rename tests/{ => hlsl}/bool-semantics.shader_test (100%) rename tests/{ => hlsl}/cast-broadcast.shader_test (100%) rename tests/{ => hlsl}/cast-componentwise-compatible.shader_test (100%) rename tests/{ => hlsl}/cast-componentwise-equal.shader_test (100%) rename tests/{ => hlsl}/cast-to-float.shader_test (100%) rename tests/{ => hlsl}/cast-to-half.shader_test (100%) rename tests/{ => hlsl}/cast-to-int.shader_test (100%) rename tests/{ => hlsl}/cast-to-uint.shader_test (100%) rename tests/{ => hlsl}/cbuffer.shader_test (100%) rename tests/{hlsl-clamp.shader_test => hlsl/clamp.shader_test} (100%) rename tests/{hlsl-comma.shader_test => hlsl/comma.shader_test} (100%) rename tests/{ => hlsl}/compute.shader_test (100%) rename tests/{ => hlsl}/conditional.shader_test (100%) rename tests/{hlsl-cross.shader_test => hlsl/cross.shader_test} (100%) rename tests/{hlsl-d3dcolor-to-ubyte4.shader_test => hlsl/d3dcolor-to-ubyte4.shader_test} (100%) rename tests/{ => hlsl}/ddxddy.shader_test (100%) rename tests/{hlsl-discard.shader_test => hlsl/discard.shader_test} (100%) rename tests/{ => hlsl}/distance.shader_test (100%) rename tests/{hlsl-dot.shader_test => hlsl/dot.shader_test} (100%) rename tests/{hlsl-duplicate-modifiers.shader_test => hlsl/duplicate-modifiers.shader_test} (100%) rename tests/{ => hlsl}/entry-point-semantics.shader_test (100%) rename tests/{ => hlsl}/exp.shader_test (100%) rename tests/{ => hlsl}/expr-indexing.shader_test (100%) rename tests/{ => hlsl}/floor.shader_test (100%) rename tests/{ => hlsl}/fmod.shader_test (100%) rename tests/{hlsl-for.shader_test => hlsl/for.shader_test} (100%) rename tests/{ => hlsl}/frac.shader_test (100%) rename tests/{hlsl-function-cast.shader_test => hlsl/function-cast.shader_test} (100%) rename tests/{hlsl-function-overload.shader_test => hlsl/function-overload.shader_test} (100%) rename tests/{ => hlsl}/function-return.shader_test (100%) rename tests/{hlsl-function.shader_test => hlsl/function.shader_test} (100%) rename tests/{hlsl-gather-offset.shader_test => hlsl/gather-offset.shader_test} (100%) rename tests/{hlsl-gather.shader_test => hlsl/gather.shader_test} (100%) rename tests/{hlsl-initializer-flatten.shader_test => hlsl/initializer-flatten.shader_test} (100%) rename tests/{hlsl-initializer-implicit-array.shader_test => hlsl/initializer-implicit-array.shader_test} (100%) rename tests/{hlsl-initializer-invalid-arg-count.shader_test => hlsl/initializer-invalid-arg-count.shader_test} (100%) rename tests/{hlsl-initializer-local-array.shader_test => hlsl/initializer-local-array.shader_test} (100%) rename tests/{hlsl-initializer-matrix.shader_test => hlsl/initializer-matrix.shader_test} (100%) rename tests/{hlsl-initializer-nested.shader_test => hlsl/initializer-nested.shader_test} (100%) rename tests/{hlsl-initializer-numeric.shader_test => hlsl/initializer-numeric.shader_test} (100%) rename tests/{hlsl-initializer-objects.shader_test => hlsl/initializer-objects.shader_test} (100%) rename tests/{hlsl-initializer-static-array.shader_test => hlsl/initializer-static-array.shader_test} (100%) rename tests/{hlsl-initializer-struct.shader_test => hlsl/initializer-struct.shader_test} (100%) rename tests/{hlsl-intrinsic-override.shader_test => hlsl/intrinsic-override.shader_test} (100%) rename tests/{hlsl-invalid.shader_test => hlsl/invalid.shader_test} (100%) rename tests/{hlsl-is-front-face.shader_test => hlsl/is-front-face.shader_test} (100%) rename tests/{hlsl-ldexp.shader_test => hlsl/ldexp.shader_test} (100%) rename tests/{hlsl-length.shader_test => hlsl/length.shader_test} (100%) rename tests/{hlsl-lerp.shader_test => hlsl/lerp.shader_test} (100%) rename tests/{ => hlsl}/lit.shader_test (100%) rename tests/{ => hlsl}/load-level.shader_test (100%) rename tests/{ => hlsl}/log.shader_test (100%) rename tests/{ => hlsl}/logic-operations.shader_test (100%) rename tests/{ => hlsl}/loop.shader_test (100%) rename tests/{hlsl-majority-pragma.shader_test => hlsl/majority-pragma.shader_test} (100%) rename tests/{ => hlsl}/majority-syntax.shader_test (100%) rename tests/{hlsl-majority-typedef.shader_test => hlsl/majority-typedef.shader_test} (100%) rename tests/{ => hlsl}/math.shader_test (100%) rename tests/{hlsl-matrix-indexing.shader_test => hlsl/matrix-indexing.shader_test} (100%) rename tests/{ => hlsl}/matrix-semantics.shader_test (100%) rename tests/{ => hlsl}/max.shader_test (100%) rename tests/{ => hlsl}/minimum-precision.shader_test (100%) rename tests/{hlsl-mul.shader_test => hlsl/mul.shader_test} (100%) rename tests/{ => hlsl}/multiple-rt.shader_test (100%) rename tests/{hlsl-nested-arrays.shader_test => hlsl/nested-arrays.shader_test} (100%) rename tests/{ => hlsl}/nointerpolation.shader_test (100%) rename tests/{hlsl-normalize.shader_test => hlsl/normalize.shader_test} (100%) rename tests/{hlsl-numeric-constructor-truncation.shader_test => hlsl/numeric-constructor-truncation.shader_test} (100%) rename tests/{hlsl-numeric-types.shader_test => hlsl/numeric-types.shader_test} (100%) rename tests/{hlsl-numthreads.shader_test => hlsl/numthreads.shader_test} (100%) rename tests/{ => hlsl}/object-field-offsets.shader_test (100%) rename tests/{ => hlsl}/object-parameters.shader_test (100%) rename tests/{ => hlsl}/object-references.shader_test (100%) rename tests/{ => hlsl}/pow.shader_test (100%) rename tests/{ => hlsl}/reflect.shader_test (100%) rename tests/{ => hlsl}/register-reservations.shader_test (100%) rename tests/{hlsl-return-implicit-conversion.shader_test => hlsl/return-implicit-conversion.shader_test} (100%) rename tests/{ => hlsl}/return.shader_test (100%) rename tests/{ => hlsl}/round.shader_test (100%) rename tests/{ => hlsl}/sample-bias.shader_test (100%) rename tests/{ => hlsl}/sample-grad.shader_test (100%) rename tests/{ => hlsl}/sample-level.shader_test (100%) rename tests/{ => hlsl}/sampler-offset.shader_test (100%) rename tests/{ => hlsl}/sampler.shader_test (100%) rename tests/{ => hlsl}/saturate.shader_test (100%) rename tests/{ => hlsl}/shader-interstage-interface.shader_test (100%) rename tests/{hlsl-shape.shader_test => hlsl/shape.shader_test} (100%) rename tests/{ => hlsl}/side-effects.shader_test (100%) rename tests/{ => hlsl}/sign.shader_test (100%) rename tests/{hlsl-single-numeric-initializer.shader_test => hlsl/single-numeric-initializer.shader_test} (100%) rename tests/{hlsl-smoothstep.shader_test => hlsl/smoothstep.shader_test} (100%) rename tests/{ => hlsl}/sqrt.shader_test (100%) rename tests/{hlsl-state-block-syntax.shader_test => hlsl/state-block-syntax.shader_test} (100%) rename tests/{hlsl-static-initializer.shader_test => hlsl/static-initializer.shader_test} (100%) rename tests/{ => hlsl}/step.shader_test (100%) rename tests/{hlsl-storage-qualifiers.shader_test => hlsl/storage-qualifiers.shader_test} (100%) rename tests/{hlsl-struct-array.shader_test => hlsl/struct-array.shader_test} (100%) rename tests/{hlsl-struct-assignment.shader_test => hlsl/struct-assignment.shader_test} (100%) rename tests/{hlsl-struct-semantics.shader_test => hlsl/struct-semantics.shader_test} (100%) rename tests/{ => hlsl}/swizzle-constant-prop.shader_test (100%) rename tests/{ => hlsl}/swizzles.shader_test (100%) rename tests/{hlsl-ternary.shader_test => hlsl/ternary.shader_test} (100%) rename tests/{ => hlsl}/texture-load-offset.shader_test (100%) rename tests/{ => hlsl}/texture-load-typed.shader_test (100%) rename tests/{ => hlsl}/texture-load.shader_test (100%) rename tests/{hlsl-transpose.shader_test => hlsl/transpose.shader_test} (100%) rename tests/{ => hlsl}/trigonometry.shader_test (100%) rename tests/{hlsl-trunc.shader_test => hlsl/trunc.shader_test} (100%) rename tests/{hlsl-type-names.shader_test => hlsl/type-names.shader_test} (100%) rename tests/{ => hlsl}/uav-load.shader_test (100%) rename tests/{ => hlsl}/uav-out-param.shader_test (100%) rename tests/{ => hlsl}/uav-rwbuffer.shader_test (100%) rename tests/{ => hlsl}/uav-rwstructuredbuffer.shader_test (100%) rename tests/{ => hlsl}/uav-rwtexture.shader_test (100%) rename tests/{hlsl-vector-indexing-uniform.shader_test => hlsl/vector-indexing-uniform.shader_test} (100%) rename tests/{hlsl-vector-indexing.shader_test => hlsl/vector-indexing.shader_test} (100%) rename tests/{ => hlsl}/writemask-assignop-0.shader_test (100%) rename tests/{ => hlsl}/writemask-assignop-1.shader_test (100%) rename tests/{ => hlsl}/writemask-assignop-2.shader_test (100%) rename tests/{ => hlsl}/writemask-assignop-3.shader_test (100%) diff --git a/Makefile.am b/Makefile.am index fb5bc88f0..5740b40aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,149 +42,149 @@ vkd3d_cross_tests = \ tests/hlsl_d3d12 vkd3d_shader_tests = \ - tests/abs.shader_test \ - tests/all.shader_test \ - tests/any.shader_test \ - tests/arithmetic-float.shader_test \ - tests/arithmetic-float-uniform.shader_test \ - tests/arithmetic-int.shader_test \ - tests/arithmetic-int-uniform.shader_test \ - tests/arithmetic-uint.shader_test \ - tests/array-index-expr.shader_test \ - tests/array-parameters.shader_test \ - tests/asfloat.shader_test \ - tests/asuint.shader_test \ - tests/bitwise.shader_test \ - tests/bool-semantics.shader_test \ - tests/cast-broadcast.shader_test \ - tests/cast-componentwise-compatible.shader_test \ - tests/cast-componentwise-equal.shader_test \ - tests/cast-to-float.shader_test \ - tests/cast-to-half.shader_test \ - tests/cast-to-int.shader_test \ - tests/cast-to-uint.shader_test \ - tests/cbuffer.shader_test \ - tests/compute.shader_test \ - tests/conditional.shader_test \ - tests/ddxddy.shader_test \ - tests/distance.shader_test \ - tests/entry-point-semantics.shader_test \ - tests/exp.shader_test \ - tests/expr-indexing.shader_test \ - tests/floor.shader_test \ - tests/fmod.shader_test \ - tests/frac.shader_test \ - tests/function-return.shader_test \ - tests/hlsl-array-dimension.shader_test \ - tests/hlsl-array-size-expr.shader_test \ - tests/hlsl-attributes.shader_test \ - tests/hlsl-bool-cast.shader_test \ - tests/hlsl-clamp.shader_test \ - tests/hlsl-comma.shader_test \ - tests/hlsl-cross.shader_test \ - tests/hlsl-d3dcolor-to-ubyte4.shader_test \ - tests/hlsl-discard.shader_test \ - tests/hlsl-dot.shader_test \ - tests/hlsl-duplicate-modifiers.shader_test \ - tests/hlsl-for.shader_test \ - tests/hlsl-function.shader_test \ - tests/hlsl-function-cast.shader_test \ - tests/hlsl-function-overload.shader_test \ - tests/hlsl-gather-offset.shader_test \ - tests/hlsl-gather.shader_test \ - tests/hlsl-initializer-flatten.shader_test \ - tests/hlsl-initializer-implicit-array.shader_test \ - tests/hlsl-initializer-invalid-arg-count.shader_test \ - tests/hlsl-initializer-local-array.shader_test \ - tests/hlsl-initializer-matrix.shader_test \ - tests/hlsl-initializer-nested.shader_test \ - tests/hlsl-initializer-numeric.shader_test \ - tests/hlsl-initializer-objects.shader_test \ - tests/hlsl-initializer-static-array.shader_test \ - tests/hlsl-initializer-struct.shader_test \ - tests/hlsl-intrinsic-override.shader_test \ - tests/hlsl-invalid.shader_test \ - tests/hlsl-is-front-face.shader_test \ - tests/hlsl-ldexp.shader_test \ - tests/hlsl-length.shader_test \ - tests/hlsl-lerp.shader_test \ - tests/hlsl-majority-pragma.shader_test \ - tests/hlsl-majority-typedef.shader_test \ - tests/hlsl-matrix-indexing.shader_test \ - tests/hlsl-mul.shader_test \ - tests/hlsl-nested-arrays.shader_test \ - tests/hlsl-normalize.shader_test \ - tests/hlsl-numeric-constructor-truncation.shader_test \ - tests/hlsl-numeric-types.shader_test \ - tests/hlsl-numthreads.shader_test \ - tests/hlsl-return-implicit-conversion.shader_test \ - tests/hlsl-shape.shader_test \ - tests/hlsl-single-numeric-initializer.shader_test \ - tests/hlsl-smoothstep.shader_test \ - tests/hlsl-state-block-syntax.shader_test \ - tests/hlsl-static-initializer.shader_test \ - tests/hlsl-storage-qualifiers.shader_test \ - tests/hlsl-struct-array.shader_test \ - tests/hlsl-struct-assignment.shader_test \ - tests/hlsl-struct-semantics.shader_test \ - tests/hlsl-ternary.shader_test \ - tests/hlsl-transpose.shader_test \ - tests/hlsl-trunc.shader_test \ - tests/hlsl-type-names.shader_test \ - tests/hlsl-vector-indexing.shader_test \ - tests/hlsl-vector-indexing-uniform.shader_test \ - tests/lit.shader_test \ - tests/load-level.shader_test \ - tests/log.shader_test \ - tests/logic-operations.shader_test \ - tests/loop.shader_test \ - tests/majority-syntax.shader_test \ - tests/math.shader_test \ - tests/matrix-semantics.shader_test \ - tests/max.shader_test \ - tests/minimum-precision.shader_test \ - tests/multiple-rt.shader_test \ - tests/nointerpolation.shader_test \ - tests/object-field-offsets.shader_test \ - tests/object-parameters.shader_test \ - tests/object-references.shader_test \ - tests/pow.shader_test \ - tests/preproc-if.shader_test \ + tests/hlsl/abs.shader_test \ + tests/hlsl/all.shader_test \ + tests/hlsl/any.shader_test \ + tests/hlsl/arithmetic-float.shader_test \ + tests/hlsl/arithmetic-float-uniform.shader_test \ + tests/hlsl/arithmetic-int.shader_test \ + tests/hlsl/arithmetic-int-uniform.shader_test \ + tests/hlsl/arithmetic-uint.shader_test \ + tests/hlsl/array-dimension.shader_test \ + tests/hlsl/array-index-expr.shader_test \ + tests/hlsl/array-parameters.shader_test \ + tests/hlsl/array-size-expr.shader_test \ + tests/hlsl/asfloat.shader_test \ + tests/hlsl/asuint.shader_test \ + tests/hlsl/attributes.shader_test \ + tests/hlsl/bitwise.shader_test \ + tests/hlsl/bool-cast.shader_test \ + tests/hlsl/bool-semantics.shader_test \ + tests/hlsl/cast-broadcast.shader_test \ + tests/hlsl/cast-componentwise-compatible.shader_test \ + tests/hlsl/cast-componentwise-equal.shader_test \ + tests/hlsl/cast-to-float.shader_test \ + tests/hlsl/cast-to-half.shader_test \ + tests/hlsl/cast-to-int.shader_test \ + tests/hlsl/cast-to-uint.shader_test \ + tests/hlsl/cbuffer.shader_test \ + tests/hlsl/clamp.shader_test \ + tests/hlsl/comma.shader_test \ + tests/hlsl/compute.shader_test \ + tests/hlsl/conditional.shader_test \ + tests/hlsl/cross.shader_test \ + tests/hlsl/d3dcolor-to-ubyte4.shader_test \ + tests/hlsl/ddxddy.shader_test \ + tests/hlsl/discard.shader_test \ + tests/hlsl/distance.shader_test \ + tests/hlsl/dot.shader_test \ + tests/hlsl/duplicate-modifiers.shader_test \ + tests/hlsl/entry-point-semantics.shader_test \ + tests/hlsl/expr-indexing.shader_test \ + tests/hlsl/exp.shader_test \ + tests/hlsl/floor.shader_test \ + tests/hlsl/fmod.shader_test \ + tests/hlsl/for.shader_test \ + tests/hlsl/frac.shader_test \ + tests/hlsl/function-cast.shader_test \ + tests/hlsl/function-overload.shader_test \ + tests/hlsl/function-return.shader_test \ + tests/hlsl/function.shader_test \ + tests/hlsl/gather-offset.shader_test \ + tests/hlsl/gather.shader_test \ + tests/hlsl/initializer-flatten.shader_test \ + tests/hlsl/initializer-implicit-array.shader_test \ + tests/hlsl/initializer-invalid-arg-count.shader_test \ + tests/hlsl/initializer-local-array.shader_test \ + tests/hlsl/initializer-matrix.shader_test \ + tests/hlsl/initializer-nested.shader_test \ + tests/hlsl/initializer-numeric.shader_test \ + tests/hlsl/initializer-objects.shader_test \ + tests/hlsl/initializer-static-array.shader_test \ + tests/hlsl/initializer-struct.shader_test \ + tests/hlsl/intrinsic-override.shader_test \ + tests/hlsl/invalid.shader_test \ + tests/hlsl/is-front-face.shader_test \ + tests/hlsl/ldexp.shader_test \ + tests/hlsl/length.shader_test \ + tests/hlsl/lerp.shader_test \ + tests/hlsl/lit.shader_test \ + tests/hlsl/load-level.shader_test \ + tests/hlsl/logic-operations.shader_test \ + tests/hlsl/log.shader_test \ + tests/hlsl/loop.shader_test \ + tests/hlsl/majority-pragma.shader_test \ + tests/hlsl/majority-syntax.shader_test \ + tests/hlsl/majority-typedef.shader_test \ + tests/hlsl/math.shader_test \ + tests/hlsl/matrix-indexing.shader_test \ + tests/hlsl/matrix-semantics.shader_test \ + tests/hlsl/max.shader_test \ + tests/hlsl/minimum-precision.shader_test \ + tests/hlsl/mul.shader_test \ + tests/hlsl/multiple-rt.shader_test \ + tests/hlsl/nested-arrays.shader_test \ + tests/hlsl/nointerpolation.shader_test \ + tests/hlsl/normalize.shader_test \ + tests/hlsl/numeric-constructor-truncation.shader_test \ + tests/hlsl/numeric-types.shader_test \ + tests/hlsl/numthreads.shader_test \ + tests/hlsl/object-field-offsets.shader_test \ + tests/hlsl/object-parameters.shader_test \ + tests/hlsl/object-references.shader_test \ + tests/hlsl/pow.shader_test \ + tests/hlsl/reflect.shader_test \ + tests/hlsl/register-reservations.shader_test \ + tests/hlsl/return-implicit-conversion.shader_test \ + tests/hlsl/return.shader_test \ + tests/hlsl/round.shader_test \ + tests/hlsl/sample-bias.shader_test \ + tests/hlsl/sample-grad.shader_test \ + tests/hlsl/sample-level.shader_test \ + tests/hlsl/sampler-offset.shader_test \ + tests/hlsl/sampler.shader_test \ + tests/hlsl/saturate.shader_test \ + tests/hlsl/shader-interstage-interface.shader_test \ + tests/hlsl/shape.shader_test \ + tests/hlsl/side-effects.shader_test \ + tests/hlsl/sign.shader_test \ + tests/hlsl/single-numeric-initializer.shader_test \ + tests/hlsl/smoothstep.shader_test \ + tests/hlsl/sqrt.shader_test \ + tests/hlsl/state-block-syntax.shader_test \ + tests/hlsl/static-initializer.shader_test \ + tests/hlsl/step.shader_test \ + tests/hlsl/storage-qualifiers.shader_test \ + tests/hlsl/struct-array.shader_test \ + tests/hlsl/struct-assignment.shader_test \ + tests/hlsl/struct-semantics.shader_test \ + tests/hlsl/swizzle-constant-prop.shader_test \ + tests/hlsl/swizzles.shader_test \ + tests/hlsl/ternary.shader_test \ + tests/hlsl/texture-load-offset.shader_test \ + tests/hlsl/texture-load.shader_test \ + tests/hlsl/texture-load-typed.shader_test \ + tests/hlsl/transpose.shader_test \ + tests/hlsl/trigonometry.shader_test \ + tests/hlsl/trunc.shader_test \ + tests/hlsl/type-names.shader_test \ + tests/hlsl/uav-load.shader_test \ + tests/hlsl/uav-out-param.shader_test \ + tests/hlsl/uav-rwbuffer.shader_test \ + tests/hlsl/uav-rwstructuredbuffer.shader_test \ + tests/hlsl/uav-rwtexture.shader_test \ + tests/hlsl/vector-indexing.shader_test \ + tests/hlsl/vector-indexing-uniform.shader_test \ + tests/hlsl/writemask-assignop-0.shader_test \ + tests/hlsl/writemask-assignop-1.shader_test \ + tests/hlsl/writemask-assignop-2.shader_test \ + tests/hlsl/writemask-assignop-3.shader_test \ tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ + tests/preproc-if.shader_test \ tests/preproc-invalid.shader_test \ tests/preproc-macro.shader_test \ - tests/preproc-misc.shader_test \ - tests/reflect.shader_test \ - tests/register-reservations.shader_test \ - tests/return.shader_test \ - tests/round.shader_test \ - tests/sample-bias.shader_test \ - tests/sample-grad.shader_test \ - tests/sample-level.shader_test \ - tests/sampler.shader_test \ - tests/sampler-offset.shader_test \ - tests/saturate.shader_test \ - tests/shader-interstage-interface.shader_test \ - tests/side-effects.shader_test \ - tests/sign.shader_test \ - tests/sqrt.shader_test \ - tests/step.shader_test \ - tests/swizzle-constant-prop.shader_test \ - tests/swizzles.shader_test \ - tests/texture-load.shader_test \ - tests/texture-load-offset.shader_test \ - tests/texture-load-typed.shader_test \ - tests/trigonometry.shader_test \ - tests/uav-load.shader_test \ - tests/uav-out-param.shader_test \ - tests/uav-rwbuffer.shader_test \ - tests/uav-rwstructuredbuffer.shader_test \ - tests/uav-rwtexture.shader_test \ - tests/writemask-assignop-0.shader_test \ - tests/writemask-assignop-1.shader_test \ - tests/writemask-assignop-2.shader_test \ - tests/writemask-assignop-3.shader_test + tests/preproc-misc.shader_test vkd3d_test_headers = \ tests/d3d12_crosstest.h \ diff --git a/tests/abs.shader_test b/tests/hlsl/abs.shader_test similarity index 100% rename from tests/abs.shader_test rename to tests/hlsl/abs.shader_test diff --git a/tests/all.shader_test b/tests/hlsl/all.shader_test similarity index 100% rename from tests/all.shader_test rename to tests/hlsl/all.shader_test diff --git a/tests/any.shader_test b/tests/hlsl/any.shader_test similarity index 100% rename from tests/any.shader_test rename to tests/hlsl/any.shader_test diff --git a/tests/arithmetic-float-uniform.shader_test b/tests/hlsl/arithmetic-float-uniform.shader_test similarity index 100% rename from tests/arithmetic-float-uniform.shader_test rename to tests/hlsl/arithmetic-float-uniform.shader_test diff --git a/tests/arithmetic-float.shader_test b/tests/hlsl/arithmetic-float.shader_test similarity index 100% rename from tests/arithmetic-float.shader_test rename to tests/hlsl/arithmetic-float.shader_test diff --git a/tests/arithmetic-int-uniform.shader_test b/tests/hlsl/arithmetic-int-uniform.shader_test similarity index 100% rename from tests/arithmetic-int-uniform.shader_test rename to tests/hlsl/arithmetic-int-uniform.shader_test diff --git a/tests/arithmetic-int.shader_test b/tests/hlsl/arithmetic-int.shader_test similarity index 100% rename from tests/arithmetic-int.shader_test rename to tests/hlsl/arithmetic-int.shader_test diff --git a/tests/arithmetic-uint.shader_test b/tests/hlsl/arithmetic-uint.shader_test similarity index 100% rename from tests/arithmetic-uint.shader_test rename to tests/hlsl/arithmetic-uint.shader_test diff --git a/tests/hlsl-array-dimension.shader_test b/tests/hlsl/array-dimension.shader_test similarity index 100% rename from tests/hlsl-array-dimension.shader_test rename to tests/hlsl/array-dimension.shader_test diff --git a/tests/array-index-expr.shader_test b/tests/hlsl/array-index-expr.shader_test similarity index 100% rename from tests/array-index-expr.shader_test rename to tests/hlsl/array-index-expr.shader_test diff --git a/tests/array-parameters.shader_test b/tests/hlsl/array-parameters.shader_test similarity index 100% rename from tests/array-parameters.shader_test rename to tests/hlsl/array-parameters.shader_test diff --git a/tests/hlsl-array-size-expr.shader_test b/tests/hlsl/array-size-expr.shader_test similarity index 100% rename from tests/hlsl-array-size-expr.shader_test rename to tests/hlsl/array-size-expr.shader_test diff --git a/tests/asfloat.shader_test b/tests/hlsl/asfloat.shader_test similarity index 100% rename from tests/asfloat.shader_test rename to tests/hlsl/asfloat.shader_test diff --git a/tests/asuint.shader_test b/tests/hlsl/asuint.shader_test similarity index 100% rename from tests/asuint.shader_test rename to tests/hlsl/asuint.shader_test diff --git a/tests/hlsl-attributes.shader_test b/tests/hlsl/attributes.shader_test similarity index 100% rename from tests/hlsl-attributes.shader_test rename to tests/hlsl/attributes.shader_test diff --git a/tests/bitwise.shader_test b/tests/hlsl/bitwise.shader_test similarity index 100% rename from tests/bitwise.shader_test rename to tests/hlsl/bitwise.shader_test diff --git a/tests/hlsl-bool-cast.shader_test b/tests/hlsl/bool-cast.shader_test similarity index 100% rename from tests/hlsl-bool-cast.shader_test rename to tests/hlsl/bool-cast.shader_test diff --git a/tests/bool-semantics.shader_test b/tests/hlsl/bool-semantics.shader_test similarity index 100% rename from tests/bool-semantics.shader_test rename to tests/hlsl/bool-semantics.shader_test diff --git a/tests/cast-broadcast.shader_test b/tests/hlsl/cast-broadcast.shader_test similarity index 100% rename from tests/cast-broadcast.shader_test rename to tests/hlsl/cast-broadcast.shader_test diff --git a/tests/cast-componentwise-compatible.shader_test b/tests/hlsl/cast-componentwise-compatible.shader_test similarity index 100% rename from tests/cast-componentwise-compatible.shader_test rename to tests/hlsl/cast-componentwise-compatible.shader_test diff --git a/tests/cast-componentwise-equal.shader_test b/tests/hlsl/cast-componentwise-equal.shader_test similarity index 100% rename from tests/cast-componentwise-equal.shader_test rename to tests/hlsl/cast-componentwise-equal.shader_test diff --git a/tests/cast-to-float.shader_test b/tests/hlsl/cast-to-float.shader_test similarity index 100% rename from tests/cast-to-float.shader_test rename to tests/hlsl/cast-to-float.shader_test diff --git a/tests/cast-to-half.shader_test b/tests/hlsl/cast-to-half.shader_test similarity index 100% rename from tests/cast-to-half.shader_test rename to tests/hlsl/cast-to-half.shader_test diff --git a/tests/cast-to-int.shader_test b/tests/hlsl/cast-to-int.shader_test similarity index 100% rename from tests/cast-to-int.shader_test rename to tests/hlsl/cast-to-int.shader_test diff --git a/tests/cast-to-uint.shader_test b/tests/hlsl/cast-to-uint.shader_test similarity index 100% rename from tests/cast-to-uint.shader_test rename to tests/hlsl/cast-to-uint.shader_test diff --git a/tests/cbuffer.shader_test b/tests/hlsl/cbuffer.shader_test similarity index 100% rename from tests/cbuffer.shader_test rename to tests/hlsl/cbuffer.shader_test diff --git a/tests/hlsl-clamp.shader_test b/tests/hlsl/clamp.shader_test similarity index 100% rename from tests/hlsl-clamp.shader_test rename to tests/hlsl/clamp.shader_test diff --git a/tests/hlsl-comma.shader_test b/tests/hlsl/comma.shader_test similarity index 100% rename from tests/hlsl-comma.shader_test rename to tests/hlsl/comma.shader_test diff --git a/tests/compute.shader_test b/tests/hlsl/compute.shader_test similarity index 100% rename from tests/compute.shader_test rename to tests/hlsl/compute.shader_test diff --git a/tests/conditional.shader_test b/tests/hlsl/conditional.shader_test similarity index 100% rename from tests/conditional.shader_test rename to tests/hlsl/conditional.shader_test diff --git a/tests/hlsl-cross.shader_test b/tests/hlsl/cross.shader_test similarity index 100% rename from tests/hlsl-cross.shader_test rename to tests/hlsl/cross.shader_test diff --git a/tests/hlsl-d3dcolor-to-ubyte4.shader_test b/tests/hlsl/d3dcolor-to-ubyte4.shader_test similarity index 100% rename from tests/hlsl-d3dcolor-to-ubyte4.shader_test rename to tests/hlsl/d3dcolor-to-ubyte4.shader_test diff --git a/tests/ddxddy.shader_test b/tests/hlsl/ddxddy.shader_test similarity index 100% rename from tests/ddxddy.shader_test rename to tests/hlsl/ddxddy.shader_test diff --git a/tests/hlsl-discard.shader_test b/tests/hlsl/discard.shader_test similarity index 100% rename from tests/hlsl-discard.shader_test rename to tests/hlsl/discard.shader_test diff --git a/tests/distance.shader_test b/tests/hlsl/distance.shader_test similarity index 100% rename from tests/distance.shader_test rename to tests/hlsl/distance.shader_test diff --git a/tests/hlsl-dot.shader_test b/tests/hlsl/dot.shader_test similarity index 100% rename from tests/hlsl-dot.shader_test rename to tests/hlsl/dot.shader_test diff --git a/tests/hlsl-duplicate-modifiers.shader_test b/tests/hlsl/duplicate-modifiers.shader_test similarity index 100% rename from tests/hlsl-duplicate-modifiers.shader_test rename to tests/hlsl/duplicate-modifiers.shader_test diff --git a/tests/entry-point-semantics.shader_test b/tests/hlsl/entry-point-semantics.shader_test similarity index 100% rename from tests/entry-point-semantics.shader_test rename to tests/hlsl/entry-point-semantics.shader_test diff --git a/tests/exp.shader_test b/tests/hlsl/exp.shader_test similarity index 100% rename from tests/exp.shader_test rename to tests/hlsl/exp.shader_test diff --git a/tests/expr-indexing.shader_test b/tests/hlsl/expr-indexing.shader_test similarity index 100% rename from tests/expr-indexing.shader_test rename to tests/hlsl/expr-indexing.shader_test diff --git a/tests/floor.shader_test b/tests/hlsl/floor.shader_test similarity index 100% rename from tests/floor.shader_test rename to tests/hlsl/floor.shader_test diff --git a/tests/fmod.shader_test b/tests/hlsl/fmod.shader_test similarity index 100% rename from tests/fmod.shader_test rename to tests/hlsl/fmod.shader_test diff --git a/tests/hlsl-for.shader_test b/tests/hlsl/for.shader_test similarity index 100% rename from tests/hlsl-for.shader_test rename to tests/hlsl/for.shader_test diff --git a/tests/frac.shader_test b/tests/hlsl/frac.shader_test similarity index 100% rename from tests/frac.shader_test rename to tests/hlsl/frac.shader_test diff --git a/tests/hlsl-function-cast.shader_test b/tests/hlsl/function-cast.shader_test similarity index 100% rename from tests/hlsl-function-cast.shader_test rename to tests/hlsl/function-cast.shader_test diff --git a/tests/hlsl-function-overload.shader_test b/tests/hlsl/function-overload.shader_test similarity index 100% rename from tests/hlsl-function-overload.shader_test rename to tests/hlsl/function-overload.shader_test diff --git a/tests/function-return.shader_test b/tests/hlsl/function-return.shader_test similarity index 100% rename from tests/function-return.shader_test rename to tests/hlsl/function-return.shader_test diff --git a/tests/hlsl-function.shader_test b/tests/hlsl/function.shader_test similarity index 100% rename from tests/hlsl-function.shader_test rename to tests/hlsl/function.shader_test diff --git a/tests/hlsl-gather-offset.shader_test b/tests/hlsl/gather-offset.shader_test similarity index 100% rename from tests/hlsl-gather-offset.shader_test rename to tests/hlsl/gather-offset.shader_test diff --git a/tests/hlsl-gather.shader_test b/tests/hlsl/gather.shader_test similarity index 100% rename from tests/hlsl-gather.shader_test rename to tests/hlsl/gather.shader_test diff --git a/tests/hlsl-initializer-flatten.shader_test b/tests/hlsl/initializer-flatten.shader_test similarity index 100% rename from tests/hlsl-initializer-flatten.shader_test rename to tests/hlsl/initializer-flatten.shader_test diff --git a/tests/hlsl-initializer-implicit-array.shader_test b/tests/hlsl/initializer-implicit-array.shader_test similarity index 100% rename from tests/hlsl-initializer-implicit-array.shader_test rename to tests/hlsl/initializer-implicit-array.shader_test diff --git a/tests/hlsl-initializer-invalid-arg-count.shader_test b/tests/hlsl/initializer-invalid-arg-count.shader_test similarity index 100% rename from tests/hlsl-initializer-invalid-arg-count.shader_test rename to tests/hlsl/initializer-invalid-arg-count.shader_test diff --git a/tests/hlsl-initializer-local-array.shader_test b/tests/hlsl/initializer-local-array.shader_test similarity index 100% rename from tests/hlsl-initializer-local-array.shader_test rename to tests/hlsl/initializer-local-array.shader_test diff --git a/tests/hlsl-initializer-matrix.shader_test b/tests/hlsl/initializer-matrix.shader_test similarity index 100% rename from tests/hlsl-initializer-matrix.shader_test rename to tests/hlsl/initializer-matrix.shader_test diff --git a/tests/hlsl-initializer-nested.shader_test b/tests/hlsl/initializer-nested.shader_test similarity index 100% rename from tests/hlsl-initializer-nested.shader_test rename to tests/hlsl/initializer-nested.shader_test diff --git a/tests/hlsl-initializer-numeric.shader_test b/tests/hlsl/initializer-numeric.shader_test similarity index 100% rename from tests/hlsl-initializer-numeric.shader_test rename to tests/hlsl/initializer-numeric.shader_test diff --git a/tests/hlsl-initializer-objects.shader_test b/tests/hlsl/initializer-objects.shader_test similarity index 100% rename from tests/hlsl-initializer-objects.shader_test rename to tests/hlsl/initializer-objects.shader_test diff --git a/tests/hlsl-initializer-static-array.shader_test b/tests/hlsl/initializer-static-array.shader_test similarity index 100% rename from tests/hlsl-initializer-static-array.shader_test rename to tests/hlsl/initializer-static-array.shader_test diff --git a/tests/hlsl-initializer-struct.shader_test b/tests/hlsl/initializer-struct.shader_test similarity index 100% rename from tests/hlsl-initializer-struct.shader_test rename to tests/hlsl/initializer-struct.shader_test diff --git a/tests/hlsl-intrinsic-override.shader_test b/tests/hlsl/intrinsic-override.shader_test similarity index 100% rename from tests/hlsl-intrinsic-override.shader_test rename to tests/hlsl/intrinsic-override.shader_test diff --git a/tests/hlsl-invalid.shader_test b/tests/hlsl/invalid.shader_test similarity index 100% rename from tests/hlsl-invalid.shader_test rename to tests/hlsl/invalid.shader_test diff --git a/tests/hlsl-is-front-face.shader_test b/tests/hlsl/is-front-face.shader_test similarity index 100% rename from tests/hlsl-is-front-face.shader_test rename to tests/hlsl/is-front-face.shader_test diff --git a/tests/hlsl-ldexp.shader_test b/tests/hlsl/ldexp.shader_test similarity index 100% rename from tests/hlsl-ldexp.shader_test rename to tests/hlsl/ldexp.shader_test diff --git a/tests/hlsl-length.shader_test b/tests/hlsl/length.shader_test similarity index 100% rename from tests/hlsl-length.shader_test rename to tests/hlsl/length.shader_test diff --git a/tests/hlsl-lerp.shader_test b/tests/hlsl/lerp.shader_test similarity index 100% rename from tests/hlsl-lerp.shader_test rename to tests/hlsl/lerp.shader_test diff --git a/tests/lit.shader_test b/tests/hlsl/lit.shader_test similarity index 100% rename from tests/lit.shader_test rename to tests/hlsl/lit.shader_test diff --git a/tests/load-level.shader_test b/tests/hlsl/load-level.shader_test similarity index 100% rename from tests/load-level.shader_test rename to tests/hlsl/load-level.shader_test diff --git a/tests/log.shader_test b/tests/hlsl/log.shader_test similarity index 100% rename from tests/log.shader_test rename to tests/hlsl/log.shader_test diff --git a/tests/logic-operations.shader_test b/tests/hlsl/logic-operations.shader_test similarity index 100% rename from tests/logic-operations.shader_test rename to tests/hlsl/logic-operations.shader_test diff --git a/tests/loop.shader_test b/tests/hlsl/loop.shader_test similarity index 100% rename from tests/loop.shader_test rename to tests/hlsl/loop.shader_test diff --git a/tests/hlsl-majority-pragma.shader_test b/tests/hlsl/majority-pragma.shader_test similarity index 100% rename from tests/hlsl-majority-pragma.shader_test rename to tests/hlsl/majority-pragma.shader_test diff --git a/tests/majority-syntax.shader_test b/tests/hlsl/majority-syntax.shader_test similarity index 100% rename from tests/majority-syntax.shader_test rename to tests/hlsl/majority-syntax.shader_test diff --git a/tests/hlsl-majority-typedef.shader_test b/tests/hlsl/majority-typedef.shader_test similarity index 100% rename from tests/hlsl-majority-typedef.shader_test rename to tests/hlsl/majority-typedef.shader_test diff --git a/tests/math.shader_test b/tests/hlsl/math.shader_test similarity index 100% rename from tests/math.shader_test rename to tests/hlsl/math.shader_test diff --git a/tests/hlsl-matrix-indexing.shader_test b/tests/hlsl/matrix-indexing.shader_test similarity index 100% rename from tests/hlsl-matrix-indexing.shader_test rename to tests/hlsl/matrix-indexing.shader_test diff --git a/tests/matrix-semantics.shader_test b/tests/hlsl/matrix-semantics.shader_test similarity index 100% rename from tests/matrix-semantics.shader_test rename to tests/hlsl/matrix-semantics.shader_test diff --git a/tests/max.shader_test b/tests/hlsl/max.shader_test similarity index 100% rename from tests/max.shader_test rename to tests/hlsl/max.shader_test diff --git a/tests/minimum-precision.shader_test b/tests/hlsl/minimum-precision.shader_test similarity index 100% rename from tests/minimum-precision.shader_test rename to tests/hlsl/minimum-precision.shader_test diff --git a/tests/hlsl-mul.shader_test b/tests/hlsl/mul.shader_test similarity index 100% rename from tests/hlsl-mul.shader_test rename to tests/hlsl/mul.shader_test diff --git a/tests/multiple-rt.shader_test b/tests/hlsl/multiple-rt.shader_test similarity index 100% rename from tests/multiple-rt.shader_test rename to tests/hlsl/multiple-rt.shader_test diff --git a/tests/hlsl-nested-arrays.shader_test b/tests/hlsl/nested-arrays.shader_test similarity index 100% rename from tests/hlsl-nested-arrays.shader_test rename to tests/hlsl/nested-arrays.shader_test diff --git a/tests/nointerpolation.shader_test b/tests/hlsl/nointerpolation.shader_test similarity index 100% rename from tests/nointerpolation.shader_test rename to tests/hlsl/nointerpolation.shader_test diff --git a/tests/hlsl-normalize.shader_test b/tests/hlsl/normalize.shader_test similarity index 100% rename from tests/hlsl-normalize.shader_test rename to tests/hlsl/normalize.shader_test diff --git a/tests/hlsl-numeric-constructor-truncation.shader_test b/tests/hlsl/numeric-constructor-truncation.shader_test similarity index 100% rename from tests/hlsl-numeric-constructor-truncation.shader_test rename to tests/hlsl/numeric-constructor-truncation.shader_test diff --git a/tests/hlsl-numeric-types.shader_test b/tests/hlsl/numeric-types.shader_test similarity index 100% rename from tests/hlsl-numeric-types.shader_test rename to tests/hlsl/numeric-types.shader_test diff --git a/tests/hlsl-numthreads.shader_test b/tests/hlsl/numthreads.shader_test similarity index 100% rename from tests/hlsl-numthreads.shader_test rename to tests/hlsl/numthreads.shader_test diff --git a/tests/object-field-offsets.shader_test b/tests/hlsl/object-field-offsets.shader_test similarity index 100% rename from tests/object-field-offsets.shader_test rename to tests/hlsl/object-field-offsets.shader_test diff --git a/tests/object-parameters.shader_test b/tests/hlsl/object-parameters.shader_test similarity index 100% rename from tests/object-parameters.shader_test rename to tests/hlsl/object-parameters.shader_test diff --git a/tests/object-references.shader_test b/tests/hlsl/object-references.shader_test similarity index 100% rename from tests/object-references.shader_test rename to tests/hlsl/object-references.shader_test diff --git a/tests/pow.shader_test b/tests/hlsl/pow.shader_test similarity index 100% rename from tests/pow.shader_test rename to tests/hlsl/pow.shader_test diff --git a/tests/reflect.shader_test b/tests/hlsl/reflect.shader_test similarity index 100% rename from tests/reflect.shader_test rename to tests/hlsl/reflect.shader_test diff --git a/tests/register-reservations.shader_test b/tests/hlsl/register-reservations.shader_test similarity index 100% rename from tests/register-reservations.shader_test rename to tests/hlsl/register-reservations.shader_test diff --git a/tests/hlsl-return-implicit-conversion.shader_test b/tests/hlsl/return-implicit-conversion.shader_test similarity index 100% rename from tests/hlsl-return-implicit-conversion.shader_test rename to tests/hlsl/return-implicit-conversion.shader_test diff --git a/tests/return.shader_test b/tests/hlsl/return.shader_test similarity index 100% rename from tests/return.shader_test rename to tests/hlsl/return.shader_test diff --git a/tests/round.shader_test b/tests/hlsl/round.shader_test similarity index 100% rename from tests/round.shader_test rename to tests/hlsl/round.shader_test diff --git a/tests/sample-bias.shader_test b/tests/hlsl/sample-bias.shader_test similarity index 100% rename from tests/sample-bias.shader_test rename to tests/hlsl/sample-bias.shader_test diff --git a/tests/sample-grad.shader_test b/tests/hlsl/sample-grad.shader_test similarity index 100% rename from tests/sample-grad.shader_test rename to tests/hlsl/sample-grad.shader_test diff --git a/tests/sample-level.shader_test b/tests/hlsl/sample-level.shader_test similarity index 100% rename from tests/sample-level.shader_test rename to tests/hlsl/sample-level.shader_test diff --git a/tests/sampler-offset.shader_test b/tests/hlsl/sampler-offset.shader_test similarity index 100% rename from tests/sampler-offset.shader_test rename to tests/hlsl/sampler-offset.shader_test diff --git a/tests/sampler.shader_test b/tests/hlsl/sampler.shader_test similarity index 100% rename from tests/sampler.shader_test rename to tests/hlsl/sampler.shader_test diff --git a/tests/saturate.shader_test b/tests/hlsl/saturate.shader_test similarity index 100% rename from tests/saturate.shader_test rename to tests/hlsl/saturate.shader_test diff --git a/tests/shader-interstage-interface.shader_test b/tests/hlsl/shader-interstage-interface.shader_test similarity index 100% rename from tests/shader-interstage-interface.shader_test rename to tests/hlsl/shader-interstage-interface.shader_test diff --git a/tests/hlsl-shape.shader_test b/tests/hlsl/shape.shader_test similarity index 100% rename from tests/hlsl-shape.shader_test rename to tests/hlsl/shape.shader_test diff --git a/tests/side-effects.shader_test b/tests/hlsl/side-effects.shader_test similarity index 100% rename from tests/side-effects.shader_test rename to tests/hlsl/side-effects.shader_test diff --git a/tests/sign.shader_test b/tests/hlsl/sign.shader_test similarity index 100% rename from tests/sign.shader_test rename to tests/hlsl/sign.shader_test diff --git a/tests/hlsl-single-numeric-initializer.shader_test b/tests/hlsl/single-numeric-initializer.shader_test similarity index 100% rename from tests/hlsl-single-numeric-initializer.shader_test rename to tests/hlsl/single-numeric-initializer.shader_test diff --git a/tests/hlsl-smoothstep.shader_test b/tests/hlsl/smoothstep.shader_test similarity index 100% rename from tests/hlsl-smoothstep.shader_test rename to tests/hlsl/smoothstep.shader_test diff --git a/tests/sqrt.shader_test b/tests/hlsl/sqrt.shader_test similarity index 100% rename from tests/sqrt.shader_test rename to tests/hlsl/sqrt.shader_test diff --git a/tests/hlsl-state-block-syntax.shader_test b/tests/hlsl/state-block-syntax.shader_test similarity index 100% rename from tests/hlsl-state-block-syntax.shader_test rename to tests/hlsl/state-block-syntax.shader_test diff --git a/tests/hlsl-static-initializer.shader_test b/tests/hlsl/static-initializer.shader_test similarity index 100% rename from tests/hlsl-static-initializer.shader_test rename to tests/hlsl/static-initializer.shader_test diff --git a/tests/step.shader_test b/tests/hlsl/step.shader_test similarity index 100% rename from tests/step.shader_test rename to tests/hlsl/step.shader_test diff --git a/tests/hlsl-storage-qualifiers.shader_test b/tests/hlsl/storage-qualifiers.shader_test similarity index 100% rename from tests/hlsl-storage-qualifiers.shader_test rename to tests/hlsl/storage-qualifiers.shader_test diff --git a/tests/hlsl-struct-array.shader_test b/tests/hlsl/struct-array.shader_test similarity index 100% rename from tests/hlsl-struct-array.shader_test rename to tests/hlsl/struct-array.shader_test diff --git a/tests/hlsl-struct-assignment.shader_test b/tests/hlsl/struct-assignment.shader_test similarity index 100% rename from tests/hlsl-struct-assignment.shader_test rename to tests/hlsl/struct-assignment.shader_test diff --git a/tests/hlsl-struct-semantics.shader_test b/tests/hlsl/struct-semantics.shader_test similarity index 100% rename from tests/hlsl-struct-semantics.shader_test rename to tests/hlsl/struct-semantics.shader_test diff --git a/tests/swizzle-constant-prop.shader_test b/tests/hlsl/swizzle-constant-prop.shader_test similarity index 100% rename from tests/swizzle-constant-prop.shader_test rename to tests/hlsl/swizzle-constant-prop.shader_test diff --git a/tests/swizzles.shader_test b/tests/hlsl/swizzles.shader_test similarity index 100% rename from tests/swizzles.shader_test rename to tests/hlsl/swizzles.shader_test diff --git a/tests/hlsl-ternary.shader_test b/tests/hlsl/ternary.shader_test similarity index 100% rename from tests/hlsl-ternary.shader_test rename to tests/hlsl/ternary.shader_test diff --git a/tests/texture-load-offset.shader_test b/tests/hlsl/texture-load-offset.shader_test similarity index 100% rename from tests/texture-load-offset.shader_test rename to tests/hlsl/texture-load-offset.shader_test diff --git a/tests/texture-load-typed.shader_test b/tests/hlsl/texture-load-typed.shader_test similarity index 100% rename from tests/texture-load-typed.shader_test rename to tests/hlsl/texture-load-typed.shader_test diff --git a/tests/texture-load.shader_test b/tests/hlsl/texture-load.shader_test similarity index 100% rename from tests/texture-load.shader_test rename to tests/hlsl/texture-load.shader_test diff --git a/tests/hlsl-transpose.shader_test b/tests/hlsl/transpose.shader_test similarity index 100% rename from tests/hlsl-transpose.shader_test rename to tests/hlsl/transpose.shader_test diff --git a/tests/trigonometry.shader_test b/tests/hlsl/trigonometry.shader_test similarity index 100% rename from tests/trigonometry.shader_test rename to tests/hlsl/trigonometry.shader_test diff --git a/tests/hlsl-trunc.shader_test b/tests/hlsl/trunc.shader_test similarity index 100% rename from tests/hlsl-trunc.shader_test rename to tests/hlsl/trunc.shader_test diff --git a/tests/hlsl-type-names.shader_test b/tests/hlsl/type-names.shader_test similarity index 100% rename from tests/hlsl-type-names.shader_test rename to tests/hlsl/type-names.shader_test diff --git a/tests/uav-load.shader_test b/tests/hlsl/uav-load.shader_test similarity index 100% rename from tests/uav-load.shader_test rename to tests/hlsl/uav-load.shader_test diff --git a/tests/uav-out-param.shader_test b/tests/hlsl/uav-out-param.shader_test similarity index 100% rename from tests/uav-out-param.shader_test rename to tests/hlsl/uav-out-param.shader_test diff --git a/tests/uav-rwbuffer.shader_test b/tests/hlsl/uav-rwbuffer.shader_test similarity index 100% rename from tests/uav-rwbuffer.shader_test rename to tests/hlsl/uav-rwbuffer.shader_test diff --git a/tests/uav-rwstructuredbuffer.shader_test b/tests/hlsl/uav-rwstructuredbuffer.shader_test similarity index 100% rename from tests/uav-rwstructuredbuffer.shader_test rename to tests/hlsl/uav-rwstructuredbuffer.shader_test diff --git a/tests/uav-rwtexture.shader_test b/tests/hlsl/uav-rwtexture.shader_test similarity index 100% rename from tests/uav-rwtexture.shader_test rename to tests/hlsl/uav-rwtexture.shader_test diff --git a/tests/hlsl-vector-indexing-uniform.shader_test b/tests/hlsl/vector-indexing-uniform.shader_test similarity index 100% rename from tests/hlsl-vector-indexing-uniform.shader_test rename to tests/hlsl/vector-indexing-uniform.shader_test diff --git a/tests/hlsl-vector-indexing.shader_test b/tests/hlsl/vector-indexing.shader_test similarity index 100% rename from tests/hlsl-vector-indexing.shader_test rename to tests/hlsl/vector-indexing.shader_test diff --git a/tests/writemask-assignop-0.shader_test b/tests/hlsl/writemask-assignop-0.shader_test similarity index 100% rename from tests/writemask-assignop-0.shader_test rename to tests/hlsl/writemask-assignop-0.shader_test diff --git a/tests/writemask-assignop-1.shader_test b/tests/hlsl/writemask-assignop-1.shader_test similarity index 100% rename from tests/writemask-assignop-1.shader_test rename to tests/hlsl/writemask-assignop-1.shader_test diff --git a/tests/writemask-assignop-2.shader_test b/tests/hlsl/writemask-assignop-2.shader_test similarity index 100% rename from tests/writemask-assignop-2.shader_test rename to tests/hlsl/writemask-assignop-2.shader_test diff --git a/tests/writemask-assignop-3.shader_test b/tests/hlsl/writemask-assignop-3.shader_test similarity index 100% rename from tests/writemask-assignop-3.shader_test rename to tests/hlsl/writemask-assignop-3.shader_test -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/248
That's fine for me. Given that eventually I guess we'd like to use the shader runner also to test `vkd3d` itself (at least, the parts that can be described by the shader runner language, possibly with reasonable extensions), I'd even move the preprocessor tests in a dedicated directory, so that basically all shader runner tests live inside a specific subdirectory. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/248#note_36760
This merge request was approved by Giovanni Mascellani. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/248
Francisco Casas (@fcasas) commented about Makefile.am:
- tests/max.shader_test \ - tests/minimum-precision.shader_test \ - tests/multiple-rt.shader_test \ - tests/nointerpolation.shader_test \ - tests/object-field-offsets.shader_test \ - tests/object-parameters.shader_test \ - tests/object-references.shader_test \ - tests/pow.shader_test \ - tests/preproc-if.shader_test \ + tests/hlsl/abs.shader_test \ + tests/hlsl/all.shader_test \ + tests/hlsl/any.shader_test \ + tests/hlsl/arithmetic-float.shader_test \ + tests/hlsl/arithmetic-float-uniform.shader_test \ + tests/hlsl/arithmetic-int.shader_test \ + tests/hlsl/arithmetic-int-uniform.shader_test \ Note that in ASCII, `-` < `.` < `a`, so it may be a good time to properly swap these filenames.
-- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/248#note_36904
On Mon Jun 26 23:37:33 2023 +0000, Francisco Casas wrote:
Note that in ASCII, `-` < `.` < `a`, so it may be a good time to properly swap these filenames. I actually used `sort` to generate this... but I didn't think to set the locale to C first. It probably isn't worth updating at this point, though...
-- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/248#note_36905
This merge request was approved by Francisco Casas. -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/248
participants (4)
-
Francisco Casas (＠fcasas) -
Giovanni Mascellani (＠giomasce)
-
Zebediah Figura
-
Zebediah Figura (＠zfigura)