godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Vulkan debugging prints

This commit is contained in:
Hugo Locurcio 2020-02-13 18:50:07 +01:00
parent 5c3944e7da
commit 71b74195de
No known key found for this signature in database
GPG Key ID: 39E8F8BE30B0A49C
3 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/vulkan/vulkan_context.cpp
View File

@ -39,7 +39,6 @@
#include <string.h> #include <string.h>
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
#define VULKAN_DEBUG(m_text) print_line(m_text)
#define APP_SHORT_NAME "GodotEngine" #define APP_SHORT_NAME "GodotEngine"
VKAPI_ATTR VkBool32 VKAPI_CALL VulkanContext::_debug_messenger_callback(VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VKAPI_ATTR VkBool32 VKAPI_CALL VulkanContext::_debug_messenger_callback(VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
@ -389,16 +388,12 @@ Error VulkanContext::_create_physical_device() {
if (!strcmp(VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME, device_extensions[i].extensionName)) { if (!strcmp(VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME, device_extensions[i].extensionName)) {
extension_names[enabled_extension_count++] = VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME; extension_names[enabled_extension_count++] = VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME;
VK_KHR_incremental_present_enabled = true; VK_KHR_incremental_present_enabled = true;
VULKAN_DEBUG("VK_KHR_incremental_present extension enabled\n");
} }
if (enabled_extension_count >= MAX_EXTENSIONS) { if (enabled_extension_count >= MAX_EXTENSIONS) {
free(device_extensions); free(device_extensions);
ERR_FAIL_V_MSG(ERR_BUG, "Enabled extension count reaches MAX_EXTENSIONS, BUG"); ERR_FAIL_V_MSG(ERR_BUG, "Enabled extension count reaches MAX_EXTENSIONS, BUG");
} }
} }
if (!VK_KHR_incremental_present_enabled) {
VULKAN_DEBUG("VK_KHR_incremental_present extension NOT AVAILABLE\n");
}
} }
if (VK_GOOGLE_display_timing_enabled) { if (VK_GOOGLE_display_timing_enabled) {
@ -411,16 +406,12 @@ Error VulkanContext::_create_physical_device() {
if (!strcmp(VK_GOOGLE_DISPLAY_TIMING_EXTENSION_NAME, device_extensions[i].extensionName)) { if (!strcmp(VK_GOOGLE_DISPLAY_TIMING_EXTENSION_NAME, device_extensions[i].extensionName)) {
extension_names[enabled_extension_count++] = VK_GOOGLE_DISPLAY_TIMING_EXTENSION_NAME; extension_names[enabled_extension_count++] = VK_GOOGLE_DISPLAY_TIMING_EXTENSION_NAME;
VK_GOOGLE_display_timing_enabled = true; VK_GOOGLE_display_timing_enabled = true;
VULKAN_DEBUG("VK_GOOGLE_display_timing extension enabled\n");
} }
if (enabled_extension_count >= MAX_EXTENSIONS) { if (enabled_extension_count >= MAX_EXTENSIONS) {
free(device_extensions); free(device_extensions);
ERR_FAIL_V_MSG(ERR_BUG, "Enabled extension count reaches MAX_EXTENSIONS, BUG"); ERR_FAIL_V_MSG(ERR_BUG, "Enabled extension count reaches MAX_EXTENSIONS, BUG");
} }
} }
if (!VK_GOOGLE_display_timing_enabled) {
VULKAN_DEBUG("VK_GOOGLE_display_timing extension NOT AVAILABLE\n");
}
} }
free(device_extensions); free(device_extensions);
@ -1132,7 +1123,7 @@ Error VulkanContext::initialize() {
if (err) { if (err) {
return err; return err;
} }
print_line("Vulkan physical device creation success o_O");
return OK; return OK;
} }

4
servers/visual/rasterizer_rd/rasterizer_rd.cpp
View File

@ -121,9 +121,7 @@ void RasterizerRD::initialize() {
String error; String error;
copy_viewports_rd_shader = RD::get_singleton()->shader_create(source); copy_viewports_rd_shader = RD::get_singleton()->shader_create(source);
if (!copy_viewports_rd_shader.is_valid()) { if (!copy_viewports_rd_shader.is_valid()) {
print_line("failed compilation: " + error); print_line("Failed compilation: " + error);
} else {
print_line("compilation success");
} }
} }

2
servers/visual/rasterizer_rd/shader_compiler_rd.cpp
View File

@ -483,7 +483,7 @@ String ShaderCompilerRD::_dump_node_code(const SL::Node *p_node, int p_level, Ge
} }
r_gen_code.uniform_total_size = offset; r_gen_code.uniform_total_size = offset;
print_line("uniform total: " + itos(r_gen_code.uniform_total_size));
if (r_gen_code.uniform_total_size % 16 != 0) { //UBO sizes must be multiples of 16 if (r_gen_code.uniform_total_size % 16 != 0) { //UBO sizes must be multiples of 16
r_gen_code.uniform_total_size += 16 - (r_gen_code.uniform_total_size % 16); r_gen_code.uniform_total_size += 16 - (r_gen_code.uniform_total_size % 16);
} }