Vulkan: fix ASSERT issue in ResourceSerialFactory

Refactor ResourceSerialFactory::issueSerial so that the ASSERT is valid in a threaded environment. Otherwise it's possible for another thread to increment mCurrentUniqueSerial in the middle of the ASSERT. Bug: b/168744561 Change-Id: I7208e8be91b21c50ad4a260d02d69f5b7dab2efe Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2426685Reviewed-by: Tim Van Patten <timvp@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Courtney Goeltzenleuchter <courtneygo@google.com>

Vulkan: fix ASSERT issue in ResourceSerialFactory
fc4e3cf2 · Courtney Goeltzenleuchter · Commit Bot · 7bed2a5b · fc4e3cf2
Commit fc4e3cf2 authored Sep 23, 2020 by Courtney Goeltzenleuchter Committed by Commit Bot Sep 25, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

vk_utils.cpp src/libANGLE/renderer/vulkan/vk_utils.cpp +4 -2

No files found.
--- a/src/libANGLE/renderer/vulkan/vk_utils.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_utils.cpp
@@ -764,8 +764,10 @@ ResourceSerialFactory::~ResourceSerialFactory() {}
 uint32_t ResourceSerialFactory::issueSerial()
 {
-    ASSERT(mCurrentUniqueSerial + 1 > mCurrentUniqueSerial);
+    uint32_t newSerial = ++mCurrentUniqueSerial;
-    return mCurrentUniqueSerial++;
+    // make sure serial does not wrap
+    ASSERT(newSerial > 0);
+    return newSerial;
 }
 #define ANGLE_DEFINE_GEN_VK_SERIAL(Type)                         \