Reland^2: Use "gfxstream" namespace
This reverts commit d37d7c8c0cdf6b84d453cb41e358094880a8f3b5.
Reland adds in aosp/2516595 which was only built on the "full"
target and removes namespace around window methods to satisfy
MacOS build.
Bug: b/271464937
Test: android build
Test: cmake build
Test: ATP MacOS build
Change-Id: Ida36ac16f9c3b98aedd744d21c9b27e9063a8eea
diff --git a/stream-servers/vulkan/BufferVk.cpp b/stream-servers/vulkan/BufferVk.cpp
index 9de53c2..46f4540 100644
--- a/stream-servers/vulkan/BufferVk.cpp
+++ b/stream-servers/vulkan/BufferVk.cpp
@@ -17,11 +17,11 @@
#include "VkCommonOperations.h"
namespace gfxstream {
+namespace vk {
/*static*/
std::unique_ptr<BufferVk> BufferVk::create(uint32_t handle, uint64_t size, bool vulkanOnly) {
- if (!goldfish_vk::setupVkBuffer(size, handle, vulkanOnly,
- VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT)) {
+ if (!setupVkBuffer(size, handle, vulkanOnly, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT)) {
ERR("Failed to create BufferVk:%d", handle);
return nullptr;
}
@@ -32,17 +32,18 @@
BufferVk::BufferVk(uint32_t handle) : mHandle(handle) {}
BufferVk::~BufferVk() {
- if (!goldfish_vk::teardownVkBuffer(mHandle)) {
+ if (!teardownVkBuffer(mHandle)) {
ERR("Failed to destroy BufferVk:%d", mHandle);
}
}
void BufferVk::readToBytes(uint64_t offset, uint64_t size, void* outBytes) {
- goldfish_vk::readBufferToBytes(mHandle, offset, size, outBytes);
+ readBufferToBytes(mHandle, offset, size, outBytes);
}
bool BufferVk::updateFromBytes(uint64_t offset, uint64_t size, const void* bytes) {
- return goldfish_vk::updateBufferFromBytes(mHandle, offset, size, bytes);
+ return updateBufferFromBytes(mHandle, offset, size, bytes);
}
+} // namespace vk
} // namespace gfxstream
\ No newline at end of file
