commit 11da85a6efaf2fca7551e9f5c0b489e42af4cea0
author Yilong Li <liyl@google.com> Mon Jan 25 16:13:59 2021 -0800
committer Yilong Li <liyl@google.com> Mon Jan 25 16:14:04 2021 -0800
tree 0835ee16cbdd2c151c6d8da48b2cbd4f436e8d44
parent ce2233f6e5c7f0cbd383382f1a0eec00a55170ca

fuchsia: Fix build

This fixes some other compiler and BUILD file errors.

Change-Id: Ifb90943b678089b505518d86d2510faadd295a80

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 4cdc047..9b1340c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -53,6 +53,8 @@
     "system/renderControl_enc/renderControl_enc.cpp",
     "system/renderControl_enc/renderControl_enc.h",
     "system/vulkan/goldfish_vulkan.cpp",
+    "system/vulkan_enc/CommandBufferStagingStream.cpp",
+    "system/vulkan_enc/CommandBufferStagingStream.h",
     "system/vulkan_enc/HostVisibleMemoryVirtualization.cpp",
     "system/vulkan_enc/HostVisibleMemoryVirtualization.h",
     "system/vulkan_enc/ResourceTracker.cpp",
@@ -69,12 +71,16 @@
     "system/vulkan_enc/VulkanStreamGuest.h",
     "system/vulkan_enc/func_table.cpp",
     "system/vulkan_enc/func_table.h",
+    "system/vulkan_enc/goldfish_vk_counting_guest.cpp",
+    "system/vulkan_enc/goldfish_vk_counting_guest.h",
     "system/vulkan_enc/goldfish_vk_deepcopy_guest.cpp",
     "system/vulkan_enc/goldfish_vk_deepcopy_guest.h",
     "system/vulkan_enc/goldfish_vk_extension_structs_guest.cpp",
     "system/vulkan_enc/goldfish_vk_extension_structs_guest.h",
     "system/vulkan_enc/goldfish_vk_marshaling_guest.cpp",
     "system/vulkan_enc/goldfish_vk_marshaling_guest.h",
+    "system/vulkan_enc/goldfish_vk_reserved_marshaling_guest.cpp",
+    "system/vulkan_enc/goldfish_vk_reserved_marshaling_guest.h",
     "system/vulkan_enc/goldfish_vk_transform_guest.cpp",
     "system/vulkan_enc/goldfish_vk_transform_guest.h",
   ]
@@ -127,7 +133,7 @@
       "shared/OpenglCodecCommon/goldfish_dma.h",
       "shared/qemupipe/qemu_pipe_common.cpp",
       "shared/qemupipe/qemu_pipe_guest.cpp",
-      "system/OpenglSystemCommon/QemuPipeStream.cpp"
+      "system/OpenglSystemCommon/QemuPipeStream.cpp",
     ]
     sources += [
       "fuchsia/fuchsia_stdio.cc",

system/vulkan_enc/ResourceTracker.cpp

diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index 7138c01..cb74edd 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -4807,7 +4807,7 @@
 
             std::vector<WorkPool::Task> tasks;
 
-            tasks.push_back([this, queue, externalFenceFdToSignal,
+            tasks.push_back([queue, externalFenceFdToSignal,
                              post_wait_events /* copy of zx handles */,
                              post_wait_sync_fds /* copy of sync fds */] {
                 auto hostConn = ResourceTracker::threadingCallbacks.hostConnectionGetFunc();
@@ -5590,7 +5590,7 @@
         }
 
         if (alsoResetPrimaries) {
-            forAllObjects(cb->superObjects, [this, cb, alsoResetPrimaries](void* obj) {
+            forAllObjects(cb->superObjects, [this, alsoResetPrimaries](void* obj) {
                 VkCommandBuffer superCommandBuffer = (VkCommandBuffer)obj;
                 struct goldfish_VkCommandBuffer* superCb = as_goldfish_VkCommandBuffer(superCommandBuffer);
                 this->resetCommandBufferStagingInfo(superCommandBuffer, alsoResetPrimaries);

system/vulkan_enc/VulkanStreamGuest.h

diff --git a/system/vulkan_enc/VulkanStreamGuest.h b/system/vulkan_enc/VulkanStreamGuest.h
index 66eded0..6d2dac1 100644
--- a/system/vulkan_enc/VulkanStreamGuest.h
+++ b/system/vulkan_enc/VulkanStreamGuest.h
@@ -78,7 +78,6 @@
     uint8_t* reserve(size_t size);
 private:
     android::base::BumpPool mPool;
-    size_t mWritePos = 0;
     std::vector<uint8_t> mWriteBuffer;
     IOStream* mStream = nullptr;
     DefaultHandleMapping mDefaultHandleMapping;