[Bf-blender-cvs] [bc94036a76b] master: GPU: Remove unused GPU debugging command line options

[Julian Eisel]

Commit: bc94036a76b63254181788ce5814fb946f52a287
Author: Julian Eisel
Date:   Fri Jan 29 14:17:49 2021 +0100
Branches: master
https://developer.blender.org/rBbc94036a76b63254181788ce5814fb946f52a287

GPU: Remove unused GPU debugging command line options

Removes two unused --debug-gpu command line flags (unused as in, does nothing):
* `--debug-gpumem`: Unused since c08d84748804, the info is now available in
  the status-bar if enabled in the Preferences. Initially added in
  fec317de8d57.
* `--debug-gpu-shaders`: Unused since 216d78687d2b, double checked with
  Clément, he says it's not that useful nowadays. Initially added in
  fec317de8d57.

Addresses T83954 and T83953.

Differential Revision: https://developer.blender.org/D10244

Reviewed by: Clément Foucault

===================================================================

M	source/blender/blenkernel/BKE_global.h
M	source/blender/python/intern/bpy_app.c
M	source/creator/creator_args.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index 5e16c9c979c..aed97d4708f 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -147,21 +147,18 @@ enum {
   G_DEBUG_DEPSGRAPH = (G_DEBUG_DEPSGRAPH_BUILD | G_DEBUG_DEPSGRAPH_EVAL | G_DEBUG_DEPSGRAPH_TAG |
                        G_DEBUG_DEPSGRAPH_TIME | G_DEBUG_DEPSGRAPH_UUID),
   G_DEBUG_SIMDATA = (1 << 15),               /* sim debug data display */
-  G_DEBUG_GPU_MEM = (1 << 16),               /* gpu memory in status bar */
-  G_DEBUG_GPU = (1 << 17),                   /* gpu debug */
-  G_DEBUG_IO = (1 << 18),                    /* IO Debugging (for Collada, ...)*/
-  G_DEBUG_GPU_SHADERS = (1 << 19),           /* GLSL shaders */
-  G_DEBUG_GPU_FORCE_WORKAROUNDS = (1 << 20), /* force gpu workarounds bypassing detections. */
-  G_DEBUG_XR = (1 << 21),                    /* XR/OpenXR messages */
-  G_DEBUG_XR_TIME = (1 << 22),               /* XR/OpenXR timing messages */
-
-  G_DEBUG_GHOST = (1 << 23), /* Debug GHOST module. */
+  G_DEBUG_GPU = (1 << 16),                   /* gpu debug */
+  G_DEBUG_IO = (1 << 17),                    /* IO Debugging (for Collada, ...)*/
+  G_DEBUG_GPU_FORCE_WORKAROUNDS = (1 << 18), /* force gpu workarounds bypassing detections. */
+  G_DEBUG_XR = (1 << 19),                    /* XR/OpenXR messages */
+  G_DEBUG_XR_TIME = (1 << 20),               /* XR/OpenXR timing messages */
+
+  G_DEBUG_GHOST = (1 << 21), /* Debug GHOST module. */
 };
 
 #define G_DEBUG_ALL \
   (G_DEBUG | G_DEBUG_FFMPEG | G_DEBUG_PYTHON | G_DEBUG_EVENTS | G_DEBUG_WM | G_DEBUG_JOBS | \
-   G_DEBUG_FREESTYLE | G_DEBUG_DEPSGRAPH | G_DEBUG_GPU_MEM | G_DEBUG_IO | G_DEBUG_GPU_SHADERS | \
-   G_DEBUG_GHOST)
+   G_DEBUG_FREESTYLE | G_DEBUG_DEPSGRAPH | G_DEBUG_IO | G_DEBUG_GHOST)
 
 /** #Global.fileflags */
 enum {
diff --git a/source/blender/python/intern/bpy_app.c b/source/blender/python/intern/bpy_app.c
index 02ab001dbf6..c7e195b586d 100644
--- a/source/blender/python/intern/bpy_app.c
+++ b/source/blender/python/intern/bpy_app.c
@@ -424,11 +424,6 @@ static PyGetSetDef bpy_app_getsets[] = {
      bpy_app_debug_set,
      bpy_app_debug_doc,
      (void *)G_DEBUG_SIMDATA},
-    {"debug_gpumem",
-     bpy_app_debug_get,
-     bpy_app_debug_set,
-     bpy_app_debug_doc,
-     (void *)G_DEBUG_GPU_MEM},
     {"debug_io", bpy_app_debug_get, bpy_app_debug_set, bpy_app_debug_doc, (void *)G_DEBUG_IO},
 
     {"use_event_simulate",
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c
index 031bf06c085..fa7dcc88210 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -587,7 +587,6 @@ static int arg_handle_print_help(int UNUSED(argc), const char **UNUSED(argv), vo
   BLI_args_print_arg_doc(ba, "--debug-depsgraph-time");
   BLI_args_print_arg_doc(ba, "--debug-depsgraph-pretty");
   BLI_args_print_arg_doc(ba, "--debug-gpu");
-  BLI_args_print_arg_doc(ba, "--debug-gpumem");
   BLI_args_print_arg_doc(ba, "--debug-gpu-shaders");
   BLI_args_print_arg_doc(ba, "--debug-gpu-force-workarounds");
   BLI_args_print_arg_doc(ba, "--debug-wm");
@@ -977,9 +976,6 @@ static const char arg_handle_debug_mode_generic_set_doc_depsgraph_no_threads[] =
 static const char arg_handle_debug_mode_generic_set_doc_depsgraph_pretty[] =
     "\n\t"
     "Enable colors for dependency graph debug messages.";
-static const char arg_handle_debug_mode_generic_set_doc_gpumem[] =
-    "\n\t"
-    "Enable GPU memory stats in status bar.";
 static const char arg_handle_debug_mode_generic_set_doc_gpu_force_workarounds[] =
     "\n\t"
     "Enable workarounds for typical GPU issues and disable all GPU extensions.";
@@ -2160,16 +2156,6 @@ void main_args_setup(bContext *C, bArgs *ba)
                "--debug-depsgraph-uuid",
                CB_EX(arg_handle_debug_mode_generic_set, depsgraph_build),
                (void *)G_DEBUG_DEPSGRAPH_UUID);
-  BLI_args_add(ba,
-               NULL,
-               "--debug-gpumem",
-               CB_EX(arg_handle_debug_mode_generic_set, gpumem),
-               (void *)G_DEBUG_GPU_MEM);
-  BLI_args_add(ba,
-               NULL,
-               "--debug-gpu-shaders",
-               CB_EX(arg_handle_debug_mode_generic_set, gpumem),
-               (void *)G_DEBUG_GPU_SHADERS);
   BLI_args_add(ba,
                NULL,
                "--debug-gpu-force-workarounds",