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/DisplaySurfaceVk.cpp b/stream-servers/vulkan/DisplaySurfaceVk.cpp
index 7a61a9c..4228b3e 100644
--- a/stream-servers/vulkan/DisplaySurfaceVk.cpp
+++ b/stream-servers/vulkan/DisplaySurfaceVk.cpp
@@ -18,13 +18,15 @@
#include "host-common/logging.h"
#include "vk_util.h"
+namespace gfxstream {
+namespace vk {
+
using emugl::ABORT_REASON_OTHER;
using emugl::FatalError;
-std::unique_ptr<DisplaySurfaceVk> DisplaySurfaceVk::create(
- const goldfish_vk::VulkanDispatch& vk,
- VkInstance instance,
- FBNativeWindowType window) {
+std::unique_ptr<DisplaySurfaceVk> DisplaySurfaceVk::create(const VulkanDispatch& vk,
+ VkInstance instance,
+ FBNativeWindowType window) {
VkSurfaceKHR surface = VK_NULL_HANDLE;
#ifdef _WIN32
const VkWin32SurfaceCreateInfoKHR surfaceCi = {
@@ -47,15 +49,15 @@
return std::unique_ptr<DisplaySurfaceVk>(new DisplaySurfaceVk(vk, instance, surface));
}
-DisplaySurfaceVk::DisplaySurfaceVk(const goldfish_vk::VulkanDispatch& vk,
- VkInstance instance,
+DisplaySurfaceVk::DisplaySurfaceVk(const VulkanDispatch& vk, VkInstance instance,
VkSurfaceKHR surface)
- : mVk(vk),
- mInstance(instance),
- mSurface(surface) {}
+ : mVk(vk), mInstance(instance), mSurface(surface) {}
DisplaySurfaceVk::~DisplaySurfaceVk() {
if (mSurface != VK_NULL_HANDLE) {
mVk.vkDestroySurfaceKHR(mInstance, mSurface, nullptr);
}
}
+
+} // namespace vk
+} // namespace gfxstream
