summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGurchetan Singh <gurchetansingh@chromium.org>2022-03-17 14:59:58 -0700
committerGurchetan Singh <gurchetansingh@google.com>2022-03-17 17:40:53 -0700
commitf3ad88958ab7ba213362ef4485c1aaebbe7611b0 (patch)
tree2b1a54390a5383b61fc5d184f9b06201d686274a
parentd8485dd8c27dc699cbca1d2d659b6cd3a2ca37b1 (diff)
downloadvulkan-cereal-f3ad88958ab7ba213362ef4485c1aaebbe7611b0.tar.gz
vulkan-cereal: VirglResId --> VirtioGpuResId
- Name change to better reflect meaning. BUG=202552093 TEST=run Cuttlefish Change-Id: Id4481a57f6b5e75cbec527fd890e76dfb4cb76cf
-rw-r--r--stream-servers/virtio-gpu-gfxstream-renderer.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/stream-servers/virtio-gpu-gfxstream-renderer.cpp b/stream-servers/virtio-gpu-gfxstream-renderer.cpp
index 69fcff27..3c821e9b 100644
--- a/stream-servers/virtio-gpu-gfxstream-renderer.cpp
+++ b/stream-servers/virtio-gpu-gfxstream-renderer.cpp
@@ -159,7 +159,7 @@ using android::emulation::HostmemIdMapping;
using emugl::ABORT_REASON_OTHER;
using emugl::FatalError;
-using VirglResId = uint32_t;
+using VirtioGpuResId = uint32_t;
static constexpr int kPipeTryAgain = -2;
@@ -1345,7 +1345,7 @@ public:
auto resourcesIt = mContextResources.find(ctxId);
if (resourcesIt == mContextResources.end()) {
- std::vector<VirglResId> ids;
+ std::vector<VirtioGpuResId> ids;
ids.push_back(resId);
mContextResources[ctxId] = ids;
} else {
@@ -1591,7 +1591,7 @@ private:
auto it = mContextResources.find(ctxId);
if (it == mContextResources.end()) return;
- std::vector<VirglResId> withoutRes;
+ std::vector<VirtioGpuResId> withoutRes;
for (auto resId : it->second) {
if (resId != toUnrefId) {
withoutRes.push_back(resId);
@@ -1624,9 +1624,9 @@ private:
const GoldfishPipeServiceOps* mServiceOps = nullptr;
std::unordered_map<VirtioGpuCtxId, PipeCtxEntry> mContexts;
- std::unordered_map<VirglResId, PipeResEntry> mResources;
- std::unordered_map<VirtioGpuCtxId, std::vector<VirglResId>> mContextResources;
- std::unordered_map<VirglResId, std::vector<VirtioGpuCtxId>> mResourceContexts;
+ std::unordered_map<VirtioGpuResId, PipeResEntry> mResources;
+ std::unordered_map<VirtioGpuCtxId, std::vector<VirtioGpuResId>> mContextResources;
+ std::unordered_map<VirtioGpuResId, std::vector<VirtioGpuCtxId>> mResourceContexts;
// For use with the async fence cb.
// When we wait for gpu or wait for gpu vulkan, the next (and subsequent)