Merge "Revert "Use "gfxstream" namespace""
diff --git a/system/GLESv1_enc/gl_client_context.h b/system/GLESv1_enc/gl_client_context.h
index 322972d..8e341d3 100644
--- a/system/GLESv1_enc/gl_client_context.h
+++ b/system/GLESv1_enc/gl_client_context.h
@@ -308,8 +308,8 @@
typedef gl_client_context_t *CONTEXT_ACCESSOR_TYPE(void);
static void setContextAccessor(CONTEXT_ACCESSOR_TYPE *f);
int initDispatchByName( void *(*getProc)(const char *name, void *userData), void *userData);
- virtual void setError(unsigned int error){ (void)error; }
- virtual unsigned int getError(){ return 0; }
+ virtual void setError(unsigned int error){ (void)error; };
+ virtual unsigned int getError(){ return 0; };
};
#endif
diff --git a/system/GLESv2_enc/gl2_client_context.h b/system/GLESv2_enc/gl2_client_context.h
index 97aab33..a4911d1 100644
--- a/system/GLESv2_enc/gl2_client_context.h
+++ b/system/GLESv2_enc/gl2_client_context.h
@@ -454,8 +454,8 @@
typedef gl2_client_context_t *CONTEXT_ACCESSOR_TYPE(void);
static void setContextAccessor(CONTEXT_ACCESSOR_TYPE *f);
int initDispatchByName( void *(*getProc)(const char *name, void *userData), void *userData);
- virtual void setError(unsigned int error){ (void)error; }
- virtual unsigned int getError(){ return 0; }
+ virtual void setError(unsigned int error){ (void)error; };
+ virtual unsigned int getError(){ return 0; };
};
#endif
diff --git a/system/GLESv2_enc/gl2_enc.cpp b/system/GLESv2_enc/gl2_enc.cpp
index 3bc0162..7978732 100644
--- a/system/GLESv2_enc/gl2_enc.cpp
+++ b/system/GLESv2_enc/gl2_enc.cpp
@@ -7712,6 +7712,7 @@
if (useChecksum) checksumCalculator->addBuffer(buf, ptr-buf);
if (useChecksum) checksumCalculator->writeChecksum(ptr, checksumSize); ptr += checksumSize;
+ stream->flush();
}
diff --git a/system/OpenglSystemCommon/HostConnection.cpp b/system/OpenglSystemCommon/HostConnection.cpp
index f52e84e..d42ecf4 100644
--- a/system/OpenglSystemCommon/HostConnection.cpp
+++ b/system/OpenglSystemCommon/HostConnection.cpp
@@ -68,15 +68,13 @@
#include "VkEncoder.h"
#include "AddressSpaceStream.h"
#else
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
struct VkEncoder {
VkEncoder(IOStream* stream, HealthMonitor<>* healthMonitor = nullptr) { }
void decRef() { }
int placeholder;
};
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
class QemuPipeStream;
typedef QemuPipeStream AddressSpaceStream;
AddressSpaceStream* createAddressSpaceStream(size_t bufSize, HealthMonitor<>* healthMonitor) {
@@ -89,7 +87,7 @@
}
#endif
-using gfxstream::vk::VkEncoder;
+using goldfish_vk::VkEncoder;
#include "ProcessPipe.h"
#include "QemuPipeStream.h"
diff --git a/system/OpenglSystemCommon/HostConnection.h b/system/OpenglSystemCommon/HostConnection.h
index 64f0137..34639cd 100644
--- a/system/OpenglSystemCommon/HostConnection.h
+++ b/system/OpenglSystemCommon/HostConnection.h
@@ -43,11 +43,9 @@
class GL2Encoder;
struct gl2_client_context_t;
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
class VkEncoder;
-} // namespace vk
-} // namespace gfxstream
+}
// ExtendedRCEncoderContext is an extended version of renderControl_encoder_context_t
// that will be used to track available emulator features.
@@ -188,7 +186,7 @@
GLEncoder *glEncoder();
GL2Encoder *gl2Encoder();
- gfxstream::vk::VkEncoder *vkEncoder();
+ goldfish_vk::VkEncoder *vkEncoder();
ExtendedRCEncoderContext *rcEncoder();
int getRendernodeFd() { return m_rendernodeFd; }
@@ -274,7 +272,7 @@
std::unique_ptr<GL2Encoder> m_gl2Enc;
// intrusively refcounted
- gfxstream::vk::VkEncoder* m_vkEnc = nullptr;
+ goldfish_vk::VkEncoder* m_vkEnc = nullptr;
std::unique_ptr<ExtendedRCEncoderContext> m_rcEnc;
ChecksumCalculator m_checksumHelper;
diff --git a/system/vulkan/goldfish_vulkan.cpp b/system/vulkan/goldfish_vulkan.cpp
index 1985cbb..c6f5650 100644
--- a/system/vulkan/goldfish_vulkan.cpp
+++ b/system/vulkan/goldfish_vulkan.cpp
@@ -367,7 +367,7 @@
ALOGE("vulkan: Failed to get renderControl encoder context\n"); \
return ret; \
} \
- gfxstream::vk::ResourceTracker::ThreadingCallbacks threadingCallbacks = { \
+ goldfish_vk::ResourceTracker::ThreadingCallbacks threadingCallbacks = { \
[] { \
auto hostCon = HostConnection::get(); \
hostCon->rcEncoder(); \
@@ -375,11 +375,11 @@
}, \
[](HostConnection* hostCon) { return hostCon->vkEncoder(); }, \
}; \
- gfxstream::vk::ResourceTracker::get()->setThreadingCallbacks(threadingCallbacks); \
- gfxstream::vk::ResourceTracker::get()->setupFeatures(rcEnc->featureInfo_const()); \
- gfxstream::vk::ResourceTracker::get()->setSeqnoPtr(getSeqnoPtrForProcess()); \
- auto hostSupportsVulkan = gfxstream::vk::ResourceTracker::get()->hostSupportsVulkan(); \
- gfxstream::vk::VkEncoder *vkEnc = hostCon->vkEncoder(); \
+ goldfish_vk::ResourceTracker::get()->setThreadingCallbacks(threadingCallbacks); \
+ goldfish_vk::ResourceTracker::get()->setupFeatures(rcEnc->featureInfo_const()); \
+ goldfish_vk::ResourceTracker::get()->setSeqnoPtr(getSeqnoPtrForProcess()); \
+ auto hostSupportsVulkan = goldfish_vk::ResourceTracker::get()->hostSupportsVulkan(); \
+ goldfish_vk::VkEncoder *vkEnc = hostCon->vkEncoder(); \
if (!vkEnc) { \
ALOGE("vulkan: Failed to get Vulkan encoder\n"); \
return ret; \
@@ -405,7 +405,7 @@
layer_name);
}
- VkResult res = gfxstream::vk::ResourceTracker::get()->on_vkEnumerateInstanceExtensionProperties(
+ VkResult res = goldfish_vk::ResourceTracker::get()->on_vkEnumerateInstanceExtensionProperties(
vkEnc, VK_SUCCESS, layer_name, count, properties);
return res;
@@ -442,7 +442,7 @@
return vkstubhal::GetMemoryZirconHandleFUCHSIA(device, pInfo, pHandle);
}
- VkResult res = gfxstream::vk::ResourceTracker::get()->
+ VkResult res = goldfish_vk::ResourceTracker::get()->
on_vkGetMemoryZirconHandleFUCHSIA(
vkEnc, VK_SUCCESS,
device, pInfo, pHandle);
@@ -465,7 +465,7 @@
device, handleType, handle, pProperties);
}
- VkResult res = gfxstream::vk::ResourceTracker::get()->
+ VkResult res = goldfish_vk::ResourceTracker::get()->
on_vkGetMemoryZirconHandlePropertiesFUCHSIA(
vkEnc, VK_SUCCESS, device, handleType, handle, pProperties);
@@ -485,7 +485,7 @@
return vkstubhal::GetSemaphoreZirconHandleFUCHSIA(device, pInfo, pHandle);
}
- VkResult res = gfxstream::vk::ResourceTracker::get()->
+ VkResult res = goldfish_vk::ResourceTracker::get()->
on_vkGetSemaphoreZirconHandleFUCHSIA(
vkEnc, VK_SUCCESS, device, pInfo, pHandle);
@@ -504,7 +504,7 @@
return vkstubhal::ImportSemaphoreZirconHandleFUCHSIA(device, pInfo);
}
- VkResult res = gfxstream::vk::ResourceTracker::get()->
+ VkResult res = goldfish_vk::ResourceTracker::get()->
on_vkImportSemaphoreZirconHandleFUCHSIA(
vkEnc, VK_SUCCESS, device, pInfo);
@@ -527,7 +527,7 @@
}
VkResult res =
- gfxstream::vk::ResourceTracker::get()->on_vkCreateBufferCollectionFUCHSIA(
+ goldfish_vk::ResourceTracker::get()->on_vkCreateBufferCollectionFUCHSIA(
vkEnc, VK_SUCCESS, device, pInfo, pAllocator, pCollection);
return res;
@@ -547,7 +547,7 @@
return;
}
- gfxstream::vk::ResourceTracker::get()->on_vkDestroyBufferCollectionFUCHSIA(
+ goldfish_vk::ResourceTracker::get()->on_vkDestroyBufferCollectionFUCHSIA(
vkEnc, VK_SUCCESS, device, collection, pAllocator);
}
@@ -567,7 +567,7 @@
}
VkResult res =
- gfxstream::vk::ResourceTracker::get()
+ goldfish_vk::ResourceTracker::get()
->on_vkSetBufferCollectionBufferConstraintsFUCHSIA(
vkEnc, VK_SUCCESS, device, collection, pBufferConstraintsInfo);
@@ -590,7 +590,7 @@
}
VkResult res =
- gfxstream::vk::ResourceTracker::get()
+ goldfish_vk::ResourceTracker::get()
->on_vkSetBufferCollectionImageConstraintsFUCHSIA(
vkEnc, VK_SUCCESS, device, collection, pImageConstraintsInfo);
@@ -611,7 +611,7 @@
device, collection, pProperties);
}
- VkResult res = gfxstream::vk::ResourceTracker::get()
+ VkResult res = goldfish_vk::ResourceTracker::get()
->on_vkGetBufferCollectionPropertiesFUCHSIA(
vkEnc, VK_SUCCESS, device, collection, pProperties);
@@ -716,7 +716,7 @@
if (!sQueueSignalReleaseImageAndroidImpl) {
sQueueSignalReleaseImageAndroidImpl =
(PFN_vkVoidFunction)(
- gfxstream::vk::goldfish_vulkan_get_device_proc_address(device, "vkQueueSignalReleaseImageANDROID"));
+ goldfish_vk::goldfish_vulkan_get_device_proc_address(device, "vkQueueSignalReleaseImageANDROID"));
}
return (PFN_vkVoidFunction)QueueSignalReleaseImageANDROID;
}
@@ -724,7 +724,7 @@
if (!strcmp(name, "vkGetDeviceProcAddr")) {
return (PFN_vkVoidFunction)(GetDeviceProcAddr);
}
- return (PFN_vkVoidFunction)(gfxstream::vk::goldfish_vulkan_get_device_proc_address(device, name));
+ return (PFN_vkVoidFunction)(goldfish_vk::goldfish_vulkan_get_device_proc_address(device, name));
}
VKAPI_ATTR
@@ -751,12 +751,12 @@
if (!sQueueSignalReleaseImageAndroidImpl) {
sQueueSignalReleaseImageAndroidImpl =
(PFN_vkVoidFunction)(
- gfxstream::vk::goldfish_vulkan_get_instance_proc_address(instance, "vkQueueSignalReleaseImageANDROID"));
+ goldfish_vk::goldfish_vulkan_get_instance_proc_address(instance, "vkQueueSignalReleaseImageANDROID"));
}
return (PFN_vkVoidFunction)QueueSignalReleaseImageANDROID;
}
#endif
- return (PFN_vkVoidFunction)(gfxstream::vk::goldfish_vulkan_get_instance_proc_address(instance, name));
+ return (PFN_vkVoidFunction)(goldfish_vk::goldfish_vulkan_get_instance_proc_address(instance, name));
}
#ifdef VK_USE_PLATFORM_ANDROID_KHR
@@ -780,7 +780,7 @@
if (strcmp(id, HWVULKAN_DEVICE_0) == 0) {
*device = &goldfish_vulkan_device.common;
- gfxstream::vk::ResourceTracker::get();
+ goldfish_vk::ResourceTracker::get();
return 0;
}
return -ENOENT;
@@ -793,7 +793,7 @@
VulkanDevice() : mHostSupportsGoldfish(IsAccessible(QEMU_PIPE_PATH)) {
InitLogger();
InitTraceProvider();
- gfxstream::vk::ResourceTracker::get();
+ goldfish_vk::ResourceTracker::get();
}
static void InitLogger();
@@ -915,7 +915,7 @@
class VulkanDevice {
public:
VulkanDevice() {
- gfxstream::vk::ResourceTracker::get();
+ goldfish_vk::ResourceTracker::get();
}
static VulkanDevice& GetInstance() {
diff --git a/system/vulkan_enc/AndroidHardwareBuffer.cpp b/system/vulkan_enc/AndroidHardwareBuffer.cpp
index f31c04d..057b7e7 100644
--- a/system/vulkan_enc/AndroidHardwareBuffer.cpp
+++ b/system/vulkan_enc/AndroidHardwareBuffer.cpp
@@ -27,8 +27,7 @@
#include "vk_util.h"
#include <assert.h>
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
// From Intel ANV implementation.
/* Construct ahw usage mask from image usage bits, see
@@ -343,5 +342,4 @@
return VK_SUCCESS;
}
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/AndroidHardwareBuffer.h b/system/vulkan_enc/AndroidHardwareBuffer.h
index 9c9cb94..2a6e182 100644
--- a/system/vulkan_enc/AndroidHardwareBuffer.h
+++ b/system/vulkan_enc/AndroidHardwareBuffer.h
@@ -24,8 +24,7 @@
class Gralloc;
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
uint64_t
getAndroidHardwareBufferUsageFromVkUsage(
@@ -59,5 +58,4 @@
VkDeviceSize allocationInfoAllocSize,
struct AHardwareBuffer **out);
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/CommandBufferStagingStream.cpp b/system/vulkan_enc/CommandBufferStagingStream.cpp
index ae23410..8487bcd 100644
--- a/system/vulkan_enc/CommandBufferStagingStream.cpp
+++ b/system/vulkan_enc/CommandBufferStagingStream.cpp
@@ -33,9 +33,6 @@
static const size_t kReadSize = 512 * 1024;
static const size_t kWriteOffset = kReadSize;
-namespace gfxstream {
-namespace vk {
-
CommandBufferStagingStream::CommandBufferStagingStream()
: IOStream(1048576), m_size(0), m_writePos(0) {
// use default allocators
@@ -251,7 +248,4 @@
IOStream::rewind();
}
-VkDeviceMemory CommandBufferStagingStream::getDeviceMemory() { return m_mem.deviceMemory; }
-
-} // namespace vk
-} // namespace gfxstream
+VkDeviceMemory CommandBufferStagingStream::getDeviceMemory() { return m_mem.deviceMemory; }
\ No newline at end of file
diff --git a/system/vulkan_enc/CommandBufferStagingStream.h b/system/vulkan_enc/CommandBufferStagingStream.h
index 9aa9e96..2742e20 100644
--- a/system/vulkan_enc/CommandBufferStagingStream.h
+++ b/system/vulkan_enc/CommandBufferStagingStream.h
@@ -22,9 +22,6 @@
#include "IOStream.h"
-namespace gfxstream {
-namespace vk {
-
class CommandBufferStagingStream : public IOStream {
public:
// host will write kSyncDataReadComplete to the sync bytes to indicate memory is no longer being
@@ -113,7 +110,4 @@
unsigned char* getDataPtr();
};
-} // namespace vk
-} // namespace gfxstream
-
#endif
diff --git a/system/vulkan_enc/DescriptorSetVirtualization.cpp b/system/vulkan_enc/DescriptorSetVirtualization.cpp
index 0cc6826..94c9df8 100644
--- a/system/vulkan_enc/DescriptorSetVirtualization.cpp
+++ b/system/vulkan_enc/DescriptorSetVirtualization.cpp
@@ -15,8 +15,7 @@
#include "DescriptorSetVirtualization.h"
#include "Resources.h"
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
void clearReifiedDescriptorSet(ReifiedDescriptorSet* set) {
set->pool = VK_NULL_HANDLE;
@@ -495,5 +494,4 @@
return toClear;
}
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/DescriptorSetVirtualization.h b/system/vulkan_enc/DescriptorSetVirtualization.h
index 15e4226..ecb6c48 100644
--- a/system/vulkan_enc/DescriptorSetVirtualization.h
+++ b/system/vulkan_enc/DescriptorSetVirtualization.h
@@ -21,8 +21,7 @@
#include <unordered_set>
#include <vector>
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
enum DescriptorWriteType {
Empty = 0,
@@ -149,5 +148,4 @@
std::vector<VkDescriptorSet> clearDescriptorPool(VkDescriptorPool pool, bool usePoolIds);
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/HostVisibleMemoryVirtualization.cpp b/system/vulkan_enc/HostVisibleMemoryVirtualization.cpp
index 5f3b23a..5707170 100644
--- a/system/vulkan_enc/HostVisibleMemoryVirtualization.cpp
+++ b/system/vulkan_enc/HostVisibleMemoryVirtualization.cpp
@@ -26,8 +26,7 @@
using android::base::guest::SubAllocator;
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
bool isHostVisible(const VkPhysicalDeviceMemoryProperties* memoryProps, uint32_t index) {
return memoryProps->memoryTypes[index].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
@@ -69,5 +68,4 @@
return true;
}
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/HostVisibleMemoryVirtualization.h b/system/vulkan_enc/HostVisibleMemoryVirtualization.h
index eaef30e..272e51a 100644
--- a/system/vulkan_enc/HostVisibleMemoryVirtualization.h
+++ b/system/vulkan_enc/HostVisibleMemoryVirtualization.h
@@ -32,8 +32,7 @@
#include "VirtGpu.h"
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
bool isHostVisible(const VkPhysicalDeviceMemoryProperties* memoryProps, uint32_t index);
@@ -67,5 +66,4 @@
using CoherentMemoryPtr = std::shared_ptr<CoherentMemory>;
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index d5e3645..023cca1 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -144,8 +144,7 @@
using android::base::guest::Lock;
using android::base::guest::WorkPool;
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
#define MAKE_HANDLE_MAPPING_FOREACH(type_name, map_impl, map_to_u64_impl, map_from_u64_impl) \
void mapHandles_##type_name(type_name* handles, size_t count) override { \
@@ -8376,5 +8375,4 @@
LIST_TRIVIAL_TRANSFORMED_TYPES(DEFINE_TRANSFORMED_TYPE_IMPL)
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/ResourceTracker.h b/system/vulkan_enc/ResourceTracker.h
index 8df5797..2cb5b2a 100644
--- a/system/vulkan_enc/ResourceTracker.h
+++ b/system/vulkan_enc/ResourceTracker.h
@@ -29,8 +29,7 @@
class HostConnection;
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
class VkEncoder;
@@ -680,5 +679,4 @@
std::unique_ptr<Impl> mImpl;
};
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/Resources.cpp b/system/vulkan_enc/Resources.cpp
index 229c675..041b00b 100644
--- a/system/vulkan_enc/Resources.cpp
+++ b/system/vulkan_enc/Resources.cpp
@@ -182,8 +182,7 @@
} // extern "C"
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
void appendObject(struct goldfish_vk_object_list** begin, void* val) {
D("for %p", val);
@@ -262,5 +261,4 @@
}
}
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/Resources.h b/system/vulkan_enc/Resources.h
index 4b47300..17043ca 100644
--- a/system/vulkan_enc/Resources.h
+++ b/system/vulkan_enc/Resources.h
@@ -22,14 +22,12 @@
#include <functional>
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
class VkEncoder;
struct DescriptorPoolAllocationInfo;
struct ReifiedDescriptorSet;
struct DescriptorSetLayoutInfo;
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
class IOStream;
@@ -44,9 +42,9 @@
struct goldfish_##type { \
hwvulkan_dispatch_t dispatch; \
uint64_t underlying; \
- gfxstream::vk::VkEncoder* lastUsedEncoder; \
+ goldfish_vk::VkEncoder* lastUsedEncoder; \
uint32_t sequenceNumber; \
- gfxstream::vk::VkEncoder* privateEncoder; \
+ goldfish_vk::VkEncoder* privateEncoder; \
IOStream* privateStream; \
uint32_t flags; \
struct goldfish_vk_object_list* poolObjects; \
@@ -105,25 +103,25 @@
struct goldfish_VkDescriptorPool {
uint64_t underlying;
- gfxstream::vk::DescriptorPoolAllocationInfo* allocInfo;
+ goldfish_vk::DescriptorPoolAllocationInfo* allocInfo;
};
struct goldfish_VkDescriptorSet {
uint64_t underlying;
- gfxstream::vk::ReifiedDescriptorSet* reified;
+ goldfish_vk::ReifiedDescriptorSet* reified;
};
struct goldfish_VkDescriptorSetLayout {
uint64_t underlying;
- gfxstream::vk::DescriptorSetLayoutInfo* layoutInfo;
+ goldfish_vk::DescriptorSetLayoutInfo* layoutInfo;
};
struct goldfish_VkCommandBuffer {
hwvulkan_dispatch_t dispatch;
uint64_t underlying;
- gfxstream::vk::VkEncoder* lastUsedEncoder;
+ goldfish_vk::VkEncoder* lastUsedEncoder;
uint32_t sequenceNumber;
- gfxstream::vk::VkEncoder* privateEncoder;
+ goldfish_vk::VkEncoder* privateEncoder;
IOStream* privateStream;
uint32_t flags;
struct goldfish_vk_object_list* poolObjects;
@@ -136,13 +134,11 @@
} // extern "C"
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
void appendObject(struct goldfish_vk_object_list** begin, void* val);
void eraseObject(struct goldfish_vk_object_list** begin, void* val);
void eraseObjects(struct goldfish_vk_object_list** begin);
void forAllObjects(struct goldfish_vk_object_list* begin, std::function<void(void*)> func);
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/Validation.cpp b/system/vulkan_enc/Validation.cpp
index 3b75786..e50fa27 100644
--- a/system/vulkan_enc/Validation.cpp
+++ b/system/vulkan_enc/Validation.cpp
@@ -16,8 +16,7 @@
#include "Resources.h"
#include "ResourceTracker.h"
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
VkResult Validation::on_vkFlushMappedMemoryRanges(
void*,
@@ -55,5 +54,4 @@
return VK_SUCCESS;
}
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/Validation.h b/system/vulkan_enc/Validation.h
index 0dfd2d3..f006633 100644
--- a/system/vulkan_enc/Validation.h
+++ b/system/vulkan_enc/Validation.h
@@ -15,8 +15,7 @@
#include <vulkan/vulkan.h>
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
class Validation {
public:
@@ -34,5 +33,4 @@
const VkMappedMemoryRange* pMemoryRanges);
};
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/VkEncoder.cpp b/system/vulkan_enc/VkEncoder.cpp
index 8ee3aa9..6f70fb0 100644
--- a/system/vulkan_enc/VkEncoder.cpp
+++ b/system/vulkan_enc/VkEncoder.cpp
@@ -56,10 +56,9 @@
#include "goldfish_vk_reserved_marshaling_guest.h"
#include "goldfish_vk_transform_guest.h"
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
-using namespace gfxstream::vk;
+using namespace goldfish_vk;
using android::base::BumpPool;
using android::base::guest::AutoLock;
@@ -64119,5 +64118,4 @@
#ifdef VK_KHR_ray_query
#endif
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/VkEncoder.h b/system/vulkan_enc/VkEncoder.h
index 4e0b762..e5a66db 100644
--- a/system/vulkan_enc/VkEncoder.h
+++ b/system/vulkan_enc/VkEncoder.h
@@ -38,8 +38,7 @@
#include "vulkan_gfxstream.h"
class IOStream;
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
using android::base::guest::HealthMonitor;
@@ -2150,5 +2149,4 @@
HealthMonitor<>* mHealthMonitor;
};
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/VulkanHandleMapping.cpp b/system/vulkan_enc/VulkanHandleMapping.cpp
index 068e666..649244f 100644
--- a/system/vulkan_enc/VulkanHandleMapping.cpp
+++ b/system/vulkan_enc/VulkanHandleMapping.cpp
@@ -16,8 +16,7 @@
#include "VulkanHandleMapping.h"
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
#define DEFAULT_HANDLE_MAP_DEFINE(type) \
void DefaultHandleMapping::mapHandles_##type(type*, size_t) { return; } \
@@ -30,6 +29,5 @@
GOLDFISH_VK_LIST_HANDLE_TYPES(DEFAULT_HANDLE_MAP_DEFINE)
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/VulkanHandleMapping.h b/system/vulkan_enc/VulkanHandleMapping.h
index 7c7fdbc..5c03d7f 100644
--- a/system/vulkan_enc/VulkanHandleMapping.h
+++ b/system/vulkan_enc/VulkanHandleMapping.h
@@ -18,8 +18,7 @@
#include "VulkanHandles.h"
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
class VulkanHandleMapping {
public:
@@ -46,5 +45,4 @@
GOLDFISH_VK_LIST_HANDLE_TYPES(DECLARE_HANDLE_MAP_OVERRIDE)
};
-} // namespace vk
-} // namespace gfxstream
\ No newline at end of file
+} // namespace goldfish_vk
\ No newline at end of file
diff --git a/system/vulkan_enc/VulkanHandles.h b/system/vulkan_enc/VulkanHandles.h
index 1c1cbc3..205e7e5 100644
--- a/system/vulkan_enc/VulkanHandles.h
+++ b/system/vulkan_enc/VulkanHandles.h
@@ -16,9 +16,6 @@
#include <vulkan/vulkan.h>
-namespace gfxstream {
-namespace vk {
-
#define GOLDFISH_VK_LIST_TRIVIAL_DISPATCHABLE_HANDLE_TYPES(f) \
f(VkPhysicalDevice) \
@@ -168,5 +165,3 @@
f(VkDescriptorSetLayout) \
f(VkDescriptorSet) \
-} // namespace vk
-} // namespace gfxstream
diff --git a/system/vulkan_enc/VulkanStreamGuest.cpp b/system/vulkan_enc/VulkanStreamGuest.cpp
index 3c11670..fedc826 100644
--- a/system/vulkan_enc/VulkanStreamGuest.cpp
+++ b/system/vulkan_enc/VulkanStreamGuest.cpp
@@ -13,8 +13,7 @@
// limitations under the License.
#include "VulkanStreamGuest.h"
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
VulkanStreamGuest::VulkanStreamGuest(IOStream *stream): mStream(stream) {
unsetHandleMapping();
@@ -32,7 +31,7 @@
*ptrAddr = nullptr;
return;
}
-
+
*ptrAddr = mPool.alloc(bytes);
}
@@ -172,5 +171,4 @@
m_read = 0;
}
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/VulkanStreamGuest.h b/system/vulkan_enc/VulkanStreamGuest.h
index 48c5a61..fd73880 100644
--- a/system/vulkan_enc/VulkanStreamGuest.h
+++ b/system/vulkan_enc/VulkanStreamGuest.h
@@ -34,8 +34,7 @@
class IOStream;
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
class VulkanStreamGuest : public android::base::Stream {
public:
@@ -59,7 +58,7 @@
ssize_t read(void *buffer, size_t size) override;
ssize_t write(const void *buffer, size_t size) override;
-
+
void writeLarge(const void* buffer, size_t size);
// Frees everything that got alloc'ed.
@@ -103,5 +102,4 @@
size_t m_read = 0;
};
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/func_table.cpp b/system/vulkan_enc/func_table.cpp
index 91cfb6d..7b5a27c 100644
--- a/system/vulkan_enc/func_table.cpp
+++ b/system/vulkan_enc/func_table.cpp
@@ -46,8 +46,7 @@
// implement them completely on the guest side.
#undef VK_KHR_android_surface
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
static void sOnInvalidDynamicallyCheckedCall(const char* apiname, const char* neededFeature) {
ALOGE("invalid call to %s: %s not supported", apiname, neededFeature);
@@ -15398,5 +15397,4 @@
return nullptr;
}
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/func_table.h b/system/vulkan_enc/func_table.h
index 6a04926..a7b7b66 100644
--- a/system/vulkan_enc/func_table.h
+++ b/system/vulkan_enc/func_table.h
@@ -33,9 +33,7 @@
#include "vulkan_gfxstream.h"
-namespace gfxstream {
-namespace vk {
-
+namespace goldfish_vk {
#ifdef VK_VERSION_1_0
#endif
#ifdef VK_VERSION_1_1
@@ -582,5 +580,4 @@
void* goldfish_vulkan_get_instance_proc_address(VkInstance instance, const char* name);
void* goldfish_vulkan_get_device_proc_address(VkDevice device, const char* name);
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/goldfish_vk_counting_guest.cpp b/system/vulkan_enc/goldfish_vk_counting_guest.cpp
index 77e05db..2a023a7 100644
--- a/system/vulkan_enc/goldfish_vk_counting_guest.cpp
+++ b/system/vulkan_enc/goldfish_vk_counting_guest.cpp
@@ -36,8 +36,7 @@
#include "goldfish_vk_extension_structs_guest.h"
#include "goldfish_vk_private_defs.h"
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
void count_extension_struct(uint32_t featureBits, VkStructureType rootType,
const void* structExtension, size_t* count);
@@ -17381,5 +17380,4 @@
}
}
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/goldfish_vk_counting_guest.h b/system/vulkan_enc/goldfish_vk_counting_guest.h
index 4de8da0..2e29028 100644
--- a/system/vulkan_enc/goldfish_vk_counting_guest.h
+++ b/system/vulkan_enc/goldfish_vk_counting_guest.h
@@ -35,9 +35,7 @@
#include "vk_platform_compat.h"
#include "vulkan_gfxstream.h"
-namespace gfxstream {
-namespace vk {
-
+namespace goldfish_vk {
#ifdef VK_VERSION_1_0
void count_VkExtent2D(uint32_t featureBits, VkStructureType rootType, const VkExtent2D* toCount,
size_t* count);
@@ -3572,5 +3570,4 @@
#endif
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/goldfish_vk_deepcopy_guest.cpp b/system/vulkan_enc/goldfish_vk_deepcopy_guest.cpp
index a9676c8..8d30be3 100644
--- a/system/vulkan_enc/goldfish_vk_deepcopy_guest.cpp
+++ b/system/vulkan_enc/goldfish_vk_deepcopy_guest.cpp
@@ -37,8 +37,7 @@
#include "goldfish_vk_private_defs.h"
#include "vk_util.h"
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
void deepcopy_extension_struct(Allocator* alloc, VkStructureType rootType,
const void* structExtension, void* structExtension_out);
@@ -21022,5 +21021,4 @@
}
}
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/goldfish_vk_deepcopy_guest.h b/system/vulkan_enc/goldfish_vk_deepcopy_guest.h
index 22de00f..679ddf0 100644
--- a/system/vulkan_enc/goldfish_vk_deepcopy_guest.h
+++ b/system/vulkan_enc/goldfish_vk_deepcopy_guest.h
@@ -44,9 +44,7 @@
#undef VK_KHR_android_surface
#undef VK_ANDROID_external_memory_android_hardware_buffer
-namespace gfxstream {
-namespace vk {
-
+namespace goldfish_vk {
#ifdef VK_VERSION_1_0
void deepcopy_VkExtent2D(Allocator* alloc, VkStructureType rootType, const VkExtent2D* from,
VkExtent2D* to);
@@ -3953,5 +3951,4 @@
#endif
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/goldfish_vk_extension_structs_guest.cpp b/system/vulkan_enc/goldfish_vk_extension_structs_guest.cpp
index 6e780ba..aef23e9 100644
--- a/system/vulkan_enc/goldfish_vk_extension_structs_guest.cpp
+++ b/system/vulkan_enc/goldfish_vk_extension_structs_guest.cpp
@@ -31,8 +31,7 @@
#include "goldfish_vk_extension_structs_guest.h"
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
#ifdef VK_VERSION_1_0
#endif
@@ -3425,5 +3424,4 @@
}
}
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/goldfish_vk_extension_structs_guest.h b/system/vulkan_enc/goldfish_vk_extension_structs_guest.h
index 8a84de5..67d83d7 100644
--- a/system/vulkan_enc/goldfish_vk_extension_structs_guest.h
+++ b/system/vulkan_enc/goldfish_vk_extension_structs_guest.h
@@ -41,9 +41,7 @@
#undef VK_KHR_android_surface
#undef VK_ANDROID_external_memory_android_hardware_buffer
-namespace gfxstream {
-namespace vk {
-
+namespace goldfish_vk {
uint32_t goldfish_vk_struct_type(const void* structExtension);
size_t goldfish_vk_extension_struct_size(VkStructureType rootType, const void* structExtension);
@@ -595,5 +593,4 @@
#ifdef VK_KHR_ray_query
#endif
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/goldfish_vk_handlemap_guest.cpp b/system/vulkan_enc/goldfish_vk_handlemap_guest.cpp
index f3042ed..21eee10 100644
--- a/system/vulkan_enc/goldfish_vk_handlemap_guest.cpp
+++ b/system/vulkan_enc/goldfish_vk_handlemap_guest.cpp
@@ -36,8 +36,7 @@
#include "goldfish_vk_extension_structs_guest.h"
#include "goldfish_vk_private_defs.h"
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
void handlemap_extension_struct(VulkanHandleMapping* handlemap, void* structExtension_out);
@@ -10575,5 +10574,4 @@
}
}
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/goldfish_vk_handlemap_guest.h b/system/vulkan_enc/goldfish_vk_handlemap_guest.h
index bfc3090..a37c141 100644
--- a/system/vulkan_enc/goldfish_vk_handlemap_guest.h
+++ b/system/vulkan_enc/goldfish_vk_handlemap_guest.h
@@ -42,9 +42,7 @@
#undef VK_KHR_android_surface
#undef VK_ANDROID_external_memory_android_hardware_buffer
-namespace gfxstream {
-namespace vk {
-
+namespace goldfish_vk {
#ifdef VK_VERSION_1_0
void handlemap_VkExtent2D(VulkanHandleMapping* handlemap, VkExtent2D* toMap);
@@ -3007,5 +3005,4 @@
#endif
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/goldfish_vk_marshaling_guest.cpp b/system/vulkan_enc/goldfish_vk_marshaling_guest.cpp
index b24484f..3fb53d2 100644
--- a/system/vulkan_enc/goldfish_vk_marshaling_guest.cpp
+++ b/system/vulkan_enc/goldfish_vk_marshaling_guest.cpp
@@ -36,8 +36,7 @@
#include "goldfish_vk_extension_structs_guest.h"
#include "goldfish_vk_private_defs.h"
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
void marshal_extension_struct(VulkanStreamGuest* vkStream, VkStructureType rootType,
const void* structExtension);
@@ -33640,5 +33639,4 @@
}
}
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/goldfish_vk_marshaling_guest.h b/system/vulkan_enc/goldfish_vk_marshaling_guest.h
index 6098399..316e356 100644
--- a/system/vulkan_enc/goldfish_vk_marshaling_guest.h
+++ b/system/vulkan_enc/goldfish_vk_marshaling_guest.h
@@ -44,9 +44,7 @@
#undef VK_KHR_android_surface
#undef VK_ANDROID_external_memory_android_hardware_buffer
-namespace gfxstream {
-namespace vk {
-
+namespace goldfish_vk {
#ifdef VK_VERSION_1_0
void marshal_VkExtent2D(VulkanStreamGuest* vkStream, VkStructureType rootType,
const VkExtent2D* forMarshaling);
@@ -7023,5 +7021,4 @@
#define OP_vkFirst 200000000
#define OP_vkLast 300000000
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/goldfish_vk_reserved_marshaling_guest.cpp b/system/vulkan_enc/goldfish_vk_reserved_marshaling_guest.cpp
index 7cab997..2631f9b 100644
--- a/system/vulkan_enc/goldfish_vk_reserved_marshaling_guest.cpp
+++ b/system/vulkan_enc/goldfish_vk_reserved_marshaling_guest.cpp
@@ -37,8 +37,7 @@
#include "goldfish_vk_extension_structs_guest.h"
#include "goldfish_vk_private_defs.h"
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
void reservedmarshal_extension_struct(VulkanStreamGuest* vkStream, VkStructureType rootType,
const void* structExtension, uint8_t** ptr);
@@ -20281,5 +20280,4 @@
}
}
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/goldfish_vk_reserved_marshaling_guest.h b/system/vulkan_enc/goldfish_vk_reserved_marshaling_guest.h
index d35823d..1449dfd 100644
--- a/system/vulkan_enc/goldfish_vk_reserved_marshaling_guest.h
+++ b/system/vulkan_enc/goldfish_vk_reserved_marshaling_guest.h
@@ -44,9 +44,7 @@
#undef VK_KHR_android_surface
#undef VK_ANDROID_external_memory_android_hardware_buffer
-namespace gfxstream {
-namespace vk {
-
+namespace goldfish_vk {
#ifdef VK_VERSION_1_0
void reservedmarshal_VkExtent2D(VulkanStreamGuest* vkStream, VkStructureType rootType,
const VkExtent2D* forMarshaling, uint8_t** ptr);
@@ -3865,5 +3863,4 @@
#endif
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/goldfish_vk_transform_guest.cpp b/system/vulkan_enc/goldfish_vk_transform_guest.cpp
index ac4bffe..a5dab78 100644
--- a/system/vulkan_enc/goldfish_vk_transform_guest.cpp
+++ b/system/vulkan_enc/goldfish_vk_transform_guest.cpp
@@ -37,8 +37,7 @@
#include "goldfish_vk_extension_structs_guest.h"
#include "goldfish_vk_private_defs.h"
-namespace gfxstream {
-namespace vk {
+namespace goldfish_vk {
void transform_tohost_extension_struct(ResourceTracker* resourceTracker, void* structExtension_out);
@@ -20988,5 +20987,4 @@
}
}
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/goldfish_vk_transform_guest.h b/system/vulkan_enc/goldfish_vk_transform_guest.h
index fd0edca..acbf057 100644
--- a/system/vulkan_enc/goldfish_vk_transform_guest.h
+++ b/system/vulkan_enc/goldfish_vk_transform_guest.h
@@ -35,9 +35,7 @@
#include "vk_platform_compat.h"
#include "vulkan_gfxstream.h"
-namespace gfxstream {
-namespace vk {
-
+namespace goldfish_vk {
class ResourceTracker;
#define LIST_TRIVIAL_TRANSFORMED_TYPES(f) \
f(VkPhysicalDeviceExternalImageFormatInfo) \
@@ -5804,5 +5802,4 @@
#endif
-} // namespace vk
-} // namespace gfxstream
+} // namespace goldfish_vk
diff --git a/system/vulkan_enc/vk_format_info.h b/system/vulkan_enc/vk_format_info.h
index 9fbc82a..9bad41a 100644
--- a/system/vulkan_enc/vk_format_info.h
+++ b/system/vulkan_enc/vk_format_info.h
@@ -38,9 +38,6 @@
#include <vulkan/vulkan.h>
#include <vndk/hardware_buffer.h>
-namespace gfxstream {
-namespace vk {
-
/* See i915_private_android_types.h in minigbm. */
#define HAL_PIXEL_FORMAT_NV12_Y_TILED_INTEL 0x100
@@ -216,7 +213,4 @@
return aspects & VK_IMAGE_ASPECT_DEPTH_BIT;
}
-} // namespace vk
-} // namespace gfxstream
-
#endif /* VK_FORMAT_INFO_H */
diff --git a/system/vulkan_enc/vk_struct_id.h b/system/vulkan_enc/vk_struct_id.h
index ebc1001..32d6b86 100644
--- a/system/vulkan_enc/vk_struct_id.h
+++ b/system/vulkan_enc/vk_struct_id.h
@@ -18,9 +18,6 @@
#include "goldfish_vk_private_defs.h"
#include "vulkan_gfxstream.h"
-namespace gfxstream {
-namespace vk {
-
template <class T> struct vk_get_vk_struct_id;
#define REGISTER_VK_STRUCT_ID(T, ID) \
@@ -76,6 +73,3 @@
REGISTER_VK_STRUCT_ID(VkMemoryOpaqueCaptureAddressAllocateInfo, VK_STRUCTURE_TYPE_MEMORY_OPAQUE_CAPTURE_ADDRESS_ALLOCATE_INFO);
#undef REGISTER_VK_STRUCT_ID
-
-} // namespace vk
-} // namespace gfxstream
diff --git a/system/vulkan_enc/vk_util.h b/system/vulkan_enc/vk_util.h
index 2e3267f..160bf06 100644
--- a/system/vulkan_enc/vk_util.h
+++ b/system/vulkan_enc/vk_util.h
@@ -29,9 +29,6 @@
#include <stdlib.h>
#include "vk_struct_id.h"
-namespace gfxstream {
-namespace vk {
-
struct vk_struct_common {
VkStructureType sType;
struct vk_struct_common *pNext;
@@ -251,7 +248,4 @@
*i = vk_make_chain_iterator(vk_struct);
}
-} // namespace vk
-} // namespace gfxstream
-
#endif /* VK_UTIL_H */
