Add missing checks in ~ImageView and ~RenderPass; adjust loading in m…

…ulti_draw_indirect (#1031)
KhronosGroup · Apr 18, 2024 · 6d4a95a · 6d4a95a
1 parent 57680a6
commit 6d4a95a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/framework/core/image_view.cpp b/framework/core/image_view.cpp
@@ -82,7 +82,10 @@ ImageView::ImageView(ImageView &&other) :
 
 ImageView::~ImageView()
 {
-	vkDestroyImageView(get_device().get_handle(), get_handle(), nullptr);
+	if (has_device())
+	{
+		vkDestroyImageView(get_device().get_handle(), get_handle(), nullptr);
+	}
 }
 
 const Image &ImageView::get_image() const

diff --git a/framework/core/render_pass.cpp b/framework/core/render_pass.cpp
@@ -486,7 +486,10 @@ RenderPass::RenderPass(RenderPass &&other) :
 RenderPass::~RenderPass()
 {
 	// Destroy render pass
-	vkDestroyRenderPass(get_device().get_handle(), get_handle(), nullptr);
+	if (has_device())
+	{
+		vkDestroyRenderPass(get_device().get_handle(), get_handle(), nullptr);
+	}
 }
 
 const uint32_t RenderPass::get_color_output_count(uint32_t subpass_index) const

diff --git a/samples/performance/multi_draw_indirect/multi_draw_indirect.cpp b/samples/performance/multi_draw_indirect/multi_draw_indirect.cpp
@@ -310,13 +310,11 @@ bool MultiDrawIndirect::prepare(const vkb::ApplicationOptions &options)
 
 void MultiDrawIndirect::load_scene()
 {
-	assert(has_device());
-	vkb::GLTFLoader   loader{get_device()};
 	const std::string scene_path = "scenes/vokselia/";
-	auto              scene      = loader.read_scene_from_file(scene_path + "vokselia.gltf");
+	ApiVulkanSample::load_scene(scene_path + "vokselia.gltf");
 
 	assert(has_scene());
-	for (auto &&mesh : scene->get_components<vkb::sg::Mesh>())
+	for (auto &&mesh : get_scene().get_components<vkb::sg::Mesh>())
 	{
 		const size_t texture_index = textures.size();
 		const auto  &short_name    = mesh->get_name();