commit 373a3ff26ec7e6fa0f54595c34e35e3fab5af577
author Corentin Wallez <cwallez@chromium.org> Wed Apr 01 18:22:36 2020 +0000
committer Commit Bot service account <commit-bot@chromium.org> Wed Apr 01 18:22:36 2020 +0000
tree d9d362457e237e910b32850de4d36ec1312050bb
parent a0afd3158504f5ae0cd4aeced0b21a5f66635729

Rename GetBindGroupLayout's argument group->groupIndex

This is to follow upstream webgpu.h changes.

Bug: dawn:22
Change-Id: I976d1394a31a47870a73ed834137ce99047675bd
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/18540
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

dawn.json

diff --git a/dawn.json b/dawn.json
index 6973a94..bfb03aa 100644
--- a/dawn.json
+++ b/dawn.json
@@ -480,7 +480,7 @@
                 "name": "get bind group layout",
                 "returns": "bind group layout",
                 "args": [
-                    {"name": "group", "type": "uint32_t"}
+                    {"name": "group index", "type": "uint32_t"}
                 ]
             }
         ]
@@ -1213,7 +1213,7 @@
                 "name": "get bind group layout",
                 "returns": "bind group layout",
                 "args": [
-                    {"name": "group", "type": "uint32_t"}
+                    {"name": "group index", "type": "uint32_t"}
                 ]
             }
         ]

src/dawn_native/Pipeline.cpp

diff --git a/src/dawn_native/Pipeline.cpp b/src/dawn_native/Pipeline.cpp
index 4c2439b..4a0b653 100644
--- a/src/dawn_native/Pipeline.cpp
+++ b/src/dawn_native/Pipeline.cpp
@@ -66,22 +66,22 @@
         return mLayout.Get();
     }
 
-    MaybeError PipelineBase::ValidateGetBindGroupLayout(uint32_t group) {
+    MaybeError PipelineBase::ValidateGetBindGroupLayout(uint32_t groupIndex) {
         DAWN_TRY(GetDevice()->ValidateIsAlive());
         DAWN_TRY(GetDevice()->ValidateObject(this));
         DAWN_TRY(GetDevice()->ValidateObject(mLayout.Get()));
-        if (group >= kMaxBindGroups) {
+        if (groupIndex >= kMaxBindGroups) {
             return DAWN_VALIDATION_ERROR("Bind group layout index out of bounds");
         }
         return {};
     }
 
-    BindGroupLayoutBase* PipelineBase::GetBindGroupLayout(uint32_t group) {
-        if (GetDevice()->ConsumedError(ValidateGetBindGroupLayout(group))) {
+    BindGroupLayoutBase* PipelineBase::GetBindGroupLayout(uint32_t groupIndex) {
+        if (GetDevice()->ConsumedError(ValidateGetBindGroupLayout(groupIndex))) {
             return BindGroupLayoutBase::MakeError(GetDevice());
         }
 
-        if (!mLayout->GetBindGroupLayoutsMask()[group]) {
+        if (!mLayout->GetBindGroupLayoutsMask()[groupIndex]) {
             // Get or create an empty bind group layout.
             // TODO(enga): Consider caching this object on the Device and reusing it.
             // Today, this can't be done correctly because of the order of Device destruction.
@@ -99,7 +99,7 @@
             return bgl;
         }
 
-        BindGroupLayoutBase* bgl = mLayout->GetBindGroupLayout(group);
+        BindGroupLayoutBase* bgl = mLayout->GetBindGroupLayout(groupIndex);
         bgl->Reference();
         return bgl;
     }

src/dawn_native/Pipeline.h

diff --git a/src/dawn_native/Pipeline.h b/src/dawn_native/Pipeline.h
index 29c8386..d248e49 100644
--- a/src/dawn_native/Pipeline.h
+++ b/src/dawn_native/Pipeline.h
@@ -38,7 +38,7 @@
         wgpu::ShaderStage GetStageMask() const;
         PipelineLayoutBase* GetLayout();
         const PipelineLayoutBase* GetLayout() const;
-        BindGroupLayoutBase* GetBindGroupLayout(uint32_t group);
+        BindGroupLayoutBase* GetBindGroupLayout(uint32_t groupIndex);
 
       protected:
         PipelineBase(DeviceBase* device, PipelineLayoutBase* layout, wgpu::ShaderStage stages);