commit 6d3d7b264a18383769eb7f41f28c391641cb9e53
author Jason Macnak <natsu@google.com> Mon Apr 01 16:48:53 2024 -0700
committer Jason Macnak <natsu@google.com> Tue Apr 02 15:45:37 2024 -0700
tree 513c0ad004cdca68b3d286929b67a9de2fdd88dd
parent 3255c6532814688a07b205b91d3c8e26180d573f

Rename VirtGpuBlob -> VirtGpuResource

... as this is more generic and "VirglBlob" is not actually a blob.

find . -type f -name "*.cpp" -print0 | \
    xargs -0 sed -i '' -e 's/VirtGpuBlob/VirtGpuResource/g'
find . -type f -name "*.h" -print0 | \
    xargs -0 sed -i '' -e 's/VirtGpuBlob/VirtGpuResource/g'
find . -type f -name "*.cpp" -print0 | \
    xargs -0 sed -i '' -e 's/createVirglBlob/createResource/g'
find . -type f -name "*.h" -print0 | \
    xargs -0 sed -i '' -e 's/createVirglBlob/createResource/g'

Bug: b/283005889
Test: cd hardware/google/gfxstream && mma
Change-Id: Ic3ecae7f692a6e22de183626f0dd8f69148edc33

guest/vulkan_enc/ResourceTracker.cpp

diff --git a/guest/vulkan_enc/ResourceTracker.cpp b/guest/vulkan_enc/ResourceTracker.cpp
index 7a568fd..dcbef3c 100644
--- a/guest/vulkan_enc/ResourceTracker.cpp
+++ b/guest/vulkan_enc/ResourceTracker.cpp
@@ -1342,7 +1342,7 @@
                                           VkDeviceSize allocationSize, uint8_t* ptr,
                                           uint32_t memoryTypeIndex, AHardwareBuffer* ahw,
                                           bool imported, zx_handle_t vmoHandle,
-                                          VirtGpuBlobPtr blobPtr) {
+                                          VirtGpuResourcePtr blobPtr) {
     AutoLock<RecursiveLock> lock(mLock);
     auto& info = info_VkDeviceMemory[memory];
 
@@ -2953,7 +2953,7 @@
                     return coherentMemory;
                 }
 
-                VirtGpuBlobMappingPtr mapping = blob->createMapping();
+                VirtGpuResourceMappingPtr mapping = blob->createMapping();
                 if (!mapping) {
                     ALOGE("Failed to create coherent memory: failed to create blob mapping.");
                     res = VK_ERROR_OUT_OF_DEVICE_MEMORY;
@@ -2979,7 +2979,7 @@
     VkMemoryAllocateFlagsInfo allocFlagsInfo;
     VkMemoryOpaqueCaptureAddressAllocateInfo opaqueCaptureAddressAllocInfo;
     VkCreateBlobGOOGLE createBlobInfo;
-    VirtGpuBlobPtr guestBlob = nullptr;
+    VirtGpuResourcePtr guestBlob = nullptr;
 
     memset(&createBlobInfo, 0, sizeof(struct VkCreateBlobGOOGLE));
     createBlobInfo.sType = VK_STRUCTURE_TYPE_CREATE_BLOB_GOOGLE;
@@ -3741,7 +3741,7 @@
     }
 #endif
 
-    VirtGpuBlobPtr colorBufferBlob = nullptr;
+    VirtGpuResourcePtr colorBufferBlob = nullptr;
 #if defined(__linux__) && !defined(VK_USE_PLATFORM_ANDROID_KHR)
     if (exportDmabuf) {
         VirtGpuDevice* instance = VirtGpuDevice::getInstance();
@@ -3776,8 +3776,8 @@
                       imageCreateInfo.format);
                 return VK_ERROR_FORMAT_NOT_SUPPORTED;
             }
-            colorBufferBlob = instance->createVirglBlob(imageCreateInfo.extent.width,
-                                                        imageCreateInfo.extent.height, virglFormat);
+            colorBufferBlob = instance->createResource(imageCreateInfo.extent.width,
+                                                       imageCreateInfo.extent.height, virglFormat);
             if (!colorBufferBlob) {
                 ALOGE("%s: Failed to create colorBuffer resource for Image memory\n", __func__);
                 return VK_ERROR_OUT_OF_DEVICE_MEMORY;
@@ -3798,8 +3798,8 @@
                 const auto& bufferInfo = it->second;
                 bufferCreateInfo = bufferInfo.createInfo;
             }
-            colorBufferBlob = instance->createVirglBlob(bufferCreateInfo.size / 4, 1,
-                                                        VIRGL_FORMAT_R8G8B8A8_UNORM);
+            colorBufferBlob =
+                instance->createResource(bufferCreateInfo.size / 4, 1, VIRGL_FORMAT_R8G8B8A8_UNORM);
             if (!colorBufferBlob) {
                 ALOGE("%s: Failed to create colorBuffer resource for Buffer memory\n", __func__);
                 return VK_ERROR_OUT_OF_DEVICE_MEMORY;
@@ -3952,7 +3952,7 @@
 
     if (info.blobId && !info.coherentMemory && !mCaps.params[kParamCreateGuestHandle]) {
         VkEncoder* enc = (VkEncoder*)context;
-        VirtGpuBlobMappingPtr mapping;
+        VirtGpuResourceMappingPtr mapping;
         VirtGpuDevice* instance = VirtGpuDevice::getInstance();
 
         uint64_t offset;