commit 0847cb4637366d15efdb09c57d9b53ea720587fb
author Austin Eng <enga@chromium.org> Thu Mar 26 17:22:14 2020 +0000
committer Commit Bot service account <commit-bot@chromium.org> Thu Mar 26 17:22:14 2020 +0000
tree aa9bf21a314cf805dca71affec45a212a1731556
parent d5db214564bd781d5a6438a5fa48e39c9ba021b5

Convert LayoutBindingInfo to an array of BindingInfos

This makes accessing per-index data simpler, and now that dynamic
buffer bindings are packed at the front, the old IterateBitset on
the dynamic buffer binding mask can be replaced with a simple loop
over the beginning bindings.

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

src/dawn_native/opengl/PipelineLayoutGL.cpp

diff --git a/src/dawn_native/opengl/PipelineLayoutGL.cpp b/src/dawn_native/opengl/PipelineLayoutGL.cpp
index 7048d5e..383a079 100644
--- a/src/dawn_native/opengl/PipelineLayoutGL.cpp
+++ b/src/dawn_native/opengl/PipelineLayoutGL.cpp
@@ -28,12 +28,11 @@
         GLuint ssboIndex = 0;
 
         for (uint32_t group : IterateBitSet(GetBindGroupLayoutsMask())) {
-            const BindGroupLayoutBase::LayoutBindingInfo& groupInfo =
-                GetBindGroupLayout(group)->GetBindingInfo();
+            const BindGroupLayoutBase* bgl = GetBindGroupLayout(group);
 
-            for (BindingIndex bindingIndex = 0; bindingIndex < groupInfo.bindingCount;
+            for (BindingIndex bindingIndex = 0; bindingIndex < bgl->GetBindingCount();
                  ++bindingIndex) {
-                switch (groupInfo.types[bindingIndex]) {
+                switch (bgl->GetBindingInfo(bindingIndex).type) {
                     case wgpu::BindingType::UniformBuffer:
                         mIndexInfo[group][bindingIndex] = uboIndex;
                         uboIndex++;