encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-16 00:17:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

tint/writer/glsl: Fix vector select

Browse Source 
mix of ivec is not core until later GLSL versions.
Just polyfill in the writer with ternary ops.

Change-Id: Ia0c35bf95842e03ef8447019f3264d01c11fd384
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/123240
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: Stephen White <senorblanco@chromium.org>
Kokoro: Ben Clayton <bclayton@google.com>
This commit is contained in:
Ben Clayton
2023-03-08 22:29:38 +00:00
committed by Dawn LUCI CQ
parent da353b4b39
commit 2657b923c9
119 changed files with 1869 additions and 635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/tint/expressions/binary/mod_by_zero/by_constant/scalar-vec3/i32.wgsl.expected.glsl
View File

@@ -1,8 +1,13 @@
#version 310 es
ivec3 tint_select(ivec3 param_0, ivec3 param_1, bvec3 param_2) {
return ivec3(param_2[0] ? param_1[0] : param_0[0], param_2[1] ? param_1[1] : param_0[1], param_2[2] ? param_1[2] : param_0[2]);
}
ivec3 tint_mod(int lhs, ivec3 rhs) {
ivec3 l = ivec3(lhs);
ivec3 rhs_or_one = mix(rhs, ivec3(1), bvec3(uvec3(equal(rhs, ivec3(0))) | uvec3(bvec3(uvec3(equal(l, ivec3((-2147483647 - 1)))) & uvec3(equal(rhs, ivec3(-1)))))));
ivec3 rhs_or_one = tint_select(rhs, ivec3(1), bvec3(uvec3(equal(rhs, ivec3(0))) | uvec3(bvec3(uvec3(equal(l, ivec3((-2147483647 - 1)))) & uvec3(equal(rhs, ivec3(-1)))))));
if (any(notEqual((uvec3((l | rhs_or_one)) & uvec3(2147483648u)), uvec3(0u)))) {
return (l - ((l / rhs_or_one) * rhs_or_one));
} else {

7
test/tint/expressions/binary/mod_by_zero/by_constant/scalar-vec3/u32.wgsl.expected.glsl
View File

@@ -1,8 +1,13 @@
#version 310 es
uvec3 tint_select(uvec3 param_0, uvec3 param_1, bvec3 param_2) {
return uvec3(param_2[0] ? param_1[0] : param_0[0], param_2[1] ? param_1[1] : param_0[1], param_2[2] ? param_1[2] : param_0[2]);
}
uvec3 tint_mod(uint lhs, uvec3 rhs) {
uvec3 l = uvec3(lhs);
return (l % mix(rhs, uvec3(1u), equal(rhs, uvec3(0u))));
return (l % tint_select(rhs, uvec3(1u), equal(rhs, uvec3(0u))));
}
void f() {

7
test/tint/expressions/binary/mod_by_zero/by_constant/vec3-scalar/i32.wgsl.expected.glsl
View File

@@ -1,8 +1,13 @@
#version 310 es
ivec3 tint_select(ivec3 param_0, ivec3 param_1, bvec3 param_2) {
return ivec3(param_2[0] ? param_1[0] : param_0[0], param_2[1] ? param_1[1] : param_0[1], param_2[2] ? param_1[2] : param_0[2]);
}
ivec3 tint_mod(ivec3 lhs, int rhs) {
ivec3 r = ivec3(rhs);
ivec3 rhs_or_one = mix(r, ivec3(1), bvec3(uvec3(equal(r, ivec3(0))) | uvec3(bvec3(uvec3(equal(lhs, ivec3((-2147483647 - 1)))) & uvec3(equal(r, ivec3(-1)))))));
ivec3 rhs_or_one = tint_select(r, ivec3(1), bvec3(uvec3(equal(r, ivec3(0))) | uvec3(bvec3(uvec3(equal(lhs, ivec3((-2147483647 - 1)))) & uvec3(equal(r, ivec3(-1)))))));
if (any(notEqual((uvec3((lhs | rhs_or_one)) & uvec3(2147483648u)), uvec3(0u)))) {
return (lhs - ((lhs / rhs_or_one) * rhs_or_one));
} else {

7
test/tint/expressions/binary/mod_by_zero/by_constant/vec3-scalar/u32.wgsl.expected.glsl
View File

@@ -1,8 +1,13 @@
#version 310 es
uvec3 tint_select(uvec3 param_0, uvec3 param_1, bvec3 param_2) {
return uvec3(param_2[0] ? param_1[0] : param_0[0], param_2[1] ? param_1[1] : param_0[1], param_2[2] ? param_1[2] : param_0[2]);
}
uvec3 tint_mod(uvec3 lhs, uint rhs) {
uvec3 r = uvec3(rhs);
return (lhs % mix(r, uvec3(1u), equal(r, uvec3(0u))));
return (lhs % tint_select(r, uvec3(1u), equal(r, uvec3(0u))));
}
void f() {

7
test/tint/expressions/binary/mod_by_zero/by_constant/vec3-vec3/i32.wgsl.expected.glsl
View File

@@ -1,7 +1,12 @@
#version 310 es
ivec3 tint_select(ivec3 param_0, ivec3 param_1, bvec3 param_2) {
return ivec3(param_2[0] ? param_1[0] : param_0[0], param_2[1] ? param_1[1] : param_0[1], param_2[2] ? param_1[2] : param_0[2]);
}
ivec3 tint_mod(ivec3 lhs, ivec3 rhs) {
ivec3 rhs_or_one = mix(rhs, ivec3(1), bvec3(uvec3(equal(rhs, ivec3(0))) | uvec3(bvec3(uvec3(equal(lhs, ivec3((-2147483647 - 1)))) & uvec3(equal(rhs, ivec3(-1)))))));
ivec3 rhs_or_one = tint_select(rhs, ivec3(1), bvec3(uvec3(equal(rhs, ivec3(0))) | uvec3(bvec3(uvec3(equal(lhs, ivec3((-2147483647 - 1)))) & uvec3(equal(rhs, ivec3(-1)))))));
if (any(notEqual((uvec3((lhs | rhs_or_one)) & uvec3(2147483648u)), uvec3(0u)))) {
return (lhs - ((lhs / rhs_or_one) * rhs_or_one));
} else {

7
test/tint/expressions/binary/mod_by_zero/by_constant/vec3-vec3/u32.wgsl.expected.glsl
View File

@@ -1,7 +1,12 @@
#version 310 es
uvec3 tint_select(uvec3 param_0, uvec3 param_1, bvec3 param_2) {
return uvec3(param_2[0] ? param_1[0] : param_0[0], param_2[1] ? param_1[1] : param_0[1], param_2[2] ? param_1[2] : param_0[2]);
}
uvec3 tint_mod(uvec3 lhs, uvec3 rhs) {
return (lhs % mix(rhs, uvec3(1u), equal(rhs, uvec3(0u))));
return (lhs % tint_select(rhs, uvec3(1u), equal(rhs, uvec3(0u))));
}
void f() {

7
test/tint/expressions/binary/mod_by_zero/by_expression/scalar-vec3/i32.wgsl.expected.glsl
View File

@@ -1,8 +1,13 @@
#version 310 es
ivec3 tint_select(ivec3 param_0, ivec3 param_1, bvec3 param_2) {
return ivec3(param_2[0] ? param_1[0] : param_0[0], param_2[1] ? param_1[1] : param_0[1], param_2[2] ? param_1[2] : param_0[2]);
}
ivec3 tint_mod(int lhs, ivec3 rhs) {
ivec3 l = ivec3(lhs);
ivec3 rhs_or_one = mix(rhs, ivec3(1), bvec3(uvec3(equal(rhs, ivec3(0))) | uvec3(bvec3(uvec3(equal(l, ivec3((-2147483647 - 1)))) & uvec3(equal(rhs, ivec3(-1)))))));
ivec3 rhs_or_one = tint_select(rhs, ivec3(1), bvec3(uvec3(equal(rhs, ivec3(0))) | uvec3(bvec3(uvec3(equal(l, ivec3((-2147483647 - 1)))) & uvec3(equal(rhs, ivec3(-1)))))));
if (any(notEqual((uvec3((l | rhs_or_one)) & uvec3(2147483648u)), uvec3(0u)))) {
return (l - ((l / rhs_or_one) * rhs_or_one));
} else {

7
test/tint/expressions/binary/mod_by_zero/by_expression/scalar-vec3/u32.wgsl.expected.glsl
View File

@@ -1,8 +1,13 @@
#version 310 es
uvec3 tint_select(uvec3 param_0, uvec3 param_1, bvec3 param_2) {
return uvec3(param_2[0] ? param_1[0] : param_0[0], param_2[1] ? param_1[1] : param_0[1], param_2[2] ? param_1[2] : param_0[2]);
}
uvec3 tint_mod(uint lhs, uvec3 rhs) {
uvec3 l = uvec3(lhs);
return (l % mix(rhs, uvec3(1u), equal(rhs, uvec3(0u))));
return (l % tint_select(rhs, uvec3(1u), equal(rhs, uvec3(0u))));
}
void f() {

7
test/tint/expressions/binary/mod_by_zero/by_expression/vec3-scalar/i32.wgsl.expected.glsl
View File

@@ -1,8 +1,13 @@
#version 310 es
ivec3 tint_select(ivec3 param_0, ivec3 param_1, bvec3 param_2) {
return ivec3(param_2[0] ? param_1[0] : param_0[0], param_2[1] ? param_1[1] : param_0[1], param_2[2] ? param_1[2] : param_0[2]);
}
ivec3 tint_mod(ivec3 lhs, int rhs) {
ivec3 r = ivec3(rhs);
ivec3 rhs_or_one = mix(r, ivec3(1), bvec3(uvec3(equal(r, ivec3(0))) | uvec3(bvec3(uvec3(equal(lhs, ivec3((-2147483647 - 1)))) & uvec3(equal(r, ivec3(-1)))))));
ivec3 rhs_or_one = tint_select(r, ivec3(1), bvec3(uvec3(equal(r, ivec3(0))) | uvec3(bvec3(uvec3(equal(lhs, ivec3((-2147483647 - 1)))) & uvec3(equal(r, ivec3(-1)))))));
if (any(notEqual((uvec3((lhs | rhs_or_one)) & uvec3(2147483648u)), uvec3(0u)))) {
return (lhs - ((lhs / rhs_or_one) * rhs_or_one));
} else {

7
test/tint/expressions/binary/mod_by_zero/by_expression/vec3-scalar/u32.wgsl.expected.glsl
View File

@@ -1,8 +1,13 @@
#version 310 es
uvec3 tint_select(uvec3 param_0, uvec3 param_1, bvec3 param_2) {
return uvec3(param_2[0] ? param_1[0] : param_0[0], param_2[1] ? param_1[1] : param_0[1], param_2[2] ? param_1[2] : param_0[2]);
}
uvec3 tint_mod(uvec3 lhs, uint rhs) {
uvec3 r = uvec3(rhs);
return (lhs % mix(r, uvec3(1u), equal(r, uvec3(0u))));
return (lhs % tint_select(r, uvec3(1u), equal(r, uvec3(0u))));
}
void f() {

7
test/tint/expressions/binary/mod_by_zero/by_expression/vec3-vec3/i32.wgsl.expected.glsl
View File

@@ -1,7 +1,12 @@
#version 310 es
ivec3 tint_select(ivec3 param_0, ivec3 param_1, bvec3 param_2) {
return ivec3(param_2[0] ? param_1[0] : param_0[0], param_2[1] ? param_1[1] : param_0[1], param_2[2] ? param_1[2] : param_0[2]);
}
ivec3 tint_mod(ivec3 lhs, ivec3 rhs) {
ivec3 rhs_or_one = mix(rhs, ivec3(1), bvec3(uvec3(equal(rhs, ivec3(0))) | uvec3(bvec3(uvec3(equal(lhs, ivec3((-2147483647 - 1)))) & uvec3(equal(rhs, ivec3(-1)))))));
ivec3 rhs_or_one = tint_select(rhs, ivec3(1), bvec3(uvec3(equal(rhs, ivec3(0))) | uvec3(bvec3(uvec3(equal(lhs, ivec3((-2147483647 - 1)))) & uvec3(equal(rhs, ivec3(-1)))))));
if (any(notEqual((uvec3((lhs | rhs_or_one)) & uvec3(2147483648u)), uvec3(0u)))) {
return (lhs - ((lhs / rhs_or_one) * rhs_or_one));
} else {

7
test/tint/expressions/binary/mod_by_zero/by_expression/vec3-vec3/u32.wgsl.expected.glsl
View File

@@ -1,7 +1,12 @@
#version 310 es
uvec3 tint_select(uvec3 param_0, uvec3 param_1, bvec3 param_2) {
return uvec3(param_2[0] ? param_1[0] : param_0[0], param_2[1] ? param_1[1] : param_0[1], param_2[2] ? param_1[2] : param_0[2]);
}
uvec3 tint_mod(uvec3 lhs, uvec3 rhs) {
return (lhs % mix(rhs, uvec3(1u), equal(rhs, uvec3(0u))));
return (lhs % tint_select(rhs, uvec3(1u), equal(rhs, uvec3(0u))));
}
void f() {

7
test/tint/expressions/binary/mod_by_zero/by_identifier/scalar-vec3/i32.wgsl.expected.glsl
View File

@@ -1,8 +1,13 @@
#version 310 es
ivec3 tint_select(ivec3 param_0, ivec3 param_1, bvec3 param_2) {
return ivec3(param_2[0] ? param_1[0] : param_0[0], param_2[1] ? param_1[1] : param_0[1], param_2[2] ? param_1[2] : param_0[2]);
}
ivec3 tint_mod(int lhs, ivec3 rhs) {
ivec3 l = ivec3(lhs);
ivec3 rhs_or_one = mix(rhs, ivec3(1), bvec3(uvec3(equal(rhs, ivec3(0))) | uvec3(bvec3(uvec3(equal(l, ivec3((-2147483647 - 1)))) & uvec3(equal(rhs, ivec3(-1)))))));
ivec3 rhs_or_one = tint_select(rhs, ivec3(1), bvec3(uvec3(equal(rhs, ivec3(0))) | uvec3(bvec3(uvec3(equal(l, ivec3((-2147483647 - 1)))) & uvec3(equal(rhs, ivec3(-1)))))));
if (any(notEqual((uvec3((l | rhs_or_one)) & uvec3(2147483648u)), uvec3(0u)))) {
return (l - ((l / rhs_or_one) * rhs_or_one));
} else {

7
test/tint/expressions/binary/mod_by_zero/by_identifier/scalar-vec3/u32.wgsl.expected.glsl
View File

@@ -1,8 +1,13 @@
#version 310 es
uvec3 tint_select(uvec3 param_0, uvec3 param_1, bvec3 param_2) {
return uvec3(param_2[0] ? param_1[0] : param_0[0], param_2[1] ? param_1[1] : param_0[1], param_2[2] ? param_1[2] : param_0[2]);
}
uvec3 tint_mod(uint lhs, uvec3 rhs) {
uvec3 l = uvec3(lhs);
return (l % mix(rhs, uvec3(1u), equal(rhs, uvec3(0u))));
return (l % tint_select(rhs, uvec3(1u), equal(rhs, uvec3(0u))));
}
void f() {

7
test/tint/expressions/binary/mod_by_zero/by_identifier/vec3-scalar/i32.wgsl.expected.glsl
View File

@@ -1,8 +1,13 @@
#version 310 es
ivec3 tint_select(ivec3 param_0, ivec3 param_1, bvec3 param_2) {
return ivec3(param_2[0] ? param_1[0] : param_0[0], param_2[1] ? param_1[1] : param_0[1], param_2[2] ? param_1[2] : param_0[2]);
}
ivec3 tint_mod(ivec3 lhs, int rhs) {
ivec3 r = ivec3(rhs);
ivec3 rhs_or_one = mix(r, ivec3(1), bvec3(uvec3(equal(r, ivec3(0))) | uvec3(bvec3(uvec3(equal(lhs, ivec3((-2147483647 - 1)))) & uvec3(equal(r, ivec3(-1)))))));
ivec3 rhs_or_one = tint_select(r, ivec3(1), bvec3(uvec3(equal(r, ivec3(0))) | uvec3(bvec3(uvec3(equal(lhs, ivec3((-2147483647 - 1)))) & uvec3(equal(r, ivec3(-1)))))));
if (any(notEqual((uvec3((lhs | rhs_or_one)) & uvec3(2147483648u)), uvec3(0u)))) {
return (lhs - ((lhs / rhs_or_one) * rhs_or_one));
} else {

7
test/tint/expressions/binary/mod_by_zero/by_identifier/vec3-scalar/u32.wgsl.expected.glsl
View File

@@ -1,8 +1,13 @@
#version 310 es
uvec3 tint_select(uvec3 param_0, uvec3 param_1, bvec3 param_2) {
return uvec3(param_2[0] ? param_1[0] : param_0[0], param_2[1] ? param_1[1] : param_0[1], param_2[2] ? param_1[2] : param_0[2]);
}
uvec3 tint_mod(uvec3 lhs, uint rhs) {
uvec3 r = uvec3(rhs);
return (lhs % mix(r, uvec3(1u), equal(r, uvec3(0u))));
return (lhs % tint_select(r, uvec3(1u), equal(r, uvec3(0u))));
}
void f() {

7
test/tint/expressions/binary/mod_by_zero/by_identifier/vec3-vec3/i32.wgsl.expected.glsl
View File

@@ -1,7 +1,12 @@
#version 310 es
ivec3 tint_select(ivec3 param_0, ivec3 param_1, bvec3 param_2) {
return ivec3(param_2[0] ? param_1[0] : param_0[0], param_2[1] ? param_1[1] : param_0[1], param_2[2] ? param_1[2] : param_0[2]);
}
ivec3 tint_mod(ivec3 lhs, ivec3 rhs) {
ivec3 rhs_or_one = mix(rhs, ivec3(1), bvec3(uvec3(equal(rhs, ivec3(0))) | uvec3(bvec3(uvec3(equal(lhs, ivec3((-2147483647 - 1)))) & uvec3(equal(rhs, ivec3(-1)))))));
ivec3 rhs_or_one = tint_select(rhs, ivec3(1), bvec3(uvec3(equal(rhs, ivec3(0))) | uvec3(bvec3(uvec3(equal(lhs, ivec3((-2147483647 - 1)))) & uvec3(equal(rhs, ivec3(-1)))))));
if (any(notEqual((uvec3((lhs | rhs_or_one)) & uvec3(2147483648u)), uvec3(0u)))) {
return (lhs - ((lhs / rhs_or_one) * rhs_or_one));
} else {

7
test/tint/expressions/binary/mod_by_zero/by_identifier/vec3-vec3/u32.wgsl.expected.glsl
View File

@@ -1,7 +1,12 @@
#version 310 es
uvec3 tint_select(uvec3 param_0, uvec3 param_1, bvec3 param_2) {
return uvec3(param_2[0] ? param_1[0] : param_0[0], param_2[1] ? param_1[1] : param_0[1], param_2[2] ? param_1[2] : param_0[2]);
}
uvec3 tint_mod(uvec3 lhs, uvec3 rhs) {
return (lhs % mix(rhs, uvec3(1u), equal(rhs, uvec3(0u))));
return (lhs % tint_select(rhs, uvec3(1u), equal(rhs, uvec3(0u))));
}
void f() {