commit 05d8b02b0f49d46054105f21e388633562c201f7
author Stephen White <senorblanco@chromium.org> Tue Sep 13 19:48:51 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Sep 13 19:48:51 2022 +0000
tree 40b862411a3d54d580d076a821aadcd34a815eb7
parent 26ffcd17687ff59abccf3822aa0afb344c34e9b9

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>

test/tint/benchmark/particles.wgsl.expected.glsl

diff --git a/test/tint/benchmark/particles.wgsl.expected.glsl b/test/tint/benchmark/particles.wgsl.expected.glsl
index 4f82c9e..b0a08c1 100644
--- a/test/tint/benchmark/particles.wgsl.expected.glsl
+++ b/test/tint/benchmark/particles.wgsl.expected.glsl
@@ -7,10 +7,12 @@
 layout(location = 2) in vec2 quad_pos_1;
 layout(location = 0) out vec4 color_2;
 layout(location = 1) out vec2 quad_pos_2;
-layout(binding = 0) uniform RenderParams_ubo {
+layout(binding = 0, std140) uniform RenderParams_ubo {
   mat4 modelViewProjectionMatrix;
   vec3 right;
+  uint pad;
   vec3 up;
+  uint pad_1;
 } render_params;
 
 struct VertexInput {
@@ -146,10 +148,14 @@
   float lifetime;
   vec4 color;
   vec3 velocity;
+  uint pad_3;
 };
 
-layout(binding = 0) uniform SimulationParams_ubo {
+layout(binding = 0, std140) uniform SimulationParams_ubo {
   float deltaTime;
+  uint pad;
+  uint pad_1;
+  uint pad_2;
   vec4 seed;
 } sim_params;
 
@@ -204,8 +210,8 @@
   return;
 }
 Error parsing GLSL shader:
-ERROR: 0:60: 'textureQueryLevels' : no matching overloaded function found
-ERROR: 0:60: '' : compilation terminated
+ERROR: 0:64: 'textureQueryLevels' : no matching overloaded function found
+ERROR: 0:64: '' : compilation terminated
 ERROR: 2 compilation errors.  No code generated.
 
 
@@ -242,8 +248,11 @@
   vec3 velocity;
 };
 
-layout(binding = 3) uniform UBO_ubo {
+layout(binding = 3, std140) uniform UBO_ubo {
   uint width;
+  uint pad;
+  uint pad_1;
+  uint pad_2;
 } ubo;
 
 layout(binding = 4, std430) buffer Buffer_ssbo {
@@ -297,8 +306,11 @@
   vec3 velocity;
 };
 
-layout(binding = 3) uniform UBO_ubo {
+layout(binding = 3, std140) uniform UBO_ubo {
   uint width;
+  uint pad;
+  uint pad_1;
+  uint pad_2;
 } ubo;
 
 layout(binding = 4, std430) buffer Buffer_ssbo {