commit fc441f97fc93daa7624730c646582091ec36723e
author Corentin Wallez <cwallez@chromium.org> Fri Jan 29 19:08:15 2021 +0000
committer Commit Bot service account <commit-bot@chromium.org> Fri Jan 29 19:08:15 2021 +0000
tree 7d714fa51ae2c4f88ef813f81c4963ba22cd0ae8
parent ec534448395440082072abb2c6fcdb7a0f6bcfc6

Make wgpu::BindGroupLayoutEntry extensible

Bug: dawn:22
Change-Id: Ifce24a0b19fb8d3acb6ac8ab32f3f3e22a248b3b
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/39340
Auto-Submit: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Stephen White <senorblanco@chromium.org>
Commit-Queue: Stephen White <senorblanco@chromium.org>

dawn.json

diff --git a/dawn.json b/dawn.json
index 2834a86..ec91cd2 100644
--- a/dawn.json
+++ b/dawn.json
@@ -163,7 +163,7 @@
 
     "bind group layout entry": {
         "category": "structure",
-        "extensible": false,
+        "extensible": true,
         "members": [
             {"name": "binding", "type": "uint32_t"},
             {"name": "visibility", "type": "shader stage"},

src/tests/unittests/wire/WireArgumentTests.cpp

diff --git a/src/tests/unittests/wire/WireArgumentTests.cpp b/src/tests/unittests/wire/WireArgumentTests.cpp
index f39fa20..401f9b8 100644
--- a/src/tests/unittests/wire/WireArgumentTests.cpp
+++ b/src/tests/unittests/wire/WireArgumentTests.cpp
@@ -307,7 +307,8 @@
 TEST_F(WireArgumentTests, StructureOfStructureArrayArgument) {
     static constexpr int NUM_BINDINGS = 3;
     WGPUBindGroupLayoutEntry entries[NUM_BINDINGS]{
-        {0,
+        {nullptr,
+         0,
          WGPUShaderStage_Vertex,
          WGPUBindingType_Sampler,
          false,
@@ -319,7 +320,8 @@
          {},
          {},
          {}},
-        {1,
+        {nullptr,
+         1,
          WGPUShaderStage_Vertex,
          WGPUBindingType_SampledTexture,
          false,
@@ -331,7 +333,8 @@
          {},
          {},
          {}},
-        {2,
+        {nullptr,
+         2,
          static_cast<WGPUShaderStage>(WGPUShaderStage_Vertex | WGPUShaderStage_Fragment),
          WGPUBindingType_UniformBuffer,
          false,