pass vuk commandbuffer to begin pass callback

martty · Dec 25, 2024 · fdc5477 · fdc5477
1 parent 54efcba
commit fdc5477
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/examples/example_runner_single.cpp b/examples/example_runner_single.cpp
@@ -45,16 +45,16 @@ void vuk::ExampleRunner::render() {
 		};
 		// runs whenever entering a new vuk::Pass
 		// we start a GPU zone and then keep it open
-		cbs.on_begin_pass = [](void* user_data, Name pass_name, VkCommandBuffer cmdbuf, DomainFlagBits domain) {
+		cbs.on_begin_pass = [](void* user_data, Name pass_name, CommandBuffer& cbuf, DomainFlagBits domain) {
 			ExampleRunner& runner = *reinterpret_cast<vuk::ExampleRunner*>(user_data);
 			void* pass_data = new char[sizeof(tracy::VkCtxScope)];
 			if (domain & vuk::DomainFlagBits::eGraphicsQueue) {
 #if defined TRACY_ENABLE
-				new (pass_data) TracyVkZoneTransient(runner.tracy_graphics_ctx, , cmdbuf, pass_name.c_str(), true);
+				new (pass_data) TracyVkZoneTransient(runner.tracy_graphics_ctx, , cbuf.get_underlying(), pass_name.c_str(), true);
 #endif
 			} else if (domain & vuk::DomainFlagBits::eTransferQueue) {
 #if defined TRACY_ENABLE
-				new (pass_data) TracyVkZoneTransient(runner.tracy_transfer_ctx, , cmdbuf, pass_name.c_str(), true);
+				new (pass_data) TracyVkZoneTransient(runner.tracy_transfer_ctx, , cbuf.get_underlying(), pass_name.c_str(), true);
 #endif
 			}
 

diff --git a/include/vuk/Types.hpp b/include/vuk/Types.hpp
@@ -800,7 +800,7 @@ namespace vuk {
 		void* (*on_begin_command_buffer)(void* user_data, ExecutorTag tag, VkCommandBuffer cmdbuf) = nullptr;
 		void (*on_end_command_buffer)(void* user_data, void* cbuf_data) = nullptr;
 
-		void* (*on_begin_pass)(void* user_data, Name pass_name, VkCommandBuffer cmdbuf, DomainFlagBits domain) = nullptr;
+		void* (*on_begin_pass)(void* user_data, Name pass_name, class CommandBuffer& cmdbuf, DomainFlagBits domain) = nullptr;
 		void (*on_end_pass)(void* user_data, void* pass_data) = nullptr;
 
 		void* user_data = nullptr;

diff --git a/src/runtime/vk/Backend.cpp b/src/runtime/vk/Backend.cpp
@@ -1396,8 +1396,7 @@ namespace vuk {
 
 						void* rpass_profile_data = nullptr;
 						if (vk_rec->callbacks->on_begin_pass)
-							rpass_profile_data =
-							    vk_rec->callbacks->on_begin_pass(vk_rec->callbacks->user_data, fn_type->debug_info.name.c_str(), vk_rec->cbuf, vk_rec->domain);
+							rpass_profile_data = vk_rec->callbacks->on_begin_pass(vk_rec->callbacks->user_data, fn_type->debug_info.name.c_str(), cobuf, vk_rec->domain);
 
 						if (vk_rec->rp.rpci.attachments.size() > 0) {
 							vk_rec->prepare_render_pass();
@@ -1430,7 +1429,7 @@ namespace vuk {
 						void* rpass_profile_data = nullptr;
 						if (vk_rec->callbacks->on_begin_pass)
 							rpass_profile_data =
-							    vk_rec->callbacks->on_begin_pass(vk_rec->callbacks->user_data, fn_type->debug_info.name.c_str(), vk_rec->cbuf, vk_rec->domain);
+							    vk_rec->callbacks->on_begin_pass(vk_rec->callbacks->user_data, fn_type->debug_info.name.c_str(), cobuf, vk_rec->domain);
 
 						if (vk_rec->rp.rpci.attachments.size() > 0) {
 							vk_rec->prepare_render_pass();