1 files changed, 4 insertions, 21 deletions
diff --git a/registry/vulkan/scripts/cereal/decoder.py b/registry/vulkan/scripts/cereal/decoder.py
index 6c7ee38c..3e826c90 100644
--- a/registry/vulkan/scripts/cereal/decoder.py
+++ b/registry/vulkan/scripts/cereal/decoder.py
@@ -26,13 +26,8 @@ global_state_prefix = "m_state->on_"
 
 decoder_decl_preamble = """
 
-namespace gfxstream {
-class IOStream;
 class ProcessResources;
-}  // namespace gfxstream
-
-namespace gfxstream {
-namespace vk {
+class IOStream;
 
 class VkDecoder {
 public:
@@ -45,18 +40,14 @@ private:
     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 @@ size_t VkDecoder::decode(void* buf, size_t bufsize, IOStream* stream,
 // 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 @@ size_t VkDecoder::Impl::decode(void* buf, size_t len, IOStream* ioStream,
         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)