Update postprocessing_with_vgf and tensor_image_aliasing to latest main

Signed-off-by: Matthew Sloyan <matthew.sloyan@arm.com>

Author: matthewsloyanARM

samples/extensions/tensor_and_data_graph/postprocessing_with_vgf/postprocessing_with_vgf.cpp

@@ -29,8 +29,6 @@
 
 PostprocessingWithVgf::PostprocessingWithVgf()
 {
-	set_api_version(VK_API_VERSION_1_3);        // Required by the emulation layers
-
 	// Declare that we need the data graph and tensor extensions
 	add_device_extension("VK_ARM_tensors");
 	add_device_extension("VK_ARM_data_graph");
@@ -39,6 +37,11 @@ PostprocessingWithVgf::PostprocessingWithVgf()
 	add_device_extension("VK_KHR_deferred_host_operations");
 }
 
+uint32_t PostprocessingWithVgf::get_api_version() const
+{
+	return VK_API_VERSION_1_3;        // Required by the emulation layers
+}
+
 PostprocessingWithVgf::~PostprocessingWithVgf()
 {
 	if (data_graph_pipeline_descriptor_set != VK_NULL_HANDLE)
@@ -112,7 +115,7 @@ bool PostprocessingWithVgf::prepare(const vkb::ApplicationOptions &options)
 	vkb::ShaderSource frag_shader("base.frag.spv");
 	auto              scene_subpass = std::make_unique<vkb::rendering::subpasses::ForwardSubpassC>(get_render_context(), std::move(vert_shader), std::move(frag_shader), get_scene(), camera);
 
-	auto render_pipeline = std::make_unique<vkb::RenderPipeline>();
+	auto render_pipeline = std::make_unique<vkb::rendering::RenderPipelineC>();
 	render_pipeline->add_subpass(std::move(scene_subpass));
 	render_pipeline->prepare();
 
@@ -135,7 +138,7 @@ bool PostprocessingWithVgf::prepare(const vkb::ApplicationOptions &options)
 	prepare_data_graph_pipeline_descriptor_set();
 
 	// Create a RenderPipeline to blit `output_image` to the swapchain
-	blit_pipeline = std::make_unique<vkb::RenderPipeline>();
+	blit_pipeline = std::make_unique<vkb::rendering::RenderPipelineC>();
 	blit_pipeline->add_subpass(std::make_unique<BlitSubpass>(get_render_context(), output_image_view.get()));
 	blit_pipeline->prepare();
 

samples/extensions/tensor_and_data_graph/postprocessing_with_vgf/postprocessing_with_vgf.h

@@ -92,6 +92,10 @@ class PostprocessingWithVgf : public vkb::VulkanSampleC
 
 	void draw_gui() override;
 
+  private:
+	// from vkb::VulkanSample
+	uint32_t get_api_version() const override;
+
   private:
 	VgfData load_vgf(const std::string &vgf_file_path);
 
@@ -144,7 +148,7 @@ class PostprocessingWithVgf : public vkb::VulkanSampleC
 	std::unique_ptr<ExternallyAllocatedTensor> output_tensor;
 	std::unique_ptr<TensorView>                output_tensor_view;
 
-	std::unique_ptr<vkb::RenderPipeline> blit_pipeline;
+	std::unique_ptr<vkb::rendering::RenderPipelineC> blit_pipeline;
 
 	VkDescriptorPool descriptor_pool = VK_NULL_HANDLE;
 

samples/extensions/tensor_and_data_graph/tensor_and_data_graph_common.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2024-2025, Arm Limited and Contributors
+/* Copyright (c) 2024-2026, Arm Limited and Contributors
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -306,7 +306,7 @@ class ComputePipelineWithTensors : public vkb::core::VulkanResourceC<VkPipeline>
 };
 
 /*
- * @brief Simple subpass for use with vkb::RenderPipeline, which blits an image to the render target (stretching to fit).
+ * @brief Simple subpass for use with vkb::rendering::RenderPipelineC, which blits an image to the render target (stretching to fit).
  */
 class BlitSubpass : public vkb::rendering::SubpassC
 {

samples/extensions/tensor_and_data_graph/tensor_image_aliasing/tensor_image_aliasing.cpp

@@ -26,8 +26,6 @@
 
 TensorImageAliasing::TensorImageAliasing()
 {
-	set_api_version(VK_API_VERSION_1_3);        // Required by the emulation layers
-
 	// Declare that we need the data graph and tensor extensions
 	add_device_extension("VK_ARM_tensors");
 	add_device_extension("VK_ARM_data_graph");
@@ -36,6 +34,11 @@ TensorImageAliasing::TensorImageAliasing()
 	add_device_extension("VK_KHR_deferred_host_operations");
 }
 
+uint32_t TensorImageAliasing::get_api_version() const
+{
+	return VK_API_VERSION_1_3;        // Required by the emulation layers
+}
+
 TensorImageAliasing::~TensorImageAliasing()
 {
 	if (data_graph_pipeline_descriptor_set != VK_NULL_HANDLE)
@@ -109,7 +112,7 @@ bool TensorImageAliasing::prepare(const vkb::ApplicationOptions &options)
 	vkb::ShaderSource frag_shader("base.frag.spv");
 	auto              scene_subpass = std::make_unique<vkb::rendering::subpasses::ForwardSubpassC>(get_render_context(), std::move(vert_shader), std::move(frag_shader), get_scene(), camera);
 
-	auto render_pipeline = std::make_unique<vkb::RenderPipeline>();
+	auto render_pipeline = std::make_unique<vkb::rendering::RenderPipelineC>();
 	render_pipeline->add_subpass(std::move(scene_subpass));
 	render_pipeline->prepare();
 
@@ -130,7 +133,7 @@ bool TensorImageAliasing::prepare(const vkb::ApplicationOptions &options)
 	prepare_data_graph_pipeline_descriptor_set();
 
 	// Create a RenderPipeline to blit `output_image` to the swapchain
-	blit_pipeline = std::make_unique<vkb::RenderPipeline>();
+	blit_pipeline = std::make_unique<vkb::rendering::RenderPipelineC>();
 	blit_pipeline->add_subpass(std::make_unique<BlitSubpass>(get_render_context(), output_image_view.get()));
 	blit_pipeline->prepare();
 

samples/extensions/tensor_and_data_graph/tensor_image_aliasing/tensor_image_aliasing.h

@@ -57,6 +57,10 @@ class TensorImageAliasing : public vkb::VulkanSampleC
 
 	void draw_gui() override;
 
+  private:
+	// from vkb::VulkanSample
+	uint32_t get_api_version() const override;
+
   private:
 	void prepare_scene_render_target(uint32_t width, uint32_t height);
 
@@ -109,7 +113,7 @@ class TensorImageAliasing : public vkb::VulkanSampleC
 	std::unique_ptr<ExternallyAllocatedTensor> output_tensor;
 	std::unique_ptr<TensorView>                output_tensor_view;
 
-	std::unique_ptr<vkb::RenderPipeline> blit_pipeline;
+	std::unique_ptr<vkb::rendering::RenderPipelineC> blit_pipeline;
 
 	VkDescriptorPool descriptor_pool = VK_NULL_HANDLE;