Cleanup: DRW: Remove unused options

source/blender/draw/intern/DRW_render.hh

@@ -14,15 +14,6 @@
 
 #include "GPU_material.hh"
 
-/* Uncomment to track unused resource bindings. */
-// #define DRW_UNUSED_RESOURCE_TRACKING
-
-#ifdef DRW_UNUSED_RESOURCE_TRACKING
-#  define DRW_DEBUG_FILE_LINE_ARGS , const char *file, int line
-#else
-#  define DRW_DEBUG_FILE_LINE_ARGS
-#endif
-
 namespace blender::gpu {
 class Batch;
 }

source/blender/draw/intern/draw_manager_c.cc

@@ -2224,9 +2224,6 @@ void DRW_draw_select_loop(Depsgraph *depsgraph,
   BKE_view_layer_synced_ensure(scene, view_layer);
   Object *obact = BKE_view_layer_active_object_get(view_layer);
   Object *obedit = use_obedit_skip ? nullptr : OBEDIT_FROM_OBACT(obact);
-#ifndef USE_GPU_SELECT
-  UNUSED_VARS(scene, view_layer, v3d, region, rect);
-#else
   RegionView3D *rv3d = static_cast<RegionView3D *>(region->regiondata);
 
   /* Reset before using it. */
@@ -2425,8 +2422,6 @@ void DRW_draw_select_loop(Depsgraph *depsgraph,
   drw_manager_exit(&DST);
 
   GPU_framebuffer_restore();
-
-#endif /* USE_GPU_SELECT */
 }
 
 void DRW_draw_depth_loop(Depsgraph *depsgraph,

source/blender/draw/intern/draw_manager_c.hh

@@ -42,16 +42,6 @@ class View;
 struct GPUMaterial;
 struct GSet;
 
-/** Use draw manager to call GPU_select, see: #DRW_draw_select_loop */
-#define USE_GPU_SELECT
-
-/** Use draw-call batching using instanced rendering. */
-#define USE_BATCHING 1
-
-// #define DRW_DEBUG_CULLING
-#define DRW_DEBUG_USE_UNIFORM_NAME 0
-#define DRW_UNIFORM_BUFFER_NAME 64
-
 /* -------------------------------------------------------------------- */
 /** \name Profiling
  * \{ */
@@ -166,10 +156,6 @@ struct DRWManager {
   /* Dupli data for the current dupli for each enabled engine. */
   void **dupli_datas;
 
-  /* Rendering state */
-  GPUShader *shader;
-  blender::gpu::Batch *batch;
-
   /* Per viewport */
   GPUViewport *viewport;
   GPUFrameBuffer *default_framebuffer;
@@ -197,10 +183,6 @@ struct DRWManager {
 
   uint primary_view_num;
 
-#ifdef USE_GPU_SELECT
-  uint select_id;
-#endif
-
   TaskGraph *task_graph;
   /* Contains list of objects that needs to be extracted from other objects. */
   GSet *delayed_extraction;