Skip to content

Commit

Permalink
Fixup lint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
dj2 committed Mar 7, 2024
1 parent 3243627 commit fe002ff
Show file tree
Hide file tree
Showing 6 changed files with 114 additions and 129 deletions.
216 changes: 108 additions & 108 deletions src/resources/cache/hashes.json
Original file line number Diff line number Diff line change
@@ -1,110 +1,110 @@
{
"webgpu/shader/execution/binary/af_addition.bin": "23e2f9e1",
"webgpu/shader/execution/binary/af_logical.bin": "e84f337a",
"webgpu/shader/execution/binary/af_division.bin": "76203b1d",
"webgpu/shader/execution/binary/af_matrix_addition.bin": "e0a1128",
"webgpu/shader/execution/binary/af_matrix_subtraction.bin": "7883b62a",
"webgpu/shader/execution/binary/af_multiplication.bin": "bcb150e5",
"webgpu/shader/execution/binary/af_remainder.bin": "7dbf65ef",
"webgpu/shader/execution/binary/af_subtraction.bin": "8af8a362",
"webgpu/shader/execution/binary/f16_addition.bin": "ff940913",
"webgpu/shader/execution/binary/f16_logical.bin": "4188ed03",
"webgpu/shader/execution/binary/f16_division.bin": "75899d13",
"webgpu/shader/execution/binary/f16_matrix_addition.bin": "ce6d02ab",
"webgpu/shader/execution/binary/f16_matrix_matrix_multiplication.bin": "39e76975",
"webgpu/shader/execution/binary/f16_matrix_scalar_multiplication.bin": "3557b366",
"webgpu/shader/execution/binary/f16_matrix_subtraction.bin": "f18b8599",
"webgpu/shader/execution/binary/f16_matrix_vector_multiplication.bin": "33dc8d1d",
"webgpu/shader/execution/binary/f16_multiplication.bin": "22ba4125",
"webgpu/shader/execution/binary/f16_remainder.bin": "cda64bb3",
"webgpu/shader/execution/binary/f16_subtraction.bin": "e722cdf5",
"webgpu/shader/execution/binary/f32_addition.bin": "4d1a8229",
"webgpu/shader/execution/binary/f32_logical.bin": "f801cf59",
"webgpu/shader/execution/binary/f32_division.bin": "4e0ccae3",
"webgpu/shader/execution/binary/f32_matrix_addition.bin": "36034a26",
"webgpu/shader/execution/binary/f32_matrix_matrix_multiplication.bin": "21a5ecc0",
"webgpu/shader/execution/binary/f32_matrix_scalar_multiplication.bin": "98a9c8e1",
"webgpu/shader/execution/binary/f32_matrix_subtraction.bin": "588b1402",
"webgpu/shader/execution/binary/f32_matrix_vector_multiplication.bin": "49dc3fcb",
"webgpu/shader/execution/binary/f32_multiplication.bin": "5ac7d437",
"webgpu/shader/execution/binary/f32_remainder.bin": "13331e6f",
"webgpu/shader/execution/binary/f32_subtraction.bin": "26d1e27b",
"webgpu/shader/execution/binary/i32_arithmetic.bin": "ecf35ad3",
"webgpu/shader/execution/binary/i32_comparison.bin": "e54df7f8",
"webgpu/shader/execution/binary/u32_arithmetic.bin": "6fc21ac3",
"webgpu/shader/execution/binary/u32_comparison.bin": "e223dd1",
"webgpu/shader/execution/abs.bin": "28c049ae",
"webgpu/shader/execution/acos.bin": "b34c3cc",
"webgpu/shader/execution/acosh.bin": "493def05",
"webgpu/shader/execution/asin.bin": "e6b35118",
"webgpu/shader/execution/asinh.bin": "39369a25",
"webgpu/shader/execution/atan.bin": "fc6eb09b",
"webgpu/shader/execution/atan2.bin": "a7a2391d",
"webgpu/shader/execution/atanh.bin": "61e28719",
"webgpu/shader/execution/bitcast.bin": "9d107114",
"webgpu/shader/execution/ceil.bin": "1efe8684",
"webgpu/shader/execution/clamp.bin": "23881674",
"webgpu/shader/execution/cos.bin": "71c2a183",
"webgpu/shader/execution/cosh.bin": "8e17873f",
"webgpu/shader/execution/cross.bin": "6f03cbd6",
"webgpu/shader/execution/degrees.bin": "5bd97dca",
"webgpu/shader/execution/determinant.bin": "47f38b7",
"webgpu/shader/execution/distance.bin": "1b7a33cc",
"webgpu/shader/execution/dot.bin": "e90f1ac2",
"webgpu/shader/execution/exp.bin": "c4f7e8b5",
"webgpu/shader/execution/exp2.bin": "2929878d",
"webgpu/shader/execution/faceForward.bin": "8b709d52",
"webgpu/shader/execution/floor.bin": "52ceb1ad",
"webgpu/shader/execution/fma.bin": "1f8e679",
"webgpu/shader/execution/fract.bin": "22aebe12",
"webgpu/shader/execution/frexp.bin": "987bd2bc",
"webgpu/shader/execution/inverseSqrt.bin": "fe69795b",
"webgpu/shader/execution/ldexp.bin": "1c3de6f7",
"webgpu/shader/execution/length.bin": "86a86555",
"webgpu/shader/execution/log.bin": "a4157614",
"webgpu/shader/execution/log2.bin": "c750ad41",
"webgpu/shader/execution/max.bin": "7cd9df6a",
"webgpu/shader/execution/min.bin": "79895625",
"webgpu/shader/execution/mix.bin": "a3c4debe",
"webgpu/shader/execution/modf.bin": "6b05b025",
"webgpu/shader/execution/normalize.bin": "b8357341",
"webgpu/shader/execution/pack2x16float.bin": "5de4b8d6",
"webgpu/shader/execution/pow.bin": "de98e972",
"webgpu/shader/execution/quantizeToF16.bin": "b2c46ba1",
"webgpu/shader/execution/radians.bin": "3de020c5",
"webgpu/shader/execution/reflect.bin": "ca2bf350",
"webgpu/shader/execution/refract.bin": "28d6da33",
"webgpu/shader/execution/round.bin": "6402bc26",
"webgpu/shader/execution/saturate.bin": "6ca098b0",
"webgpu/shader/execution/sign.bin": "482b1f2",
"webgpu/shader/execution/sin.bin": "2e470390",
"webgpu/shader/execution/sinh.bin": "6b9996",
"webgpu/shader/execution/smoothstep.bin": "3857ac18",
"webgpu/shader/execution/sqrt.bin": "bd081538",
"webgpu/shader/execution/step.bin": "d43561cb",
"webgpu/shader/execution/tan.bin": "c54fc5e",
"webgpu/shader/execution/tanh.bin": "db2624e3",
"webgpu/shader/execution/transpose.bin": "8e7793d8",
"webgpu/shader/execution/trunc.bin": "d1b21e5b",
"webgpu/shader/execution/unpack2x16float.bin": "683bd447",
"webgpu/shader/execution/unpack2x16snorm.bin": "21b73b05",
"webgpu/shader/execution/unpack2x16unorm.bin": "2af8ed68",
"webgpu/shader/execution/unpack4x8snorm.bin": "59de783b",
"webgpu/shader/execution/unpack4x8unorm.bin": "4a82a5b8",
"webgpu/shader/execution/unary/af_arithmetic.bin": "42a6f0e6",
"webgpu/shader/execution/unary/af_assignment.bin": "d08aff9d",
"webgpu/shader/execution/unary/bool_conversion.bin": "f79c4b55",
"webgpu/shader/execution/unary/f16_arithmetic.bin": "28dff3c4",
"webgpu/shader/execution/unary/f16_conversion.bin": "434d97cb",
"webgpu/shader/execution/unary/f32_arithmetic.bin": "61fdb8a9",
"webgpu/shader/execution/unary/f32_conversion.bin": "76d63547",
"webgpu/shader/execution/unary/i32_arithmetic.bin": "62d7d7e7",
"webgpu/shader/execution/unary/i32_conversion.bin": "31ec5939",
"webgpu/shader/execution/unary/u32_conversion.bin": "346283fb",
"webgpu/shader/execution/unary/ai_assignment.bin": "9a0ed9b8",
"webgpu/shader/execution/binary/ai_arithmetic.bin": "5a91b506",
"webgpu/shader/execution/unary/ai_arithmetic.bin": "b26c558",
"webgpu/shader/execution/binary/af_matrix_matrix_multiplication.bin": "cc53f01b",
"webgpu/shader/execution/binary/af_matrix_scalar_multiplication.bin": "b500b708",
"webgpu/shader/execution/binary/af_matrix_vector_multiplication.bin": "f7acda10"
"webgpu/shader/execution/binary/af_addition.bin": "516066f9",
"webgpu/shader/execution/binary/af_logical.bin": "7c692356",
"webgpu/shader/execution/binary/af_division.bin": "3bfc7f8b",
"webgpu/shader/execution/binary/af_matrix_addition.bin": "e3129a38",
"webgpu/shader/execution/binary/af_matrix_subtraction.bin": "af893216",
"webgpu/shader/execution/binary/af_multiplication.bin": "96d0f49c",
"webgpu/shader/execution/binary/af_remainder.bin": "54a0adc2",
"webgpu/shader/execution/binary/af_subtraction.bin": "bea0895f",
"webgpu/shader/execution/binary/f16_addition.bin": "4e9b72fd",
"webgpu/shader/execution/binary/f16_logical.bin": "8b28d594",
"webgpu/shader/execution/binary/f16_division.bin": "e5d59724",
"webgpu/shader/execution/binary/f16_matrix_addition.bin": "b7a36a53",
"webgpu/shader/execution/binary/f16_matrix_matrix_multiplication.bin": "5d1bc65",
"webgpu/shader/execution/binary/f16_matrix_scalar_multiplication.bin": "f73b41c5",
"webgpu/shader/execution/binary/f16_matrix_subtraction.bin": "9a1f5774",
"webgpu/shader/execution/binary/f16_matrix_vector_multiplication.bin": "f303c304",
"webgpu/shader/execution/binary/f16_multiplication.bin": "777a0ddc",
"webgpu/shader/execution/binary/f16_remainder.bin": "cd013cdb",
"webgpu/shader/execution/binary/f16_subtraction.bin": "eb5b3c3c",
"webgpu/shader/execution/binary/f32_addition.bin": "46bd80fd",
"webgpu/shader/execution/binary/f32_logical.bin": "c35399af",
"webgpu/shader/execution/binary/f32_division.bin": "4d13e1",
"webgpu/shader/execution/binary/f32_matrix_addition.bin": "b2b1a69b",
"webgpu/shader/execution/binary/f32_matrix_matrix_multiplication.bin": "93e09102",
"webgpu/shader/execution/binary/f32_matrix_scalar_multiplication.bin": "14232a9e",
"webgpu/shader/execution/binary/f32_matrix_subtraction.bin": "c8d0f067",
"webgpu/shader/execution/binary/f32_matrix_vector_multiplication.bin": "1986831d",
"webgpu/shader/execution/binary/f32_multiplication.bin": "a38b73c1",
"webgpu/shader/execution/binary/f32_remainder.bin": "23a2f6bd",
"webgpu/shader/execution/binary/f32_subtraction.bin": "8244c7cf",
"webgpu/shader/execution/binary/i32_arithmetic.bin": "b2d8832f",
"webgpu/shader/execution/binary/i32_comparison.bin": "3972dc87",
"webgpu/shader/execution/binary/u32_arithmetic.bin": "1b419d37",
"webgpu/shader/execution/binary/u32_comparison.bin": "e5bc3571",
"webgpu/shader/execution/abs.bin": "fe3d1b03",
"webgpu/shader/execution/acos.bin": "dd0a26fc",
"webgpu/shader/execution/acosh.bin": "8a6bf39a",
"webgpu/shader/execution/asin.bin": "6bb4a6aa",
"webgpu/shader/execution/asinh.bin": "25cac662",
"webgpu/shader/execution/atan.bin": "b261eaaa",
"webgpu/shader/execution/atan2.bin": "51e3a4b7",
"webgpu/shader/execution/atanh.bin": "d652f89",
"webgpu/shader/execution/bitcast.bin": "5f3206f3",
"webgpu/shader/execution/ceil.bin": "16cfff81",
"webgpu/shader/execution/clamp.bin": "4f490b6e",
"webgpu/shader/execution/cos.bin": "428403b",
"webgpu/shader/execution/cosh.bin": "5413a187",
"webgpu/shader/execution/cross.bin": "9e8244b2",
"webgpu/shader/execution/degrees.bin": "bf5b6612",
"webgpu/shader/execution/determinant.bin": "9f97a757",
"webgpu/shader/execution/distance.bin": "fc22729a",
"webgpu/shader/execution/dot.bin": "1dfbc8a3",
"webgpu/shader/execution/exp.bin": "d585ac32",
"webgpu/shader/execution/exp2.bin": "b23bcc9f",
"webgpu/shader/execution/faceForward.bin": "3e686d72",
"webgpu/shader/execution/floor.bin": "e797e1a3",
"webgpu/shader/execution/fma.bin": "ff6b79ba",
"webgpu/shader/execution/fract.bin": "b9a5446c",
"webgpu/shader/execution/frexp.bin": "5e324e48",
"webgpu/shader/execution/inverseSqrt.bin": "880ae2a7",
"webgpu/shader/execution/ldexp.bin": "15c2420",
"webgpu/shader/execution/length.bin": "613abe37",
"webgpu/shader/execution/log.bin": "5c15d2a6",
"webgpu/shader/execution/log2.bin": "1423913",
"webgpu/shader/execution/max.bin": "4176ac25",
"webgpu/shader/execution/min.bin": "1e8ec04a",
"webgpu/shader/execution/mix.bin": "5820126a",
"webgpu/shader/execution/modf.bin": "822bf046",
"webgpu/shader/execution/normalize.bin": "a42d2fbd",
"webgpu/shader/execution/pack2x16float.bin": "c1da84f6",
"webgpu/shader/execution/pow.bin": "4787b96",
"webgpu/shader/execution/quantizeToF16.bin": "f48a30de",
"webgpu/shader/execution/radians.bin": "f941eb0d",
"webgpu/shader/execution/reflect.bin": "bacaff64",
"webgpu/shader/execution/refract.bin": "ec2a67b2",
"webgpu/shader/execution/round.bin": "e1b0155b",
"webgpu/shader/execution/saturate.bin": "cdb112e3",
"webgpu/shader/execution/sign.bin": "99ed0aff",
"webgpu/shader/execution/sin.bin": "e52ec582",
"webgpu/shader/execution/sinh.bin": "79301120",
"webgpu/shader/execution/smoothstep.bin": "28915f3a",
"webgpu/shader/execution/sqrt.bin": "8cd2d9f1",
"webgpu/shader/execution/step.bin": "a66ef223",
"webgpu/shader/execution/tan.bin": "3e2a12c7",
"webgpu/shader/execution/tanh.bin": "f1101036",
"webgpu/shader/execution/transpose.bin": "f4cd8415",
"webgpu/shader/execution/trunc.bin": "e4452afd",
"webgpu/shader/execution/unpack2x16float.bin": "31a0a9d5",
"webgpu/shader/execution/unpack2x16snorm.bin": "a523a975",
"webgpu/shader/execution/unpack2x16unorm.bin": "aa94ca2",
"webgpu/shader/execution/unpack4x8snorm.bin": "2c22b53c",
"webgpu/shader/execution/unpack4x8unorm.bin": "fc0515a5",
"webgpu/shader/execution/unary/af_arithmetic.bin": "1049d049",
"webgpu/shader/execution/unary/af_assignment.bin": "cfd8d132",
"webgpu/shader/execution/unary/bool_conversion.bin": "2e75631a",
"webgpu/shader/execution/unary/f16_arithmetic.bin": "df31475d",
"webgpu/shader/execution/unary/f16_conversion.bin": "74819aa5",
"webgpu/shader/execution/unary/f32_arithmetic.bin": "a0489148",
"webgpu/shader/execution/unary/f32_conversion.bin": "9f7fa562",
"webgpu/shader/execution/unary/i32_arithmetic.bin": "17afc991",
"webgpu/shader/execution/unary/i32_conversion.bin": "634e7ee5",
"webgpu/shader/execution/unary/u32_conversion.bin": "7bc7e429",
"webgpu/shader/execution/unary/ai_assignment.bin": "5c9f7f97",
"webgpu/shader/execution/binary/ai_arithmetic.bin": "6ad7f4c1",
"webgpu/shader/execution/unary/ai_arithmetic.bin": "55ebd430",
"webgpu/shader/execution/binary/af_matrix_matrix_multiplication.bin": "d25a7f84",
"webgpu/shader/execution/binary/af_matrix_scalar_multiplication.bin": "665be210",
"webgpu/shader/execution/binary/af_matrix_vector_multiplication.bin": "3e03af33"
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { keysOf, objectsToRecord } from '../../../../../../common/util/data_tabl
import {
TypeF16,
elementType,
kAllFloatScalars,
kAllFloatScalarsAndVectors,
kAllConcreteIntegerScalarsAndVectors,
} from '../../../../../util/conversion.js';
Expand All @@ -25,7 +24,7 @@ export const g = makeTestGroup(ShaderValidationTest);

const kValuesTypes = objectsToRecord([
...kAllFloatScalarsAndVectors,
...kAllConcreteIntegerScalarsAndVectors
...kAllConcreteIntegerScalarsAndVectors,
]);

g.test('values')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
TypeAbstractFloat,
elementType,
kAllConcreteIntegerScalarsAndVectors,
kAllFloatScalarsAndVectors,
kConvertableToFloatScalarsAndVec,
} from '../../../../../util/conversion.js';
import { isRepresentable } from '../../../../../util/floating_point.js';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
TypeAbstractFloat,
elementType,
kAllConcreteIntegerScalarsAndVectors,
kAllFloatScalarsAndVectors,
kConvertableToFloatScalarsAndVec,
} from '../../../../../util/conversion.js';
import { isRepresentable } from '../../../../../util/floating_point.js';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const g = makeTestGroup(ShaderValidationTest);

const kValuesTypes = objectsToRecord([
...kAllFloatScalarsAndVectors,
...kAllSignedIntegerScalarsAndVectors
...kAllSignedIntegerScalarsAndVectors,
]);

g.test('values')
Expand Down
20 changes: 4 additions & 16 deletions src/webgpu/util/conversion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1726,28 +1726,16 @@ export const kAllUnsignedIntegerScalarsAndVectors = [
] as const;

/// All types which are convertable to floating-point scalar types.
export const kConvertableToFloatScalar = [
TypeAbstractInt,
...kAllFloatScalars,
] as const;
export const kConvertableToFloatScalar = [TypeAbstractInt, ...kAllFloatScalars] as const;

/// All types which are convertable to floating-point vector 2 types.
export const kConvertableToFloatVec2 = [
TypeVec(2, TypeAbstractInt),
...kAllFloatVector2,
] as const;
export const kConvertableToFloatVec2 = [TypeVec(2, TypeAbstractInt), ...kAllFloatVector2] as const;

/// All types which are convertable to floating-point vector 3 types.
export const kConvertableToFloatVec3 = [
TypeVec(3, TypeAbstractInt),
...kAllFloatVector3,
] as const;
export const kConvertableToFloatVec3 = [TypeVec(3, TypeAbstractInt), ...kAllFloatVector3] as const;

/// All types which are convertable to floating-point vector 4 types.
export const kConvertableToFloatVec4 = [
TypeVec(4, TypeAbstractInt),
...kAllFloatVector4,
] as const;
export const kConvertableToFloatVec4 = [TypeVec(4, TypeAbstractInt), ...kAllFloatVector4] as const;

/// All types which are convertable to floating-point scalar or vector types.
export const kConvertableToFloatScalarsAndVec = [
Expand Down

0 comments on commit fe002ff

Please sign in to comment.