encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
dawn-cmake/test/tint/array/assign_to_storage_var.wgsl....

62 lines
1.8 KiB
Plaintext
Raw Normal View History

GLSL samples: add empty entry point if needed. If a WGSL test contains no entry points, add an empty one. In that case, do not pass its name to the generator, so we generate code for all functions, so they aren't culled for reachability. Add new test results for formerly empty tests. Bug: tint:1376 Change-Id: Ibf371b943fb273d44712dfcc9dc1b7bb4ab071db Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/76540 Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-01-21 18:40:18 +00:00
#version 310 es
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
void unused_entry_point() {
return;
}
struct S {
ivec4 arr[4];
};
GLSL: clean up GLSL output whitespace generation. More line() and less std::endl. More automated indents and less manual spacing. Put a single newline after every struct and function declaration. Note that this does touch every test result, but only affects whitespace. Change-Id: I7506b9029b79b91fb335911dba44369b36f09bbe Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/78300 Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-01-26 16:48:55 +00:00
Tint/transform: make AddBlockAttribute always do wrapping if possible This CL make transform AddBlockAttribute always try to wrap types used by buffer variables into a struct, in order to generate valid GLSL code for assigning one buffer struct variable to another buffer struct variable. Fixed: tint:1735 Change-Id: I009d8a9ca7ecea1dc0ad6164275c964a18acb33f Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/108023 Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Zhaoming Jiang <zhaoming.jiang@intel.com>
2022-11-02 02:25:38 +00:00
struct S_nested {
int arr[4][3][2];
};
GLSL samples: add empty entry point if needed. If a WGSL test contains no entry points, add an empty one. In that case, do not pass its name to the generator, so we generate code for all functions, so they aren't culled for reachability. Add new test results for formerly empty tests. Bug: tint:1376 Change-Id: Ibf371b943fb273d44712dfcc9dc1b7bb4ab071db Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/76540 Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-01-21 18:40:18 +00:00
ivec4 src_private[4] = ivec4[4](ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0));
shared ivec4 src_workgroup[4];
GLSL: implement host-visible memory padding. Since GLSL ES does not support the offset= attribute, struct members with explicit @align or @size attributes require adding explicit padding members. This in turn requires rewriting any constructor calls to initialize the new padding to zero, handled in the same transform. Note that this is currently overly-verbose, and will add padding where GLSL doesn't technically need it (e.g., padding a vec3 out to 16 bytes). Bug: tint:1415 Change-Id: Ia9ba513066a0e84f4c43247fcbbe02f5fadd6630 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/101720 Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org> Kokoro: Kokoro <noreply+kokoro@google.com>
2022-09-13 19:48:51 +00:00
layout(binding = 0, std140) uniform src_uniform_block_ubo {
GLSL: Change Add[Spirv]BlockAttribute to support GLSL Modify the AddSpirvBlockAttribute transform to fix top-level structure access of uniform, storage and push-constant buffers for use in the GLSL backend. The small change to the transform makes the transform wrap host-sharable buffers, if they're also used as a non-host-sharable structure. Also rename the transform to AddBlockAttrbibute in order to reflect its wider applicability. Change-Id: Ib2bf4ebf6bce72790791dbae9387032be765e4b9 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/101061 Reviewed-by: Ben Clayton <bclayton@google.com> Kokoro: Kokoro <noreply+kokoro@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-09-02 19:19:10 +00:00
S inner;
GLSL samples: add empty entry point if needed. If a WGSL test contains no entry points, add an empty one. In that case, do not pass its name to the generator, so we generate code for all functions, so they aren't culled for reachability. Add new test results for formerly empty tests. Bug: tint:1376 Change-Id: Ibf371b943fb273d44712dfcc9dc1b7bb4ab071db Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/76540 Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-01-21 18:40:18 +00:00
} src_uniform;
GLSL: clean up GLSL output whitespace generation. More line() and less std::endl. More automated indents and less manual spacing. Put a single newline after every struct and function declaration. Note that this does touch every test result, but only affects whitespace. Change-Id: I7506b9029b79b91fb335911dba44369b36f09bbe Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/78300 Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-01-26 16:48:55 +00:00
GLSL: Change Add[Spirv]BlockAttribute to support GLSL Modify the AddSpirvBlockAttribute transform to fix top-level structure access of uniform, storage and push-constant buffers for use in the GLSL backend. The small change to the transform makes the transform wrap host-sharable buffers, if they're also used as a non-host-sharable structure. Also rename the transform to AddBlockAttrbibute in order to reflect its wider applicability. Change-Id: Ib2bf4ebf6bce72790791dbae9387032be765e4b9 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/101061 Reviewed-by: Ben Clayton <bclayton@google.com> Kokoro: Kokoro <noreply+kokoro@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-09-02 19:19:10 +00:00
layout(binding = 1, std430) buffer src_uniform_block_ssbo {
S inner;
GLSL samples: add empty entry point if needed. If a WGSL test contains no entry points, add an empty one. In that case, do not pass its name to the generator, so we generate code for all functions, so they aren't culled for reachability. Add new test results for formerly empty tests. Bug: tint:1376 Change-Id: Ibf371b943fb273d44712dfcc9dc1b7bb4ab071db Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/76540 Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-01-21 18:40:18 +00:00
} src_storage;
GLSL: Change Add[Spirv]BlockAttribute to support GLSL Modify the AddSpirvBlockAttribute transform to fix top-level structure access of uniform, storage and push-constant buffers for use in the GLSL backend. The small change to the transform makes the transform wrap host-sharable buffers, if they're also used as a non-host-sharable structure. Also rename the transform to AddBlockAttrbibute in order to reflect its wider applicability. Change-Id: Ib2bf4ebf6bce72790791dbae9387032be765e4b9 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/101061 Reviewed-by: Ben Clayton <bclayton@google.com> Kokoro: Kokoro <noreply+kokoro@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-09-02 19:19:10 +00:00
layout(binding = 2, std430) buffer src_uniform_block_ssbo_1 {
S inner;
GLSL samples: add empty entry point if needed. If a WGSL test contains no entry points, add an empty one. In that case, do not pass its name to the generator, so we generate code for all functions, so they aren't culled for reachability. Add new test results for formerly empty tests. Bug: tint:1376 Change-Id: Ibf371b943fb273d44712dfcc9dc1b7bb4ab071db Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/76540 Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-01-21 18:40:18 +00:00
} dst;
GLSL: Change Add[Spirv]BlockAttribute to support GLSL Modify the AddSpirvBlockAttribute transform to fix top-level structure access of uniform, storage and push-constant buffers for use in the GLSL backend. The small change to the transform makes the transform wrap host-sharable buffers, if they're also used as a non-host-sharable structure. Also rename the transform to AddBlockAttrbibute in order to reflect its wider applicability. Change-Id: Ib2bf4ebf6bce72790791dbae9387032be765e4b9 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/101061 Reviewed-by: Ben Clayton <bclayton@google.com> Kokoro: Kokoro <noreply+kokoro@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-09-02 19:19:10 +00:00
Tint/transform: make AddBlockAttribute always do wrapping if possible This CL make transform AddBlockAttribute always try to wrap types used by buffer variables into a struct, in order to generate valid GLSL code for assigning one buffer struct variable to another buffer struct variable. Fixed: tint:1735 Change-Id: I009d8a9ca7ecea1dc0ad6164275c964a18acb33f Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/108023 Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Zhaoming Jiang <zhaoming.jiang@intel.com>
2022-11-02 02:25:38 +00:00
layout(binding = 3, std430) buffer dst_nested_block_ssbo {
S_nested inner;
GLSL samples: add empty entry point if needed. If a WGSL test contains no entry points, add an empty one. In that case, do not pass its name to the generator, so we generate code for all functions, so they aren't culled for reachability. Add new test results for formerly empty tests. Bug: tint:1376 Change-Id: Ibf371b943fb273d44712dfcc9dc1b7bb4ab071db Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/76540 Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-01-21 18:40:18 +00:00
} dst_nested;
GLSL: Change Add[Spirv]BlockAttribute to support GLSL Modify the AddSpirvBlockAttribute transform to fix top-level structure access of uniform, storage and push-constant buffers for use in the GLSL backend. The small change to the transform makes the transform wrap host-sharable buffers, if they're also used as a non-host-sharable structure. Also rename the transform to AddBlockAttrbibute in order to reflect its wider applicability. Change-Id: Ib2bf4ebf6bce72790791dbae9387032be765e4b9 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/101061 Reviewed-by: Ben Clayton <bclayton@google.com> Kokoro: Kokoro <noreply+kokoro@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-09-02 19:19:10 +00:00
GLSL samples: add empty entry point if needed. If a WGSL test contains no entry points, add an empty one. In that case, do not pass its name to the generator, so we generate code for all functions, so they aren't culled for reachability. Add new test results for formerly empty tests. Bug: tint:1376 Change-Id: Ibf371b943fb273d44712dfcc9dc1b7bb4ab071db Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/76540 Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-01-21 18:40:18 +00:00
ivec4[4] ret_arr() {
tint: Flip evaluation order of assignment statements Evaluate the LHS before the RHS. Fixed: tint:1867 Change-Id: Ib63903ed4b1425007197a6da37f3bf54a495d88a Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/123120 Commit-Queue: Ben Clayton <bclayton@chromium.org> Commit-Queue: Ben Clayton <bclayton@google.com> Reviewed-by: James Price <jrprice@google.com> Kokoro: Kokoro <noreply+kokoro@google.com>
2023-03-08 21:48:45 +00:00
ivec4 tint_symbol_1[4] = ivec4[4](ivec4(0), ivec4(0), ivec4(0), ivec4(0));
return tint_symbol_1;
GLSL samples: add empty entry point if needed. If a WGSL test contains no entry points, add an empty one. In that case, do not pass its name to the generator, so we generate code for all functions, so they aren't culled for reachability. Add new test results for formerly empty tests. Bug: tint:1376 Change-Id: Ibf371b943fb273d44712dfcc9dc1b7bb4ab071db Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/76540 Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-01-21 18:40:18 +00:00
}
S ret_struct_arr() {
tint: Flip evaluation order of assignment statements Evaluate the LHS before the RHS. Fixed: tint:1867 Change-Id: Ib63903ed4b1425007197a6da37f3bf54a495d88a Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/123120 Commit-Queue: Ben Clayton <bclayton@chromium.org> Commit-Queue: Ben Clayton <bclayton@google.com> Reviewed-by: James Price <jrprice@google.com> Kokoro: Kokoro <noreply+kokoro@google.com>
2023-03-08 21:48:45 +00:00
S tint_symbol_2 = S(ivec4[4](ivec4(0), ivec4(0), ivec4(0), ivec4(0)));
return tint_symbol_2;
GLSL samples: add empty entry point if needed. If a WGSL test contains no entry points, add an empty one. In that case, do not pass its name to the generator, so we generate code for all functions, so they aren't culled for reachability. Add new test results for formerly empty tests. Bug: tint:1376 Change-Id: Ibf371b943fb273d44712dfcc9dc1b7bb4ab071db Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/76540 Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-01-21 18:40:18 +00:00
}
void foo(ivec4 src_param[4]) {
ivec4 src_function[4] = ivec4[4](ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0));
tint: Flip evaluation order of assignment statements Evaluate the LHS before the RHS. Fixed: tint:1867 Change-Id: Ib63903ed4b1425007197a6da37f3bf54a495d88a Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/123120 Commit-Queue: Ben Clayton <bclayton@chromium.org> Commit-Queue: Ben Clayton <bclayton@google.com> Reviewed-by: James Price <jrprice@google.com> Kokoro: Kokoro <noreply+kokoro@google.com>
2023-03-08 21:48:45 +00:00
ivec4 tint_symbol_3[4] = ivec4[4](ivec4(1), ivec4(2), ivec4(3), ivec4(3));
dst.inner.arr = tint_symbol_3;
GLSL: Change Add[Spirv]BlockAttribute to support GLSL Modify the AddSpirvBlockAttribute transform to fix top-level structure access of uniform, storage and push-constant buffers for use in the GLSL backend. The small change to the transform makes the transform wrap host-sharable buffers, if they're also used as a non-host-sharable structure. Also rename the transform to AddBlockAttrbibute in order to reflect its wider applicability. Change-Id: Ib2bf4ebf6bce72790791dbae9387032be765e4b9 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/101061 Reviewed-by: Ben Clayton <bclayton@google.com> Kokoro: Kokoro <noreply+kokoro@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-09-02 19:19:10 +00:00
dst.inner.arr = src_param;
tint: Flip evaluation order of assignment statements Evaluate the LHS before the RHS. Fixed: tint:1867 Change-Id: Ib63903ed4b1425007197a6da37f3bf54a495d88a Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/123120 Commit-Queue: Ben Clayton <bclayton@chromium.org> Commit-Queue: Ben Clayton <bclayton@google.com> Reviewed-by: James Price <jrprice@google.com> Kokoro: Kokoro <noreply+kokoro@google.com>
2023-03-08 21:48:45 +00:00
dst.inner.arr = ret_arr();
tint/writer: Handle and emit 'const' variables Bug: tint:1580 Change-Id: Ib3a5ff5c567e19eca1ba8fb3c2f7e83dee68e2a0 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/94686 Kokoro: Kokoro <noreply+kokoro@google.com> Commit-Queue: Ben Clayton <bclayton@google.com> Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
2022-06-28 12:44:16 +00:00
ivec4 src_let[4] = ivec4[4](ivec4(0), ivec4(0), ivec4(0), ivec4(0));
GLSL: Change Add[Spirv]BlockAttribute to support GLSL Modify the AddSpirvBlockAttribute transform to fix top-level structure access of uniform, storage and push-constant buffers for use in the GLSL backend. The small change to the transform makes the transform wrap host-sharable buffers, if they're also used as a non-host-sharable structure. Also rename the transform to AddBlockAttrbibute in order to reflect its wider applicability. Change-Id: Ib2bf4ebf6bce72790791dbae9387032be765e4b9 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/101061 Reviewed-by: Ben Clayton <bclayton@google.com> Kokoro: Kokoro <noreply+kokoro@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-09-02 19:19:10 +00:00
dst.inner.arr = src_let;
dst.inner.arr = src_function;
dst.inner.arr = src_private;
dst.inner.arr = src_workgroup;
tint: Flip evaluation order of assignment statements Evaluate the LHS before the RHS. Fixed: tint:1867 Change-Id: Ib63903ed4b1425007197a6da37f3bf54a495d88a Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/123120 Commit-Queue: Ben Clayton <bclayton@chromium.org> Commit-Queue: Ben Clayton <bclayton@google.com> Reviewed-by: James Price <jrprice@google.com> Kokoro: Kokoro <noreply+kokoro@google.com>
2023-03-08 21:48:45 +00:00
S tint_symbol = ret_struct_arr();
dst.inner.arr = tint_symbol.arr;
GLSL: Change Add[Spirv]BlockAttribute to support GLSL Modify the AddSpirvBlockAttribute transform to fix top-level structure access of uniform, storage and push-constant buffers for use in the GLSL backend. The small change to the transform makes the transform wrap host-sharable buffers, if they're also used as a non-host-sharable structure. Also rename the transform to AddBlockAttrbibute in order to reflect its wider applicability. Change-Id: Ib2bf4ebf6bce72790791dbae9387032be765e4b9 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/101061 Reviewed-by: Ben Clayton <bclayton@google.com> Kokoro: Kokoro <noreply+kokoro@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-09-02 19:19:10 +00:00
dst.inner.arr = src_uniform.inner.arr;
dst.inner.arr = src_storage.inner.arr;
GLSL samples: add empty entry point if needed. If a WGSL test contains no entry points, add an empty one. In that case, do not pass its name to the generator, so we generate code for all functions, so they aren't culled for reachability. Add new test results for formerly empty tests. Bug: tint:1376 Change-Id: Ibf371b943fb273d44712dfcc9dc1b7bb4ab071db Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/76540 Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-01-21 18:40:18 +00:00
int src_nested[4][3][2] = int[4][3][2](int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)), int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)), int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)), int[3][2](int[2](0, 0), int[2](0, 0), int[2](0, 0)));
Tint/transform: make AddBlockAttribute always do wrapping if possible This CL make transform AddBlockAttribute always try to wrap types used by buffer variables into a struct, in order to generate valid GLSL code for assigning one buffer struct variable to another buffer struct variable. Fixed: tint:1735 Change-Id: I009d8a9ca7ecea1dc0ad6164275c964a18acb33f Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/108023 Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Zhaoming Jiang <zhaoming.jiang@intel.com>
2022-11-02 02:25:38 +00:00
dst_nested.inner.arr = src_nested;
GLSL samples: add empty entry point if needed. If a WGSL test contains no entry points, add an empty one. In that case, do not pass its name to the generator, so we generate code for all functions, so they aren't culled for reachability. Add new test results for formerly empty tests. Bug: tint:1376 Change-Id: Ibf371b943fb273d44712dfcc9dc1b7bb4ab071db Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/76540 Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-01-21 18:40:18 +00:00
}
GLSL: clean up GLSL output whitespace generation. More line() and less std::endl. More automated indents and less manual spacing. Put a single newline after every struct and function declaration. Note that this does touch every test result, but only affects whitespace. Change-Id: I7506b9029b79b91fb335911dba44369b36f09bbe Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/78300 Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Stephen White <senorblanco@chromium.org>
2022-01-26 16:48:55 +00:00