Revert "Use "gfxstream" namespace"
Revert submission 2496226-gfxstream-use-gfxstream-namespace
Reason for revert: b/275924600
Reverted changes: /q/submissionid:2496226-gfxstream-use-gfxstream-namespace
Change-Id: Icb04f0ab33d2183422483da27126a98adb0d835e
diff --git a/registry/vulkan/scripts/cereal/decoder.py b/registry/vulkan/scripts/cereal/decoder.py
index 6c7ee38..3e826c9 100644
--- a/registry/vulkan/scripts/cereal/decoder.py
+++ b/registry/vulkan/scripts/cereal/decoder.py
@@ -26,13 +26,8 @@
decoder_decl_preamble = """
-namespace gfxstream {
-class IOStream;
class ProcessResources;
-} // namespace gfxstream
-
-namespace gfxstream {
-namespace vk {
+class IOStream;
class VkDecoder {
public:
@@ -45,18 +40,14 @@
class Impl;
std::unique_ptr<Impl> mImpl;
};
-
-} // namespace vk
-} // namespace gfxstream
-
"""
decoder_impl_preamble ="""
-namespace gfxstream {
-namespace vk {
-
using android::base::MetricEventBadPacketLength;
using android::base::MetricEventDuplicateSequenceNum;
+using emugl::vkDispatch;
+
+using namespace goldfish_vk;
class VkDecoder::Impl {
public:
@@ -113,13 +104,6 @@
// VkDecoder::Impl::decode to follow
""" % (VULKAN_STREAM_TYPE, VULKAN_STREAM_TYPE)
-decoder_impl_postamble = """
-
-} // namespace vk
-} // namespace gfxstream
-
-"""
-
READ_STREAM = "vkReadStream"
WRITE_STREAM = "vkStream"
@@ -913,4 +897,3 @@
self.cgen.stmt("return ptr - (unsigned char*)buf;")
self.cgen.endBlock() # function body
self.module.appendImpl(self.cgen.swapCode())
- self.module.appendImpl(decoder_impl_postamble)
diff --git a/registry/vulkan/scripts/cereal/decodersnapshot.py b/registry/vulkan/scripts/cereal/decodersnapshot.py
index 4ff97a1..f4dc6d6 100644
--- a/registry/vulkan/scripts/cereal/decodersnapshot.py
+++ b/registry/vulkan/scripts/cereal/decodersnapshot.py
@@ -39,7 +39,7 @@
decoder_snapshot_impl_preamble ="""
-using namespace gfxstream::vk;
+using namespace goldfish_vk;
using emugl::GfxApiLogger;
using emugl::HealthMonitor;
diff --git a/registry/vulkan/scripts/cereal/encoder.py b/registry/vulkan/scripts/cereal/encoder.py
index d3e3974..108d122 100644
--- a/registry/vulkan/scripts/cereal/encoder.py
+++ b/registry/vulkan/scripts/cereal/encoder.py
@@ -38,7 +38,7 @@
encoder_impl_preamble ="""
-using namespace gfxstream::vk;
+using namespace goldfish_vk;
using android::base::guest::AutoLock;
using android::base::guest::Lock;
diff --git a/registry/vulkan/scripts/cerealgenerator.py b/registry/vulkan/scripts/cerealgenerator.py
index 988cda4..ad5aab7 100644
--- a/registry/vulkan/scripts/cerealgenerator.py
+++ b/registry/vulkan/scripts/cerealgenerator.py
@@ -325,13 +325,11 @@
dispatchHeaderDefs = f"""
{self.hostCommonExtraVulkanHeaders}
#include "goldfish_vk_private_defs.h"
-namespace gfxstream {{
-namespace vk {{
+namespace goldfish_vk {{
struct VulkanDispatch;
-}} // namespace vk
-}} // namespace gfxstream
+}} // namespace goldfish_vk
using DlOpenFunc = void* (void);
using DlSymFunc = void* (void*, const char*);
"""
@@ -654,16 +652,8 @@
autogeneratedHeaderTemplate % \
(basename, "(header) generated by %s" % banner_command(sys.argv))
-
- namespaceBegin = """
-namespace gfxstream {
-namespace vk {
-""" if useNamespace else ""
-
- namespaceEnd = """
-} // namespace vk"
-} // namespace gfxstream
-""" if useNamespace else ""
+ namespaceBegin = "namespace goldfish_vk {" if useNamespace else ""
+ namespaceEnd = "} // namespace goldfish_vk" if useNamespace else ""
module.headerPreamble += "#pragma once\n"
if (not suppressVulkanHeaders):
