commit ed0c9e6b1e60c4c6628eb4db8529c4cc70c9f0bf
author Jason Macnak <natsu@google.com> Thu Mar 30 15:58:24 2023 -0700
committer Jason Macnak <natsu@google.com> Fri Mar 31 16:17:50 2023 +0000
tree 308ec4e129230353cf6fc0427308e988c9e35d42
parent d37d7c8c0cdf6b84d453cb41e358094880a8f3b5

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

stream-servers/tests/DisplayVk_unittest.cpp

diff --git a/stream-servers/tests/DisplayVk_unittest.cpp b/stream-servers/tests/DisplayVk_unittest.cpp
index cda4937..2842873 100644
--- a/stream-servers/tests/DisplayVk_unittest.cpp
+++ b/stream-servers/tests/DisplayVk_unittest.cpp
@@ -12,22 +12,26 @@
 
 using gfxstream::DisplaySurface;
 
+namespace gfxstream {
+namespace vk {
+namespace {
+
 class DisplayVkTest : public ::testing::Test {
    protected:
-    using RenderTexture = emugl::RenderTextureVk;
+    using RenderTexture = RenderTextureVk;
 
-    static void SetUpTestCase() { k_vk = emugl::vkDispatch(false); }
+    static void SetUpTestCase() { k_vk = vkDispatch(false); }
 
     void SetUp() override {
         // skip the test when testing without a window
-        if (!emugl::shouldUseWindow()) {
+        if (!shouldUseWindow()) {
             GTEST_SKIP();
         }
         ASSERT_NE(k_vk, nullptr);
 
         createInstance();
         createWindowAndSurface();
-        m_window = emugl::createOrGetTestWindow(0, 0, k_width, k_height);
+        m_window = createOrGetTestWindow(0, 0, k_width, k_height);
         pickPhysicalDevice();
         createLogicalDevice();
         k_vk->vkGetDeviceQueue(m_vkDevice, m_compositorQueueFamilyIndex, 0, &m_compositorVkQueue);
@@ -51,7 +55,7 @@
     }
 
     void TearDown() override {
-        if (emugl::shouldUseWindow()) {
+        if (shouldUseWindow()) {
             ASSERT_EQ(k_vk->vkQueueWaitIdle(m_compositorVkQueue), VK_SUCCESS);
             ASSERT_EQ(k_vk->vkQueueWaitIdle(m_swapChainVkQueue), VK_SUCCESS);
 
@@ -80,7 +84,7 @@
         return info;
     }
 
-    static const goldfish_vk::VulkanDispatch *k_vk;
+    static const VulkanDispatch* k_vk;
     static constexpr uint32_t k_width = 0x100;
     static constexpr uint32_t k_height = 0x100;
 
@@ -119,7 +123,7 @@
     }
 
     void createWindowAndSurface() {
-        m_window = emugl::createOrGetTestWindow(0, 0, k_width, k_height);
+        m_window = createOrGetTestWindow(0, 0, k_width, k_height);
         ASSERT_NE(m_window, nullptr);
         // TODO(kaiyili, b/179477624): add support for other platforms
 #ifdef _WIN32
@@ -205,7 +209,7 @@
     }
 };
 
-const goldfish_vk::VulkanDispatch *DisplayVkTest::k_vk = nullptr;
+const VulkanDispatch* DisplayVkTest::k_vk = nullptr;
 
 TEST_F(DisplayVkTest, Init) {}
 
@@ -282,3 +286,7 @@
         waitForGpuFuture.wait();
     }
 }
+
+}  // namespace
+}  // namespace vk
+}  // namespace gfxstream