commit 9ca9435087e06b6825c9d78413797e8b2094c411
author Corentin Wallez <cwallez@chromium.org> Mon Dec 03 09:58:09 2018 +0000
committer Commit Bot service account <commit-bot@chromium.org> Mon Dec 03 09:58:09 2018 +0000
tree ea5ed10ffdbf37343c77d5064a8ab2233fc2cd18
parent 8b07e43dadf8cf49fa0aafe3343748b4ec079160

Rename BindGroupBinding -> BindGroupLayoutBinding

This makes the name match WebGPU's IDL

BUG=dawn:3

Change-Id: I1338fa07580ba8c0f6700b7765fb7389018a4126
Reviewed-on: https://dawn-review.googlesource.com/c/2801
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

dawn.json

diff --git a/dawn.json b/dawn.json
index 0437b81..b43a7fe 100644
--- a/dawn.json
+++ b/dawn.json
@@ -70,7 +70,7 @@
     "bind group layout": {
         "category": "object"
     },
-    "bind group binding": {
+    "bind group layout binding": {
         "category": "structure",
         "extensible": false,
         "members": [
@@ -84,7 +84,7 @@
         "extensible": true,
         "members": [
             {"name": "num bindings", "type": "uint32_t"},
-            {"name": "bindings", "type": "bind group binding", "annotation": "const*", "length": "num bindings"}
+            {"name": "bindings", "type": "bind group layout binding", "annotation": "const*", "length": "num bindings"}
         ]
     },
     "binding type": {

src/tests/unittests/WireTests.cpp

diff --git a/src/tests/unittests/WireTests.cpp b/src/tests/unittests/WireTests.cpp
index 4670cab..17ab909 100644
--- a/src/tests/unittests/WireTests.cpp
+++ b/src/tests/unittests/WireTests.cpp
@@ -447,7 +447,7 @@
 // Test that the wire is able to send structures that contain objects
 TEST_F(WireTests, StructureOfStructureArrayArgument) {
     static constexpr int NUM_BINDINGS = 3;
-    dawnBindGroupBinding bindings[NUM_BINDINGS]{
+    dawnBindGroupLayoutBinding bindings[NUM_BINDINGS]{
         {0, DAWN_SHADER_STAGE_BIT_VERTEX, DAWN_BINDING_TYPE_SAMPLER},
         {1, DAWN_SHADER_STAGE_BIT_VERTEX, DAWN_BINDING_TYPE_SAMPLED_TEXTURE},
         {2,

src/utils/DawnHelpers.cpp

diff --git a/src/utils/DawnHelpers.cpp b/src/utils/DawnHelpers.cpp
index e88a92d..5b8e0c9 100644
--- a/src/utils/DawnHelpers.cpp
+++ b/src/utils/DawnHelpers.cpp
@@ -209,10 +209,11 @@
 
     dawn::BindGroupLayout MakeBindGroupLayout(
         const dawn::Device& device,
-        std::initializer_list<dawn::BindGroupBinding> bindingsInitializer) {
-        std::vector<dawn::BindGroupBinding> bindings;
-        dawn::ShaderStageBit kNoStages{};
-        for (const dawn::BindGroupBinding& binding : bindingsInitializer) {
+        std::initializer_list<dawn::BindGroupLayoutBinding> bindingsInitializer) {
+        constexpr dawn::ShaderStageBit kNoStages{};
+
+        std::vector<dawn::BindGroupLayoutBinding> bindings;
+        for (const dawn::BindGroupLayoutBinding& binding : bindingsInitializer) {
             if (binding.visibility != kNoStages) {
                 bindings.push_back(binding);
             }

src/utils/DawnHelpers.h

diff --git a/src/utils/DawnHelpers.h b/src/utils/DawnHelpers.h
index e1e0ed0..6d85a9e 100644
--- a/src/utils/DawnHelpers.h
+++ b/src/utils/DawnHelpers.h
@@ -63,6 +63,6 @@
                                                  const dawn::BindGroupLayout* bindGroupLayout);
     dawn::BindGroupLayout MakeBindGroupLayout(
         const dawn::Device& device,
-        std::initializer_list<dawn::BindGroupBinding> bindingsInitializer);
+        std::initializer_list<dawn::BindGroupLayoutBinding> bindingsInitializer);
 
 }  // namespace utils