From edc0e77afe4fea633c24a4e120e60402ae226758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Sat, 5 Feb 2022 19:25:35 +0100 Subject: GPU: Enable CLOG for gpu when `--debug-gpu` option is set This is because all of the debug printing is done through CLog now. Without it the is little point in this option. --- source/creator/creator_args.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'source/creator/creator_args.c') diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index d3cec093980..11bea595690 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -970,9 +970,6 @@ static const char arg_handle_debug_mode_generic_set_doc_xr_time[] = static const char arg_handle_debug_mode_generic_set_doc_jobs[] = "\n\t" "Enable time profiling for background jobs."; -static const char arg_handle_debug_mode_generic_set_doc_gpu[] = - "\n\t" - "Enable GPU debug context and information for OpenGL 4.3+."; static const char arg_handle_debug_mode_generic_set_doc_depsgraph[] = "\n\t" "Enable all debug messages from dependency graph."; @@ -1097,6 +1094,20 @@ static int arg_handle_debug_value_set(int argc, const char **argv, void *UNUSED( return 0; } +static const char arg_handle_debug_gpu_set_doc[] = + "\n" + "\tEnable GPU debug context and information for OpenGL 4.3+."; +static int arg_handle_debug_gpu_set(int UNUSED(argc), + const char **UNUSED(argv), + void *UNUSED(data)) +{ + /* Also enable logging because that how gl errors are reported. */ + const char *gpu_filter = "gpu.*"; + CLG_type_filter_include(gpu_filter, strlen(gpu_filter)); + G.debug |= G_DEBUG_GPU; + return 0; +} + static const char arg_handle_debug_fpe_set_doc[] = "\n\t" "Enable floating-point exceptions."; @@ -2155,8 +2166,8 @@ void main_args_setup(bContext *C, bArgs *ba) "--debug-jobs", CB_EX(arg_handle_debug_mode_generic_set, jobs), (void *)G_DEBUG_JOBS); - BLI_args_add( - ba, NULL, "--debug-gpu", CB_EX(arg_handle_debug_mode_generic_set, gpu), (void *)G_DEBUG_GPU); + BLI_args_add(ba, NULL, "--debug-gpu", CB(arg_handle_debug_gpu_set), NULL); + BLI_args_add(ba, NULL, "--debug-depsgraph", -- cgit v1.2.3