Snap for 10453563 from 46352316c928c5aa451bdcbf7a2c7f2f64b5e7d1 to mainline-permission-releaseaml_per_341110020aml_per_341110010aml_per_341011100aml_per_341011020aml_per_340916010

Change-Id: Id7cf9d6202e642ff1d8e3efb6d6d93dfec515c20

1 files changed, 32 insertions, 20 deletions

diff --git a/stream-servers/vulkan/VkDecoder.h b/stream-servers/vulkan/VkDecoder.h
index 1c9aea95..963b7dc4 100644
--- a/stream-servers/vulkan/VkDecoder.h
+++ b/stream-servers/vulkan/VkDecoder.h
@@ -14,45 +14,59 @@
 // limitations under the License.
 
 // Autogenerated module VkDecoder
-// (header) generated by protocols/vulkan/xml/genvk.py -registry protocols/vulkan/xml/vk.xml cereal -o stream-servers/vulkan/cereal
+//
+// (header) generated by registry/vulkan/scripts/genvk.py -registry registry/vulkan/xml/vk.xml
+// cereal -o ../../device/generic/vulkan-cereal/stream-servers/vulkan/cereal
+//
 // Please do not modify directly;
-// re-run generate-vulkan-sources.sh,
+// re-run gfxstream-protocols/scripts/generate-vulkan-sources.sh,
 // or directly from Python by defining:
-// VULKAN_REGISTRY_XML_DIR : Directory containing genvk.py and vk.xml
+// VULKAN_REGISTRY_XML_DIR : Directory containing vk.xml
+// VULKAN_REGISTRY_SCRIPTS_DIR : Directory containing genvk.py
 // CEREAL_OUTPUT_DIR: Where to put the generated sources.
-// python3 $VULKAN_REGISTRY_XML_DIR/genvk.py -registry $VULKAN_REGISTRY_XML_DIR/vk.xml cereal -o $CEREAL_OUTPUT_DIR
-
+//
+// python3 $VULKAN_REGISTRY_SCRIPTS_DIR/genvk.py -registry $VULKAN_REGISTRY_XML_DIR/vk.xml cereal -o
+// $CEREAL_OUTPUT_DIR
+//
 #pragma once
-
 #include <vulkan/vulkan.h>
 
-
 #include <memory>
 
+#include "VkDecoderContext.h"
+#include "vk_android_native_buffer.h"
+#include "vulkan_gfxstream.h"
+
 namespace android {
 namespace base {
 class BumpPool;
-} // namespace android
-} // namespace base
-
-
-
-
-
-
+}  // namespace base
+}  // namespace android
 
+namespace gfxstream {
 class IOStream;
+class ProcessResources;
+}  // namespace gfxstream
+
+namespace gfxstream {
+namespace vk {
 
 class VkDecoder {
-public:
+   public:
     VkDecoder();
     ~VkDecoder();
     void setForSnapshotLoad(bool forSnapshotLoad);
-    size_t decode(void* buf, size_t bufsize, IOStream* stream, uint32_t* seqnoPtr);
-private:
+    size_t decode(void* buf, size_t bufsize, IOStream* stream,
+                  const ProcessResources* processResources, const VkDecoderContext&);
+
+   private:
     class Impl;
     std::unique_ptr<Impl> mImpl;
 };
+
+}  // namespace vk
+}  // namespace gfxstream
+
 #ifdef VK_VERSION_1_0
 #endif
 #ifdef VK_VERSION_1_1
@@ -595,5 +609,3 @@ private:
 #endif
 #ifdef VK_KHR_ray_query
 #endif
-
-