Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Texture sample compare fix #3505

Merged
merged 1 commit into from
Mar 14, 2024
Merged

Texture sample compare fix #3505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/webgpu/shader/validation/expression/call/builtin/textureSample.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Validates that only incorrect coords arguments are rejected by ${builtin}
.beginSubcases()
.combine('value', [-1, 0, 1] as const)
// filter out unsigned types with negative values
.filter(t => isUnsignedType(kValuesTypes[t.coordType]) && t.value < 0)
.filter(t => !isUnsignedType(kValuesTypes[t.coordType]) || t.value >= 0)
.expand('offset', ({ textureType }) => {
const offset = kValidTextureSampleParameterTypes[textureType].offsetArgType;
return offset ? [false, true] : [false];
Expand Down Expand Up @@ -113,7 +113,7 @@ Validates that only incorrect array_index arguments are rejected by ${builtin}
.beginSubcases()
.combine('value', [-9, -8, 0, 7, 8])
// filter out unsigned types with negative values
.filter(t => isUnsignedType(kValuesTypes[t.arrayIndexType]) && t.value < 0)
.filter(t => !isUnsignedType(kValuesTypes[t.arrayIndexType]) || t.value >= 0)
)
.fn(t => {
const { textureType, arrayIndexType, value } = t.params;
Expand Down Expand Up @@ -153,7 +153,7 @@ Validates that only incorrect offset arguments are rejected by ${builtin}
.beginSubcases()
.combine('value', [-9, -8, 0, 7, 8])
// filter out unsigned types with negative values
.filter(t => isUnsignedType(kValuesTypes[t.offsetType]) && t.value < 0)
.filter(t => !isUnsignedType(kValuesTypes[t.offsetType]) || t.value >= 0)
)
.fn(t => {
const { textureType, offsetType, value } = t.params;
Expand Down
8 changes: 4 additions & 4 deletions src/webgpu/shader/validation/expression/call/builtin/textureSampleCompare.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Validates that only incorrect coords arguments are rejected by ${builtin}
.beginSubcases()
.combine('value', [-1, 0, 1] as const)
// filter out unsigned types with negative values
.filter(t => isUnsignedType(kValuesTypes[t.coordType]) && t.value < 0)
.filter(t => !isUnsignedType(kValuesTypes[t.coordType]) || t.value >= 0)
.expand('offset', ({ textureType }) => {
const offset = kValidTextureSampleCompareParameterTypes[textureType].offsetArgType;
return offset ? [false, true] : [false];
Expand Down Expand Up @@ -103,7 +103,7 @@ Validates that only incorrect array_index arguments are rejected by ${builtin}
.beginSubcases()
.combine('value', [-9, -8, 0, 7, 8])
// filter out unsigned types with negative values
.filter(t => isUnsignedType(kValuesTypes[t.arrayIndexType]) && t.value < 0)
.filter(t => !isUnsignedType(kValuesTypes[t.arrayIndexType]) || t.value >= 0)
)
.fn(t => {
const { textureType, arrayIndexType, value } = t.params;
Expand Down Expand Up @@ -141,7 +141,7 @@ Validates that only incorrect depth_ref arguments are rejected by ${builtin}
.beginSubcases()
.combine('value', [-1, 0, 1])
// filter out unsigned types with negative values
.filter(t => isUnsignedType(kValuesTypes[t.depthRefType]) && t.value < 0)
.filter(t => !isUnsignedType(kValuesTypes[t.depthRefType]) || t.value >= 0)
)
.fn(t => {
const { textureType, depthRefType, value } = t.params;
Expand Down Expand Up @@ -182,7 +182,7 @@ Validates that only incorrect offset arguments are rejected by ${builtin}
.beginSubcases()
.combine('value', [-9, -8, 0, 7, 8])
// filter out unsigned types with negative values
.filter(t => isUnsignedType(kValuesTypes[t.offsetType]) && t.value < 0)
.filter(t => !isUnsignedType(kValuesTypes[t.offsetType]) || t.value >= 0)
)
.fn(t => {
const { textureType, offsetType, value } = t.params;
Expand Down
Loading