commit 4e4ebe87ade76682319fba9263894cc44c617b08
author Corentin Wallez <cwallez@chromium.org> Fri Jun 19 16:08:43 2020 +0000
committer Commit Bot service account <commit-bot@chromium.org> Fri Jun 19 16:08:43 2020 +0000
tree 5d2f8f3ec756b2e0b6635ed79b14c6783d146ae4
parent be637db5897d14b51dac6f71551ce4d2cb822d06

Vulkan: Simplify PNextChainBuilder

Change mTailPtr to mCurrent that's a VkBaseOutStructure*.

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

src/dawn_native/vulkan/UtilsVulkan.h

diff --git a/src/dawn_native/vulkan/UtilsVulkan.h b/src/dawn_native/vulkan/UtilsVulkan.h
index 462c08c..36ebd34 100644
--- a/src/dawn_native/vulkan/UtilsVulkan.h
+++ b/src/dawn_native/vulkan/UtilsVulkan.h
@@ -53,10 +53,10 @@
         // which is why the VkBaseOutStructure* casts below are necessary.
         template <typename VK_STRUCT_TYPE>
         explicit PNextChainBuilder(VK_STRUCT_TYPE* head)
-            : mTailPtr(&reinterpret_cast<VkBaseOutStructure*>(head)->pNext) {
+            : mCurrent(reinterpret_cast<VkBaseOutStructure*>(head)) {
             // Find the end of the current chain.
-            while (*mTailPtr) {
-                mTailPtr = &(*mTailPtr)->pNext;
+            while (mCurrent->pNext != nullptr) {
+                mCurrent = mCurrent->pNext;
             }
         }
 
@@ -70,8 +70,9 @@
                     offsetof(VK_STRUCT_TYPE, pNext) == offsetof(VkBaseOutStructure, pNext),
                 "Argument type is not a proper Vulkan structure type");
             vkStruct->pNext = nullptr;
-            *mTailPtr = reinterpret_cast<VkBaseOutStructure*>(vkStruct);
-            mTailPtr = &(*mTailPtr)->pNext;
+
+            mCurrent->pNext = reinterpret_cast<VkBaseOutStructure*>(vkStruct);
+            mCurrent = mCurrent->pNext;
         }
 
         // A variant of Add() above that also initializes the |sType| field in |vk_struct|.
@@ -82,7 +83,7 @@
         }
 
       private:
-        VkBaseOutStructure** mTailPtr;
+        VkBaseOutStructure* mCurrent;
     };
 
     VkCompareOp ToVulkanCompareOp(wgpu::CompareFunction op);