(🍒) vulkan: Use std::atomic for seqno

Cherry-picked from aosp/2444542.

Original Commit Message:
> Instead of using gcc-internal atomic functions now we use std::atomic
> type instead.  Verified that this produces the same assembly code when
> -O3 is enabled on gcc and clang (https://godbolt.org/z/drx5Y1Gjj).

> Besides we also pass the ProcessResource pointer to VkDecoder so that
> we can pass in other resources in ProcessResource.

Bug: fxbug.dev/120167
Change-Id: I1a5e1913ce9191665c74bdfed42b1c829f208728
diff --git a/stream-servers/FrameBuffer.h b/stream-servers/FrameBuffer.h
index f3e0298..8ca91ed 100644
--- a/stream-servers/FrameBuffer.h
+++ b/stream-servers/FrameBuffer.h
@@ -85,11 +85,13 @@
     DISALLOW_COPY_ASSIGN_AND_MOVE(ProcessResources);
 
     ~ProcessResources() = default;
-    uint32_t* getSequenceNumberPtr() const { return &mSequenceNumber; }
+    std::atomic<uint32_t>* getSequenceNumberPtr() const {
+        return &mSequenceNumber;
+    }
 
    private:
     ProcessResources() : mSequenceNumber(0) {}
-    mutable uint32_t mSequenceNumber;
+    mutable std::atomic<uint32_t> mSequenceNumber;
 };
 
 typedef std::unordered_map<uint64_t, gfxstream::EmulatedEglWindowSurfaceSet>
diff --git a/stream-servers/RenderThread.cpp b/stream-servers/RenderThread.cpp
index 8fad5ef..76033fd 100644
--- a/stream-servers/RenderThread.cpp
+++ b/stream-servers/RenderThread.cpp
@@ -464,12 +464,8 @@
                     .healthMonitor = FrameBuffer::getFB()->getHealthMonitor(),
                     .metricsLogger = &metricsLogger,
                 };
-                uint32_t* seqno = nullptr;
-                if (processResources) {
-                    seqno = processResources->getSequenceNumberPtr();
-                }
                 last = tInfo.m_vkInfo->m_vkDec.decode(readBuf.buf(), readBuf.validData(), ioStream,
-                                                      seqno, context);
+                                                      processResources, context);
                 if (last > 0) {
                     if (!processResources) {
                         ERR("Processed some Vulkan packets without process resources created. "
diff --git a/stream-servers/vulkan/VkDecoder.cpp b/stream-servers/vulkan/VkDecoder.cpp
index 5bba46a..a167e7a 100644
--- a/stream-servers/vulkan/VkDecoder.cpp
+++ b/stream-servers/vulkan/VkDecoder.cpp
@@ -50,6 +50,7 @@
 #include "host-common/GfxstreamFatalError.h"
 #include "host-common/feature_control.h"
 #include "host-common/logging.h"
+#include "stream-servers/FrameBuffer.h"
 #include "stream-servers/IOStream.h"
 
 #define MAX_PACKET_LENGTH (400 * 1024 * 1024)  // 400MB
@@ -77,8 +78,8 @@
 
     void setForSnapshotLoad(bool forSnapshotLoad) { m_forSnapshotLoad = forSnapshotLoad; }
 
-    size_t decode(void* buf, size_t bufsize, IOStream* stream, uint32_t* seqnoPtr,
-                  const VkDecoderContext&);
+    size_t decode(void* buf, size_t bufsize, IOStream* stream,
+                  const ProcessResources* processResources, const VkDecoderContext&);
 
    private:
     bool m_logCalls;
@@ -104,14 +105,16 @@
     mImpl->setForSnapshotLoad(forSnapshotLoad);
 }
 
-size_t VkDecoder::decode(void* buf, size_t bufsize, IOStream* stream, uint32_t* seqnoPtr,
+size_t VkDecoder::decode(void* buf, size_t bufsize, IOStream* stream,
+                         const ProcessResources* processResources,
                          const VkDecoderContext& context) {
-    return mImpl->decode(buf, bufsize, stream, seqnoPtr, context);
+    return mImpl->decode(buf, bufsize, stream, processResources, context);
 }
 
 // VkDecoder::Impl::decode to follow
 
-size_t VkDecoder::Impl::decode(void* buf, size_t len, IOStream* ioStream, uint32_t* seqnoPtr,
+size_t VkDecoder::Impl::decode(void* buf, size_t len, IOStream* ioStream,
+                               const ProcessResources* processResources,
                                const VkDecoderContext& context) {
     const char* processName = context.processName;
     auto& gfx_logger = *context.gfxApiLogger;
@@ -159,6 +162,9 @@
                 executionData->insert({{"previous_seqno", std::to_string(m_prevSeqno.value())}});
             }
         }
+
+        std::atomic<uint32_t>* seqnoPtr = processResources->getSequenceNumberPtr();
+
         if (queueSubmitWithCommandsEnabled &&
             ((opcode >= OP_vkFirst && opcode < OP_vkLast) ||
              (opcode >= OP_vkFirst_old && opcode < OP_vkLast_old))) {
@@ -185,12 +191,12 @@
                                 auto annotations =
                                     std::make_unique<EventHangMetadata::HangAnnotations>();
                                 annotations->insert(
-                                    {{"seqnoPtr", std::to_string(__atomic_load_n(
-                                                      seqnoPtr, __ATOMIC_SEQ_CST))}});
+                                    {{"seqnoPtr",
+                                      std::to_string(seqnoPtr->load(std::memory_order_seq_cst))}});
                                 return annotations;
                             })
                             .build();
-                    while ((seqno - __atomic_load_n(seqnoPtr, __ATOMIC_SEQ_CST) != 1)) {
+                    while ((seqno - seqnoPtr->load(std::memory_order_seq_cst) != 1)) {
 #if (defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)))
                         _mm_pause();
 #elif (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))
@@ -276,7 +282,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -318,7 +324,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -415,7 +421,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -462,7 +468,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -516,7 +522,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -596,7 +602,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -645,7 +651,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -748,7 +754,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -800,7 +806,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -839,7 +845,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -878,7 +884,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -954,7 +960,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -996,7 +1002,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -1110,7 +1116,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -1231,7 +1237,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -1326,7 +1332,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -1433,7 +1439,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -1483,7 +1489,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -1539,7 +1545,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -1556,7 +1562,7 @@
                             (unsigned long long)queue);
                 }
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 VkResult vkQueueWaitIdle_VkResult_return = (VkResult)0;
                 vkQueueWaitIdle_VkResult_return = m_state->on_vkQueueWaitIdle(&m_pool, queue);
                 if ((vkQueueWaitIdle_VkResult_return) == VK_ERROR_DEVICE_LOST)
@@ -1593,7 +1599,7 @@
                             (unsigned long long)device);
                 }
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 VkResult vkDeviceWaitIdle_VkResult_return = (VkResult)0;
                 vkDeviceWaitIdle_VkResult_return = vk->vkDeviceWaitIdle(unboxed_device);
                 if ((vkDeviceWaitIdle_VkResult_return) == VK_ERROR_DEVICE_LOST)
@@ -1692,7 +1698,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -1747,7 +1753,7 @@
                 delete_VkDeviceMemory(boxed_memory_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -1818,7 +1824,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -1851,7 +1857,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -1928,7 +1934,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -2008,7 +2014,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -2056,7 +2062,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -2107,7 +2113,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -2158,7 +2164,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -2214,7 +2220,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -2268,7 +2274,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -2382,7 +2388,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -2502,7 +2508,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -2561,7 +2567,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -2637,7 +2643,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -2691,7 +2697,7 @@
                 delete_VkFence(boxed_fence_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -2741,7 +2747,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -2783,7 +2789,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -2826,7 +2832,7 @@
                             (unsigned long long)timeout);
                 }
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 VkResult vkWaitForFences_VkResult_return = (VkResult)0;
                 vkWaitForFences_VkResult_return =
                     vk->vkWaitForFences(unboxed_device, fenceCount, pFences, waitAll, timeout);
@@ -2924,7 +2930,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -2978,7 +2984,7 @@
                 delete_VkSemaphore(boxed_semaphore_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -3058,7 +3064,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -3115,7 +3121,7 @@
                 delete_VkEvent(boxed_event_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -3157,7 +3163,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -3197,7 +3203,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -3239,7 +3245,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -3322,7 +3328,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -3379,7 +3385,7 @@
                 delete_VkQueryPool(boxed_queryPool_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -3454,7 +3460,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -3531,7 +3537,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -3585,7 +3591,7 @@
                 delete_VkBuffer(boxed_buffer_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -3667,7 +3673,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -3725,7 +3731,7 @@
                 delete_VkBufferView(boxed_bufferView_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -3802,7 +3808,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -3856,7 +3862,7 @@
                 delete_VkImage(boxed_image_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -3921,7 +3927,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -3999,7 +4005,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -4053,7 +4059,7 @@
                 delete_VkImageView(boxed_imageView_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -4134,7 +4140,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -4189,7 +4195,7 @@
                 delete_VkShaderModule(boxed_shaderModule_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -4271,7 +4277,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -4327,7 +4333,7 @@
                 delete_VkPipelineCache(boxed_pipelineCache_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -4413,7 +4419,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -4477,7 +4483,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -4585,7 +4591,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -4697,7 +4703,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -4751,7 +4757,7 @@
                 delete_VkPipeline(boxed_pipeline_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -4839,7 +4845,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -4904,7 +4910,7 @@
                                                 delayed_remove_callback);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -4982,7 +4988,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -5036,7 +5042,7 @@
                 delete_VkSampler(boxed_sampler_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -5072,9 +5078,8 @@
                 uint64_t cgen_var_2;
                 memcpy((uint64_t*)&cgen_var_2, *readStreamPtrPtr, 8);
                 *readStreamPtrPtr += 8;
-                *(VkDescriptorSetLayout*)pSetLayout =
-                    (VkDescriptorSetLayout)(VkDescriptorSetLayout)((
-                        VkDescriptorSetLayout)(*&cgen_var_2));
+                *(VkDescriptorSetLayout*)pSetLayout = (VkDescriptorSetLayout)(
+                    VkDescriptorSetLayout)((VkDescriptorSetLayout)(*&cgen_var_2));
                 if (pCreateInfo) {
                     transform_tohost_VkDescriptorSetLayoutCreateInfo(
                         m_state, (VkDescriptorSetLayoutCreateInfo*)(pCreateInfo));
@@ -5123,7 +5128,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -5142,9 +5147,8 @@
                 uint64_t cgen_var_1;
                 memcpy((uint64_t*)&cgen_var_1, *readStreamPtrPtr, 1 * 8);
                 *readStreamPtrPtr += 1 * 8;
-                *(VkDescriptorSetLayout*)&descriptorSetLayout =
-                    (VkDescriptorSetLayout)(VkDescriptorSetLayout)((
-                        VkDescriptorSetLayout)(*&cgen_var_1));
+                *(VkDescriptorSetLayout*)&descriptorSetLayout = (VkDescriptorSetLayout)(
+                    VkDescriptorSetLayout)((VkDescriptorSetLayout)(*&cgen_var_1));
                 boxed_descriptorSetLayout_preserve = descriptorSetLayout;
                 descriptorSetLayout = unbox_VkDescriptorSetLayout(descriptorSetLayout);
                 // WARNING PTR CHECK
@@ -5182,7 +5186,7 @@
                 delete_VkDescriptorSetLayout(boxed_descriptorSetLayout_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -5264,7 +5268,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -5320,7 +5324,7 @@
                 delete_VkDescriptorPool(boxed_descriptorPool_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -5367,7 +5371,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -5446,7 +5450,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -5524,7 +5528,7 @@
                 // Skipping handle cleanup for vkFreeDescriptorSets
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -5595,7 +5599,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -5676,7 +5680,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -5731,7 +5735,7 @@
                 delete_VkFramebuffer(boxed_framebuffer_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -5811,7 +5815,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -5866,7 +5870,7 @@
                 delete_VkRenderPass(boxed_renderPass_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -5920,7 +5924,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6001,7 +6005,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6056,7 +6060,7 @@
                 delete_VkCommandPool(boxed_commandPool_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6102,7 +6106,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6177,7 +6181,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6251,7 +6255,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6297,7 +6301,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6333,7 +6337,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6373,7 +6377,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6412,7 +6416,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6466,7 +6470,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6518,7 +6522,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6552,7 +6556,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6598,7 +6602,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6634,7 +6638,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6673,7 +6677,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6714,7 +6718,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6755,7 +6759,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6796,7 +6800,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6873,7 +6877,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6918,7 +6922,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -6978,7 +6982,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -7026,7 +7030,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -7079,7 +7083,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -7129,7 +7133,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -7180,7 +7184,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -7223,7 +7227,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -7264,7 +7268,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -7325,7 +7329,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -7390,7 +7394,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -7462,7 +7466,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -7527,7 +7531,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -7592,7 +7596,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -7643,7 +7647,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -7692,7 +7696,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -7761,7 +7765,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -7832,7 +7836,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -7900,7 +7904,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -7970,7 +7974,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -8011,7 +8015,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -8052,7 +8056,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -8174,7 +8178,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -8283,7 +8287,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -8330,7 +8334,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -8371,7 +8375,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -8418,7 +8422,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -8466,7 +8470,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -8531,7 +8535,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -8588,7 +8592,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -8633,7 +8637,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -8667,7 +8671,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -8698,7 +8702,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -8746,7 +8750,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -8785,7 +8789,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -8838,7 +8842,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -8891,7 +8895,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -8947,7 +8951,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -8981,7 +8985,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -9037,7 +9041,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -9153,7 +9157,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -9211,7 +9215,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -9272,7 +9276,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -9391,7 +9395,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -9438,7 +9442,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -9487,7 +9491,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -9541,7 +9545,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -9615,7 +9619,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -9718,7 +9722,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -9770,7 +9774,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -9881,7 +9885,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -9922,7 +9926,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -9972,7 +9976,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -10008,9 +10012,8 @@
                 uint64_t cgen_var_2;
                 memcpy((uint64_t*)&cgen_var_2, *readStreamPtrPtr, 8);
                 *readStreamPtrPtr += 8;
-                *(VkSamplerYcbcrConversion*)pYcbcrConversion =
-                    (VkSamplerYcbcrConversion)(VkSamplerYcbcrConversion)((
-                        VkSamplerYcbcrConversion)(*&cgen_var_2));
+                *(VkSamplerYcbcrConversion*)pYcbcrConversion = (VkSamplerYcbcrConversion)(
+                    VkSamplerYcbcrConversion)((VkSamplerYcbcrConversion)(*&cgen_var_2));
                 if (pCreateInfo) {
                     transform_tohost_VkSamplerYcbcrConversionCreateInfo(
                         m_state, (VkSamplerYcbcrConversionCreateInfo*)(pCreateInfo));
@@ -10059,7 +10062,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -10078,9 +10081,8 @@
                 uint64_t cgen_var_1;
                 memcpy((uint64_t*)&cgen_var_1, *readStreamPtrPtr, 1 * 8);
                 *readStreamPtrPtr += 1 * 8;
-                *(VkSamplerYcbcrConversion*)&ycbcrConversion =
-                    (VkSamplerYcbcrConversion)(VkSamplerYcbcrConversion)((
-                        VkSamplerYcbcrConversion)(*&cgen_var_1));
+                *(VkSamplerYcbcrConversion*)&ycbcrConversion = (VkSamplerYcbcrConversion)(
+                    VkSamplerYcbcrConversion)((VkSamplerYcbcrConversion)(*&cgen_var_1));
                 boxed_ycbcrConversion_preserve = ycbcrConversion;
                 ycbcrConversion = unbox_VkSamplerYcbcrConversion(ycbcrConversion);
                 // WARNING PTR CHECK
@@ -10118,7 +10120,7 @@
                 delete_VkSamplerYcbcrConversion(boxed_ycbcrConversion_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -10156,8 +10158,8 @@
                 memcpy((uint64_t*)&cgen_var_2, *readStreamPtrPtr, 8);
                 *readStreamPtrPtr += 8;
                 *(VkDescriptorUpdateTemplate*)pDescriptorUpdateTemplate =
-                    (VkDescriptorUpdateTemplate)(VkDescriptorUpdateTemplate)((
-                        VkDescriptorUpdateTemplate)(*&cgen_var_2));
+                    (VkDescriptorUpdateTemplate)(VkDescriptorUpdateTemplate)(
+                        (VkDescriptorUpdateTemplate)(*&cgen_var_2));
                 if (pCreateInfo) {
                     transform_tohost_VkDescriptorUpdateTemplateCreateInfo(
                         m_state, (VkDescriptorUpdateTemplateCreateInfo*)(pCreateInfo));
@@ -10208,7 +10210,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -10229,8 +10231,8 @@
                 memcpy((uint64_t*)&cgen_var_1, *readStreamPtrPtr, 1 * 8);
                 *readStreamPtrPtr += 1 * 8;
                 *(VkDescriptorUpdateTemplate*)&descriptorUpdateTemplate =
-                    (VkDescriptorUpdateTemplate)(VkDescriptorUpdateTemplate)((
-                        VkDescriptorUpdateTemplate)(*&cgen_var_1));
+                    (VkDescriptorUpdateTemplate)(VkDescriptorUpdateTemplate)(
+                        (VkDescriptorUpdateTemplate)(*&cgen_var_1));
                 boxed_descriptorUpdateTemplate_preserve = descriptorUpdateTemplate;
                 descriptorUpdateTemplate =
                     unbox_VkDescriptorUpdateTemplate(descriptorUpdateTemplate);
@@ -10270,7 +10272,7 @@
                 delete_VkDescriptorUpdateTemplate(boxed_descriptorUpdateTemplate_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -10329,7 +10331,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -10402,7 +10404,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -10469,7 +10471,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -10535,7 +10537,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -10597,7 +10599,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -10659,7 +10661,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -10720,7 +10722,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -10800,7 +10802,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -10853,7 +10855,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -10905,7 +10907,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -10947,7 +10949,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -10992,7 +10994,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -11046,7 +11048,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -11079,7 +11081,7 @@
                             (unsigned long long)timeout);
                 }
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 VkResult vkWaitSemaphores_VkResult_return = (VkResult)0;
                 vkWaitSemaphores_VkResult_return =
                     vk->vkWaitSemaphores(unboxed_device, pWaitInfo, timeout);
@@ -11144,7 +11146,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -11190,7 +11192,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -11235,7 +11237,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -11283,7 +11285,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -11343,7 +11345,7 @@
                 delete_VkSurfaceKHR(boxed_surface_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -11406,7 +11408,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -11477,7 +11479,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -11591,7 +11593,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -11684,7 +11686,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -11771,7 +11773,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -11829,7 +11831,7 @@
                 delete_VkSwapchainKHR(boxed_swapchain_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -11932,7 +11934,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -12003,7 +12005,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -12049,7 +12051,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -12117,7 +12119,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -12188,7 +12190,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -12299,7 +12301,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -12356,7 +12358,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -12467,7 +12469,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -12576,7 +12578,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -12679,7 +12681,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -12792,7 +12794,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -12886,7 +12888,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -12959,7 +12961,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -13039,7 +13041,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -13139,7 +13141,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -13219,7 +13221,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -13276,7 +13278,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -13382,7 +13384,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -13436,7 +13438,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -13518,7 +13520,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -13600,7 +13602,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -13646,7 +13648,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -13723,7 +13725,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -13849,7 +13851,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -13926,7 +13928,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -13978,7 +13980,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -14109,7 +14111,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -14177,7 +14179,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -14259,7 +14261,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -14320,7 +14322,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -14376,7 +14378,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -14417,7 +14419,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -14459,7 +14461,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -14502,7 +14504,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -14545,7 +14547,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -14589,7 +14591,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -14620,7 +14622,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -14672,7 +14674,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -14721,7 +14723,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -14775,7 +14777,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -14849,7 +14851,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -14952,7 +14954,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -15005,7 +15007,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -15117,7 +15119,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -15176,7 +15178,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -15211,7 +15213,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -15267,7 +15269,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -15313,7 +15315,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -15433,7 +15435,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -15508,7 +15510,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -15571,7 +15573,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -15644,7 +15646,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -15701,7 +15703,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -15768,7 +15770,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -15839,7 +15841,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -15898,7 +15900,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -15957,7 +15959,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -16006,7 +16008,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -16058,7 +16060,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -16128,7 +16130,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -16192,7 +16194,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -16238,8 +16240,8 @@
                 memcpy((uint64_t*)&cgen_var_2, *readStreamPtrPtr, 8);
                 *readStreamPtrPtr += 8;
                 *(VkDescriptorUpdateTemplate*)pDescriptorUpdateTemplate =
-                    (VkDescriptorUpdateTemplate)(VkDescriptorUpdateTemplate)((
-                        VkDescriptorUpdateTemplate)(*&cgen_var_2));
+                    (VkDescriptorUpdateTemplate)(VkDescriptorUpdateTemplate)(
+                        (VkDescriptorUpdateTemplate)(*&cgen_var_2));
                 if (pCreateInfo) {
                     transform_tohost_VkDescriptorUpdateTemplateCreateInfo(
                         m_state, (VkDescriptorUpdateTemplateCreateInfo*)(pCreateInfo));
@@ -16290,7 +16292,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -16311,8 +16313,8 @@
                 memcpy((uint64_t*)&cgen_var_1, *readStreamPtrPtr, 1 * 8);
                 *readStreamPtrPtr += 1 * 8;
                 *(VkDescriptorUpdateTemplate*)&descriptorUpdateTemplate =
-                    (VkDescriptorUpdateTemplate)(VkDescriptorUpdateTemplate)((
-                        VkDescriptorUpdateTemplate)(*&cgen_var_1));
+                    (VkDescriptorUpdateTemplate)(VkDescriptorUpdateTemplate)(
+                        (VkDescriptorUpdateTemplate)(*&cgen_var_1));
                 boxed_descriptorUpdateTemplate_preserve = descriptorUpdateTemplate;
                 descriptorUpdateTemplate =
                     unbox_VkDescriptorUpdateTemplate(descriptorUpdateTemplate);
@@ -16352,7 +16354,7 @@
                 delete_VkDescriptorUpdateTemplate(boxed_descriptorUpdateTemplate_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -16411,7 +16413,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -16496,7 +16498,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -16550,7 +16552,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -16602,7 +16604,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -16644,7 +16646,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -16691,7 +16693,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -16760,7 +16762,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -16816,7 +16818,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -16875,7 +16877,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -16925,7 +16927,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -16980,7 +16982,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -17154,7 +17156,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -17213,7 +17215,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -17261,7 +17263,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -17291,7 +17293,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -17372,7 +17374,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -17492,7 +17494,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -17605,7 +17607,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -17715,7 +17717,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -17828,7 +17830,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -17902,7 +17904,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -17969,7 +17971,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -18030,7 +18032,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -18149,7 +18151,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -18189,9 +18191,8 @@
                 uint64_t cgen_var_2;
                 memcpy((uint64_t*)&cgen_var_2, *readStreamPtrPtr, 8);
                 *readStreamPtrPtr += 8;
-                *(VkSamplerYcbcrConversion*)pYcbcrConversion =
-                    (VkSamplerYcbcrConversion)(VkSamplerYcbcrConversion)((
-                        VkSamplerYcbcrConversion)(*&cgen_var_2));
+                *(VkSamplerYcbcrConversion*)pYcbcrConversion = (VkSamplerYcbcrConversion)(
+                    VkSamplerYcbcrConversion)((VkSamplerYcbcrConversion)(*&cgen_var_2));
                 if (pCreateInfo) {
                     transform_tohost_VkSamplerYcbcrConversionCreateInfo(
                         m_state, (VkSamplerYcbcrConversionCreateInfo*)(pCreateInfo));
@@ -18241,7 +18242,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -18260,9 +18261,8 @@
                 uint64_t cgen_var_1;
                 memcpy((uint64_t*)&cgen_var_1, *readStreamPtrPtr, 1 * 8);
                 *readStreamPtrPtr += 1 * 8;
-                *(VkSamplerYcbcrConversion*)&ycbcrConversion =
-                    (VkSamplerYcbcrConversion)(VkSamplerYcbcrConversion)((
-                        VkSamplerYcbcrConversion)(*&cgen_var_1));
+                *(VkSamplerYcbcrConversion*)&ycbcrConversion = (VkSamplerYcbcrConversion)(
+                    VkSamplerYcbcrConversion)((VkSamplerYcbcrConversion)(*&cgen_var_1));
                 boxed_ycbcrConversion_preserve = ycbcrConversion;
                 ycbcrConversion = unbox_VkSamplerYcbcrConversion(ycbcrConversion);
                 // WARNING PTR CHECK
@@ -18300,7 +18300,7 @@
                 delete_VkSamplerYcbcrConversion(boxed_ycbcrConversion_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -18357,7 +18357,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -18411,7 +18411,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -18477,7 +18477,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -18539,7 +18539,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -18600,7 +18600,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -18672,7 +18672,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -18705,7 +18705,7 @@
                             (unsigned long long)timeout);
                 }
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 VkResult vkWaitSemaphoresKHR_VkResult_return = (VkResult)0;
                 vkWaitSemaphoresKHR_VkResult_return =
                     vk->vkWaitSemaphoresKHR(unboxed_device, pWaitInfo, timeout);
@@ -18770,7 +18770,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -18895,7 +18895,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -18942,7 +18942,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -19002,7 +19002,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -19052,7 +19052,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -19098,7 +19098,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -19146,7 +19146,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -19214,7 +19214,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -19266,7 +19266,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -19308,7 +19308,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -19352,7 +19352,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -19395,7 +19395,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -19515,7 +19515,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -19634,7 +19634,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -19768,7 +19768,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -19819,7 +19819,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -19868,7 +19868,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -19910,7 +19910,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -19974,7 +19974,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -20016,7 +20016,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -20064,7 +20064,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -20126,7 +20126,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -20178,7 +20178,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -20276,7 +20276,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -20326,7 +20326,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -20366,7 +20366,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -20409,7 +20409,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -20452,7 +20452,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -20492,7 +20492,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -20535,7 +20535,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -20602,7 +20602,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -20665,7 +20665,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -20784,7 +20784,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -20842,7 +20842,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -20902,7 +20902,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -20980,7 +20980,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -21021,9 +21021,8 @@
                 uint64_t cgen_var_2;
                 memcpy((uint64_t*)&cgen_var_2, *readStreamPtrPtr, 8);
                 *readStreamPtrPtr += 8;
-                *(VkDebugReportCallbackEXT*)pCallback =
-                    (VkDebugReportCallbackEXT)(VkDebugReportCallbackEXT)((
-                        VkDebugReportCallbackEXT)(*&cgen_var_2));
+                *(VkDebugReportCallbackEXT*)pCallback = (VkDebugReportCallbackEXT)(
+                    VkDebugReportCallbackEXT)((VkDebugReportCallbackEXT)(*&cgen_var_2));
                 if (pCreateInfo) {
                     transform_tohost_VkDebugReportCallbackCreateInfoEXT(
                         m_state, (VkDebugReportCallbackCreateInfoEXT*)(pCreateInfo));
@@ -21072,7 +21071,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -21094,9 +21093,8 @@
                 uint64_t cgen_var_1;
                 memcpy((uint64_t*)&cgen_var_1, *readStreamPtrPtr, 1 * 8);
                 *readStreamPtrPtr += 1 * 8;
-                *(VkDebugReportCallbackEXT*)&callback =
-                    (VkDebugReportCallbackEXT)(VkDebugReportCallbackEXT)((
-                        VkDebugReportCallbackEXT)(*&cgen_var_1));
+                *(VkDebugReportCallbackEXT*)&callback = (VkDebugReportCallbackEXT)(
+                    VkDebugReportCallbackEXT)((VkDebugReportCallbackEXT)(*&cgen_var_1));
                 boxed_callback_preserve = callback;
                 callback = unbox_VkDebugReportCallbackEXT(callback);
                 // WARNING PTR CHECK
@@ -21133,7 +21131,7 @@
                 delete_VkDebugReportCallbackEXT(boxed_callback_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -21193,7 +21191,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -21255,7 +21253,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -21305,7 +21303,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -21347,7 +21345,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -21378,7 +21376,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -21420,7 +21418,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -21499,7 +21497,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -21577,7 +21575,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -21655,7 +21653,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -21708,7 +21706,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -21755,7 +21753,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -21817,7 +21815,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -21893,7 +21891,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -21968,7 +21966,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -22019,7 +22017,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -22071,7 +22069,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -22112,7 +22110,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -22158,7 +22156,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -22223,7 +22221,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -22285,7 +22283,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -22346,7 +22344,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -22456,7 +22454,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -22542,7 +22540,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -22644,7 +22642,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -22708,7 +22706,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -22791,7 +22789,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -22847,7 +22845,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -22878,7 +22876,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -22937,7 +22935,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -22985,7 +22983,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -23042,7 +23040,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -23108,7 +23106,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -23182,7 +23180,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -23242,7 +23240,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -23320,7 +23318,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -23406,7 +23404,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -23466,7 +23464,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -23537,7 +23535,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -23657,7 +23655,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -23726,7 +23724,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -23798,7 +23796,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -23878,7 +23876,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -23960,7 +23958,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24001,7 +23999,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24041,7 +24039,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24075,7 +24073,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24109,7 +24107,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24149,7 +24147,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24183,7 +24181,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24238,7 +24236,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24286,7 +24284,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24326,7 +24324,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24356,7 +24354,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24396,7 +24394,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24437,7 +24435,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24468,7 +24466,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24510,7 +24508,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24549,9 +24547,8 @@
                 uint64_t cgen_var_2;
                 memcpy((uint64_t*)&cgen_var_2, *readStreamPtrPtr, 8);
                 *readStreamPtrPtr += 8;
-                *(VkDebugUtilsMessengerEXT*)pMessenger =
-                    (VkDebugUtilsMessengerEXT)(VkDebugUtilsMessengerEXT)((
-                        VkDebugUtilsMessengerEXT)(*&cgen_var_2));
+                *(VkDebugUtilsMessengerEXT*)pMessenger = (VkDebugUtilsMessengerEXT)(
+                    VkDebugUtilsMessengerEXT)((VkDebugUtilsMessengerEXT)(*&cgen_var_2));
                 if (pCreateInfo) {
                     transform_tohost_VkDebugUtilsMessengerCreateInfoEXT(
                         m_state, (VkDebugUtilsMessengerCreateInfoEXT*)(pCreateInfo));
@@ -24600,7 +24597,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24622,9 +24619,8 @@
                 uint64_t cgen_var_1;
                 memcpy((uint64_t*)&cgen_var_1, *readStreamPtrPtr, 1 * 8);
                 *readStreamPtrPtr += 1 * 8;
-                *(VkDebugUtilsMessengerEXT*)&messenger =
-                    (VkDebugUtilsMessengerEXT)(VkDebugUtilsMessengerEXT)((
-                        VkDebugUtilsMessengerEXT)(*&cgen_var_1));
+                *(VkDebugUtilsMessengerEXT*)&messenger = (VkDebugUtilsMessengerEXT)(
+                    VkDebugUtilsMessengerEXT)((VkDebugUtilsMessengerEXT)(*&cgen_var_1));
                 boxed_messenger_preserve = messenger;
                 messenger = unbox_VkDebugUtilsMessengerEXT(messenger);
                 // WARNING PTR CHECK
@@ -24661,7 +24657,7 @@
                 delete_VkDebugUtilsMessengerEXT(boxed_messenger_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24715,7 +24711,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24786,7 +24782,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24848,7 +24844,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24905,7 +24901,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -24966,7 +24962,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -25050,7 +25046,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -25091,9 +25087,8 @@
                 uint64_t cgen_var_2;
                 memcpy((uint64_t*)&cgen_var_2, *readStreamPtrPtr, 8);
                 *readStreamPtrPtr += 8;
-                *(VkValidationCacheEXT*)pValidationCache =
-                    (VkValidationCacheEXT)(VkValidationCacheEXT)((
-                        VkValidationCacheEXT)(*&cgen_var_2));
+                *(VkValidationCacheEXT*)pValidationCache = (VkValidationCacheEXT)(
+                    VkValidationCacheEXT)((VkValidationCacheEXT)(*&cgen_var_2));
                 if (pCreateInfo) {
                     transform_tohost_VkValidationCacheCreateInfoEXT(
                         m_state, (VkValidationCacheCreateInfoEXT*)(pCreateInfo));
@@ -25142,7 +25137,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -25164,9 +25159,8 @@
                 uint64_t cgen_var_1;
                 memcpy((uint64_t*)&cgen_var_1, *readStreamPtrPtr, 1 * 8);
                 *readStreamPtrPtr += 1 * 8;
-                *(VkValidationCacheEXT*)&validationCache =
-                    (VkValidationCacheEXT)(VkValidationCacheEXT)((
-                        VkValidationCacheEXT)(*&cgen_var_1));
+                *(VkValidationCacheEXT*)&validationCache = (VkValidationCacheEXT)(
+                    VkValidationCacheEXT)((VkValidationCacheEXT)(*&cgen_var_1));
                 boxed_validationCache_preserve = validationCache;
                 validationCache = unbox_VkValidationCacheEXT(validationCache);
                 // WARNING PTR CHECK
@@ -25202,7 +25196,7 @@
                 delete_VkValidationCacheEXT(boxed_validationCache_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -25269,7 +25263,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -25358,7 +25352,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -25407,7 +25401,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -25464,7 +25458,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -25524,7 +25518,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -25566,9 +25560,8 @@
                 uint64_t cgen_var_2;
                 memcpy((uint64_t*)&cgen_var_2, *readStreamPtrPtr, 8);
                 *readStreamPtrPtr += 8;
-                *(VkAccelerationStructureNV*)pAccelerationStructure =
-                    (VkAccelerationStructureNV)(VkAccelerationStructureNV)((
-                        VkAccelerationStructureNV)(*&cgen_var_2));
+                *(VkAccelerationStructureNV*)pAccelerationStructure = (VkAccelerationStructureNV)(
+                    VkAccelerationStructureNV)((VkAccelerationStructureNV)(*&cgen_var_2));
                 if (pCreateInfo) {
                     transform_tohost_VkAccelerationStructureCreateInfoNV(
                         m_state, (VkAccelerationStructureCreateInfoNV*)(pCreateInfo));
@@ -25619,7 +25612,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -25641,9 +25634,8 @@
                 uint64_t cgen_var_1;
                 memcpy((uint64_t*)&cgen_var_1, *readStreamPtrPtr, 1 * 8);
                 *readStreamPtrPtr += 1 * 8;
-                *(VkAccelerationStructureNV*)&accelerationStructure =
-                    (VkAccelerationStructureNV)(VkAccelerationStructureNV)((
-                        VkAccelerationStructureNV)(*&cgen_var_1));
+                *(VkAccelerationStructureNV*)&accelerationStructure = (VkAccelerationStructureNV)(
+                    VkAccelerationStructureNV)((VkAccelerationStructureNV)(*&cgen_var_1));
                 boxed_accelerationStructure_preserve = accelerationStructure;
                 accelerationStructure = unbox_VkAccelerationStructureNV(accelerationStructure);
                 // WARNING PTR CHECK
@@ -25681,7 +25673,7 @@
                 delete_VkAccelerationStructureNV(boxed_accelerationStructure_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -25744,7 +25736,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -25808,7 +25800,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -25890,7 +25882,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -25943,7 +25935,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -26062,7 +26054,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -26167,7 +26159,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -26235,7 +26227,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -26303,7 +26295,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -26367,7 +26359,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -26438,7 +26430,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -26485,7 +26477,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -26575,7 +26567,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -26629,7 +26621,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -26721,7 +26713,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -26798,7 +26790,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -26855,7 +26847,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -26906,7 +26898,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -26967,7 +26959,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -27030,7 +27022,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -27075,7 +27067,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -27172,7 +27164,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -27226,7 +27218,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -27256,7 +27248,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -27308,7 +27300,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -27362,7 +27354,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -27416,7 +27408,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -27483,7 +27475,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -27531,7 +27523,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -27579,7 +27571,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -27642,7 +27634,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -27687,7 +27679,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -27770,7 +27762,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -27852,7 +27844,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -27965,7 +27957,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -28084,7 +28076,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -28208,7 +28200,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -28313,7 +28305,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -28360,7 +28352,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -28407,7 +28399,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -28483,7 +28475,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -28565,7 +28557,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -28609,7 +28601,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -28658,7 +28650,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -28697,7 +28689,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -28732,7 +28724,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -28769,7 +28761,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -28818,7 +28810,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -28866,7 +28858,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -28959,7 +28951,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -28995,7 +28987,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -29031,7 +29023,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -29067,7 +29059,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -29104,7 +29096,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -29140,7 +29132,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -29194,7 +29186,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -29263,7 +29255,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -29308,7 +29300,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -29358,7 +29350,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -29407,7 +29399,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -29448,8 +29440,8 @@
                 memcpy((uint64_t*)&cgen_var_2, *readStreamPtrPtr, 8);
                 *readStreamPtrPtr += 8;
                 *(VkIndirectCommandsLayoutNV*)pIndirectCommandsLayout =
-                    (VkIndirectCommandsLayoutNV)(VkIndirectCommandsLayoutNV)((
-                        VkIndirectCommandsLayoutNV)(*&cgen_var_2));
+                    (VkIndirectCommandsLayoutNV)(VkIndirectCommandsLayoutNV)(
+                        (VkIndirectCommandsLayoutNV)(*&cgen_var_2));
                 if (pCreateInfo) {
                     transform_tohost_VkIndirectCommandsLayoutCreateInfoNV(
                         m_state, (VkIndirectCommandsLayoutCreateInfoNV*)(pCreateInfo));
@@ -29501,7 +29493,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -29524,8 +29516,8 @@
                 memcpy((uint64_t*)&cgen_var_1, *readStreamPtrPtr, 1 * 8);
                 *readStreamPtrPtr += 1 * 8;
                 *(VkIndirectCommandsLayoutNV*)&indirectCommandsLayout =
-                    (VkIndirectCommandsLayoutNV)(VkIndirectCommandsLayoutNV)((
-                        VkIndirectCommandsLayoutNV)(*&cgen_var_1));
+                    (VkIndirectCommandsLayoutNV)(VkIndirectCommandsLayoutNV)(
+                        (VkIndirectCommandsLayoutNV)(*&cgen_var_1));
                 boxed_indirectCommandsLayout_preserve = indirectCommandsLayout;
                 indirectCommandsLayout = unbox_VkIndirectCommandsLayoutNV(indirectCommandsLayout);
                 // WARNING PTR CHECK
@@ -29563,7 +29555,7 @@
                 delete_VkIndirectCommandsLayoutNV(boxed_indirectCommandsLayout_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -29624,7 +29616,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -29684,7 +29676,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -29769,7 +29761,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -29821,7 +29813,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -29877,7 +29869,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -29931,7 +29923,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -29983,7 +29975,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -30046,7 +30038,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -30102,7 +30094,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -30184,7 +30176,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -30238,7 +30230,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -30327,7 +30319,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -30394,7 +30386,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -30470,7 +30462,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -30528,7 +30520,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -30592,7 +30584,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -30672,7 +30664,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -30732,7 +30724,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -30793,7 +30785,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -30846,7 +30838,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -30915,7 +30907,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -30985,7 +30977,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -31016,7 +31008,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -31061,7 +31053,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -31124,7 +31116,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -31163,7 +31155,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -31201,7 +31193,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -31237,7 +31229,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -31271,7 +31263,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -31309,7 +31301,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -31391,7 +31383,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -31444,7 +31436,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -31491,7 +31483,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -31543,7 +31535,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -31593,7 +31585,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -31659,7 +31651,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -31821,7 +31813,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -31861,7 +31853,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -31889,7 +31881,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -31922,7 +31914,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -31960,7 +31952,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -32061,7 +32053,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -32162,7 +32154,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -32265,7 +32257,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -32330,7 +32322,7 @@
                 delete_VkDeviceMemory(boxed_memory_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -32365,7 +32357,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -32416,7 +32408,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -32443,7 +32435,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -32497,7 +32489,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -32547,7 +32539,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -32603,7 +32595,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -32637,7 +32629,7 @@
                         (unsigned long long)dataSize, (unsigned long long)pData);
                 }
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 m_state->on_vkQueueFlushCommandsGOOGLE(&m_pool, queue, commandBuffer, dataSize,
                                                        pData, context);
                 vkStream->unsetHandleMapping();
@@ -32771,7 +32763,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -32837,7 +32829,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -32897,7 +32889,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -32949,7 +32941,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -33023,7 +33015,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -33103,7 +33095,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -33150,7 +33142,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -33192,9 +33184,8 @@
                 uint64_t cgen_var_2;
                 memcpy((uint64_t*)&cgen_var_2, *readStreamPtrPtr, 8);
                 *readStreamPtrPtr += 8;
-                *(VkAccelerationStructureKHR*)pAccelerationStructure =
-                    (VkAccelerationStructureKHR)(VkAccelerationStructureKHR)((
-                        VkAccelerationStructureKHR)(*&cgen_var_2));
+                *(VkAccelerationStructureKHR*)pAccelerationStructure = (VkAccelerationStructureKHR)(
+                    VkAccelerationStructureKHR)((VkAccelerationStructureKHR)(*&cgen_var_2));
                 if (pCreateInfo) {
                     transform_tohost_VkAccelerationStructureCreateInfoKHR(
                         m_state, (VkAccelerationStructureCreateInfoKHR*)(pCreateInfo));
@@ -33246,7 +33237,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -33268,9 +33259,8 @@
                 uint64_t cgen_var_1;
                 memcpy((uint64_t*)&cgen_var_1, *readStreamPtrPtr, 1 * 8);
                 *readStreamPtrPtr += 1 * 8;
-                *(VkAccelerationStructureKHR*)&accelerationStructure =
-                    (VkAccelerationStructureKHR)(VkAccelerationStructureKHR)((
-                        VkAccelerationStructureKHR)(*&cgen_var_1));
+                *(VkAccelerationStructureKHR*)&accelerationStructure = (VkAccelerationStructureKHR)(
+                    VkAccelerationStructureKHR)((VkAccelerationStructureKHR)(*&cgen_var_1));
                 boxed_accelerationStructure_preserve = accelerationStructure;
                 accelerationStructure = unbox_VkAccelerationStructureKHR(accelerationStructure);
                 // WARNING PTR CHECK
@@ -33308,7 +33298,7 @@
                 delete_VkAccelerationStructureKHR(boxed_accelerationStructure_preserve);
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -33366,7 +33356,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -33439,7 +33429,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -33510,7 +33500,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -33567,7 +33557,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -33627,7 +33617,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -33687,7 +33677,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -33774,7 +33764,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -33816,7 +33806,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -33859,7 +33849,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -33902,7 +33892,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -33952,7 +33942,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -34023,7 +34013,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -34080,7 +34070,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -34162,7 +34152,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -34258,7 +34248,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -34369,7 +34359,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -34441,7 +34431,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -34529,7 +34519,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -34583,7 +34573,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
@@ -34622,7 +34612,7 @@
                 }
                 vkReadStream->clearPool();
                 if (queueSubmitWithCommandsEnabled)
-                    __atomic_fetch_add(seqnoPtr, 1, __ATOMIC_SEQ_CST);
+                    seqnoPtr->fetch_add(1, std::memory_order_seq_cst);
                 android::base::endTrace();
                 break;
             }
diff --git a/stream-servers/vulkan/VkDecoder.h b/stream-servers/vulkan/VkDecoder.h
index 42864d1..5dc4fb6 100644
--- a/stream-servers/vulkan/VkDecoder.h
+++ b/stream-servers/vulkan/VkDecoder.h
@@ -43,6 +43,7 @@
 }  // namespace base
 }  // namespace android
 
+class ProcessResources;
 class IOStream;
 
 class VkDecoder {
@@ -50,8 +51,8 @@
     VkDecoder();
     ~VkDecoder();
     void setForSnapshotLoad(bool forSnapshotLoad);
-    size_t decode(void* buf, size_t bufsize, IOStream* stream, uint32_t* seqnoPtr,
-                  const VkDecoderContext&);
+    size_t decode(void* buf, size_t bufsize, IOStream* stream,
+                  const ProcessResources* processResources, const VkDecoderContext&);
 
    private:
     class Impl;
diff --git a/stream-servers/vulkan/VkReconstruction.cpp b/stream-servers/vulkan/VkReconstruction.cpp
index fe14be4..3926dc7 100644
--- a/stream-servers/vulkan/VkReconstruction.cpp
+++ b/stream-servers/vulkan/VkReconstruction.cpp
@@ -17,6 +17,7 @@
 
 #include <unordered_map>
 
+#include "FrameBuffer.h"
 #include "IOStream.h"
 #include "VkDecoder.h"
 #include "aemu/base/containers/EntityManager.h"
@@ -250,13 +251,13 @@
     DEBUG_RECON("start decoding trace");
 
     // TODO: This needs to be the puid seqno ptr
-    uint32_t seqno;
+    auto resources = ProcessResources::create();
     VkDecoderContext context = {
         .processName = nullptr,
         .gfxApiLogger = &gfxLogger,
         .healthMonitor = healthMonitor,
     };
-    decoderForLoading.decode(mLoadedTrace.data(), mLoadedTrace.size(), &trivialStream, &seqno,
+    decoderForLoading.decode(mLoadedTrace.data(), mLoadedTrace.size(), &trivialStream, resources.get(),
                              context);
 
     DEBUG_RECON("finished decoding trace");