encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Corentin Wallez 2020-06-19 16:08:43 +00:00 committed by Commit Bot service account
parent be637db589
commit 4e4ebe87ad
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/dawn_native/vulkan/UtilsVulkan.h
View File

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