Browse Source

Remove debugging prints in the Linux DisplayServer

Some Vulkan debugging prints were also changed to be printed only
in verbose mode.
Hugo Locurcio 4 years ago
parent
commit
064ca9adae
2 changed files with 7 additions and 10 deletions
  1. 7 7
      drivers/vulkan/vulkan_context.cpp
  2. 0 3
      platform/linuxbsd/display_server_x11.cpp

+ 7 - 7
drivers/vulkan/vulkan_context.cpp

@@ -1656,13 +1656,13 @@ Error VulkanContext::prepare_buffers() {
 			if (err == VK_ERROR_OUT_OF_DATE_KHR) {
 			if (err == VK_ERROR_OUT_OF_DATE_KHR) {
 				// swapchain is out of date (e.g. the window was resized) and
 				// swapchain is out of date (e.g. the window was resized) and
 				// must be recreated:
 				// must be recreated:
-				print_line("early out of data");
+				print_verbose("Vulkan: Early out of date swapchain, recreating.");
 				//resize_notify();
 				//resize_notify();
 				_update_swap_chain(w);
 				_update_swap_chain(w);
 			} else if (err == VK_SUBOPTIMAL_KHR) {
 			} else if (err == VK_SUBOPTIMAL_KHR) {
-				print_line("early suboptimal");
 				// swapchain is not as optimal as it could be, but the platform's
 				// swapchain is not as optimal as it could be, but the platform's
 				// presentation engine will still present the image correctly.
 				// presentation engine will still present the image correctly.
+				print_verbose("Vulkan: Early suboptimal swapchain.");
 				break;
 				break;
 			} else {
 			} else {
 				ERR_FAIL_COND_V(err, ERR_CANT_CREATE);
 				ERR_FAIL_COND_V(err, ERR_CANT_CREATE);
@@ -1870,12 +1870,12 @@ Error VulkanContext::swap_buffers() {
 	if (err == VK_ERROR_OUT_OF_DATE_KHR) {
 	if (err == VK_ERROR_OUT_OF_DATE_KHR) {
 		// swapchain is out of date (e.g. the window was resized) and
 		// swapchain is out of date (e.g. the window was resized) and
 		// must be recreated:
 		// must be recreated:
-		print_line("out of date");
+		print_verbose("Vulkan: Swapchain is out of date, recreating.");
 		resize_notify();
 		resize_notify();
 	} else if (err == VK_SUBOPTIMAL_KHR) {
 	} else if (err == VK_SUBOPTIMAL_KHR) {
 		// swapchain is not as optimal as it could be, but the platform's
 		// swapchain is not as optimal as it could be, but the platform's
 		// presentation engine will still present the image correctly.
 		// presentation engine will still present the image correctly.
-		print_line("suboptimal");
+		print_verbose("Vulkan: Swapchain is suboptimal.");
 	} else {
 	} else {
 		ERR_FAIL_COND_V(err, ERR_CANT_CREATE);
 		ERR_FAIL_COND_V(err, ERR_CANT_CREATE);
 	}
 	}
@@ -1971,13 +1971,13 @@ void VulkanContext::local_device_push_command_buffers(RID p_local_device, const
 
 
 	VkResult err = vkQueueSubmit(ld->queue, 1, &submit_info, VK_NULL_HANDLE);
 	VkResult err = vkQueueSubmit(ld->queue, 1, &submit_info, VK_NULL_HANDLE);
 	if (err == VK_ERROR_OUT_OF_HOST_MEMORY) {
 	if (err == VK_ERROR_OUT_OF_HOST_MEMORY) {
-		print_line("out of host memory");
+		print_line("Vulkan: Out of host memory!");
 	}
 	}
 	if (err == VK_ERROR_OUT_OF_DEVICE_MEMORY) {
 	if (err == VK_ERROR_OUT_OF_DEVICE_MEMORY) {
-		print_line("out of device memory");
+		print_line("Vulkan: Out of device memory!");
 	}
 	}
 	if (err == VK_ERROR_DEVICE_LOST) {
 	if (err == VK_ERROR_DEVICE_LOST) {
-		print_line("device lost");
+		print_line("Vulkan: Device lost!");
 	}
 	}
 	ERR_FAIL_COND(err);
 	ERR_FAIL_COND(err);
 
 

+ 0 - 3
platform/linuxbsd/display_server_x11.cpp

@@ -2606,7 +2606,6 @@ void DisplayServerX11::_window_changed(XEvent *event) {
 	}
 	}
 #endif
 #endif
 
 
-	print_line("DisplayServer::_window_changed: " + itos(window_id) + " rect: " + new_rect);
 	if (!wd.rect_changed_callback.is_null()) {
 	if (!wd.rect_changed_callback.is_null()) {
 		Rect2i r = new_rect;
 		Rect2i r = new_rect;
 
 
@@ -3833,8 +3832,6 @@ DisplayServerX11::WindowID DisplayServerX11::_create_window(WindowMode p_mode, u
 		wd.position.y = xwa.y;
 		wd.position.y = xwa.y;
 		wd.size.width = xwa.width;
 		wd.size.width = xwa.width;
 		wd.size.height = xwa.height;
 		wd.size.height = xwa.height;
-
-		print_line("DisplayServer::_create_window " + itos(id) + " want rect: " + p_rect + " got rect " + Rect2i(xwa.x, xwa.y, xwa.width, xwa.height));
 	}
 	}
 
 
 	//set cursor
 	//set cursor