diff --git a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp index 516e1d6e157..591d3bea2b0 100644 --- a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp +++ b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp @@ -3045,7 +3045,7 @@ VkResult ResourceTracker::allocateCoherentMemory(VkDevice device, VirtGpuDevice* instance = VirtGpuDevice::getInstance(); struct gfxstreamPlaceholderCommandVk placeholderCmd = {}; - createBlobInfo.blobId = ++mBlobId; + createBlobInfo.blobId = ++mAtomicId; createBlobInfo.blobMem = kBlobMemGuest; createBlobInfo.blobFlags = kBlobFlagCreateGuestHandle; vk_append_struct(&structChainIter, &createBlobInfo); @@ -3073,7 +3073,7 @@ VkResult ResourceTracker::allocateCoherentMemory(VkDevice device, guestBlob->wait(); } else if (mCaps.vulkanCapset.deferredMapping) { - createBlobInfo.blobId = ++mBlobId; + createBlobInfo.blobId = ++mAtomicId; createBlobInfo.blobMem = kBlobMemHost3d; vk_append_struct(&structChainIter, &createBlobInfo); } @@ -3819,7 +3819,7 @@ VkResult ResourceTracker::on_vkAllocateMemory(void* context, VkResult input_resu create3d.format = virglFormat; create3d.width = imageCreateInfo.extent.width; create3d.height = imageCreateInfo.extent.height; - create3d.blobId = ++mBlobId; + create3d.blobId = ++mAtomicId; createBlob.blobCmd = reinterpret_cast(&create3d); createBlob.blobCmdSize = sizeof(create3d); @@ -3883,7 +3883,7 @@ VkResult ResourceTracker::on_vkAllocateMemory(void* context, VkResult input_resu create3d.format = virglFormat; create3d.width = width; create3d.height = height; - create3d.blobId = ++mBlobId; + create3d.blobId = ++mAtomicId; createBlob.blobCmd = reinterpret_cast(&create3d); createBlob.blobCmdSize = sizeof(create3d); diff --git a/src/gfxstream/guest/vulkan_enc/ResourceTracker.h b/src/gfxstream/guest/vulkan_enc/ResourceTracker.h index 005887b8157..a7ef4d68c50 100644 --- a/src/gfxstream/guest/vulkan_enc/ResourceTracker.h +++ b/src/gfxstream/guest/vulkan_enc/ResourceTracker.h @@ -892,7 +892,7 @@ class ResourceTracker { std::vector mHostDeviceExtensions; // 32 bits only for now, upper bits may be used later. - std::atomic mBlobId = 0; + std::atomic mAtomicId = 0; #if defined(VK_USE_PLATFORM_ANDROID_KHR) || defined(__linux__) int mSyncDeviceFd = -1; #endif