Fix T54686: objects don't occlude each other for edit-mesh select

5 files changed, 23 insertions, 263 deletions

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index fbec99c5f28..cc76c151a29 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -41,7 +41,6 @@
 #include "GPU_batch.h"
 #include "GPU_matrix.h"
 #include "GPU_state.h"
-#include "GPU_framebuffer.h"
 
 #include "ED_mesh.h"
 
@@ -51,8 +50,6 @@
 
 #include "view3d_intern.h" /* bad level include */
 
-#include "../../draw/intern/draw_cache_impl.h" /* bad level include (temporary) */
-
 int view3d_effective_drawtype(const struct View3D *v3d)
 {
   if (v3d->shading.type == OB_RENDER) {
@@ -61,24 +58,6 @@ int view3d_effective_drawtype(const struct View3D *v3d)
   return v3d->shading.type;
 }
 
-static bool check_ob_drawface_dot(Scene *sce, View3D *vd, char dt)
-{
-  if ((sce->toolsettings->selectmode & SCE_SELECT_FACE) == 0) {
-    return false;
-  }
-
-  if (G.f & G_FLAG_BACKBUFSEL) {
-    return false;
-  }
-
-  /* if its drawing textures with zbuf sel, then don't draw dots */
-  if (dt == OB_TEXTURE && vd->shading.type == OB_TEXTURE) {
-    return false;
-  }
-
-  return true;
-}
-
 /* OpenGL Circle Drawing - Tables for Optimized Drawing Speed */
 /* 32 values of sin function (still same result!) */
 #define CIRCLE_RESOL 32
@@ -138,222 +117,6 @@ bool view3d_camera_border_hack_test = false;
 
 /* ***************** BACKBUF SEL (BBS) ********* */
 
-/** See #DRW_shgroup_world_clip_planes_from_rv3d, same function for draw manager. */
-static void bbs_world_clip_planes_from_rv3d(GPUBatch *batch, const float world_clip_planes[6][4])
-{
-  GPU_batch_uniform_4fv_array(batch, "WorldClipPlanes", 6, world_clip_planes[0]);
-}
-
-static void bbs_mesh_verts(GPUBatch *batch, int offset, const float world_clip_planes[6][4])
-{
-  GPU_point_size(UI_GetThemeValuef(TH_VERTEX_SIZE));
-
-  const eGPUShaderConfig sh_cfg = world_clip_planes ? GPU_SHADER_CFG_CLIPPED :
-                                                      GPU_SHADER_CFG_DEFAULT;
-  GPU_batch_program_set_builtin_with_config(batch, GPU_SHADER_3D_FLAT_SELECT_ID, sh_cfg);
-  GPU_batch_uniform_1ui(batch, "offset", offset);
-  if (world_clip_planes != NULL) {
-    bbs_world_clip_planes_from_rv3d(batch, world_clip_planes);
-  }
-  GPU_batch_draw(batch);
-}
-
-static void bbs_mesh_wire(GPUBatch *batch, int offset, const float world_clip_planes[6][4])
-{
-  GPU_line_width(1.0f);
-  glProvokingVertex(GL_FIRST_VERTEX_CONVENTION);
-
-  const eGPUShaderConfig sh_cfg = world_clip_planes ? GPU_SHADER_CFG_CLIPPED :
-                                                      GPU_SHADER_CFG_DEFAULT;
-  GPU_batch_program_set_builtin_with_config(batch, GPU_SHADER_3D_FLAT_SELECT_ID, sh_cfg);
-  GPU_batch_uniform_1ui(batch, "offset", offset);
-  if (world_clip_planes != NULL) {
-    bbs_world_clip_planes_from_rv3d(batch, world_clip_planes);
-  }
-  GPU_batch_draw(batch);
-
-  glProvokingVertex(GL_LAST_VERTEX_CONVENTION);
-}
-
-/* two options, facecolors or black */
-static void bbs_mesh_face(GPUBatch *batch,
-                          const bool use_select,
-                          const float world_clip_planes[6][4])
-{
-  if (use_select) {
-    const eGPUShaderConfig sh_cfg = world_clip_planes ? GPU_SHADER_CFG_CLIPPED :
-                                                        GPU_SHADER_CFG_DEFAULT;
-    GPU_batch_program_set_builtin_with_config(batch, GPU_SHADER_3D_FLAT_SELECT_ID, sh_cfg);
-    GPU_batch_uniform_1ui(batch, "offset", 1);
-    if (world_clip_planes != NULL) {
-      bbs_world_clip_planes_from_rv3d(batch, world_clip_planes);
-    }
-    GPU_batch_draw(batch);
-  }
-  else {
-    const eGPUShaderConfig sh_cfg = world_clip_planes ? GPU_SHADER_CFG_CLIPPED :
-                                                        GPU_SHADER_CFG_DEFAULT;
-    GPU_batch_program_set_builtin_with_config(batch, GPU_SHADER_3D_UNIFORM_SELECT_ID, sh_cfg);
-    GPU_batch_uniform_1ui(batch, "id", 0);
-    if (world_clip_planes != NULL) {
-      bbs_world_clip_planes_from_rv3d(batch, world_clip_planes);
-    }
-    GPU_batch_draw(batch);
-  }
-}
-
-static void bbs_mesh_face_dot(GPUBatch *batch, const float world_clip_planes[6][4])
-{
-  const eGPUShaderConfig sh_cfg = world_clip_planes ? GPU_SHADER_CFG_CLIPPED :
-                                                      GPU_SHADER_CFG_DEFAULT;
-  GPU_batch_program_set_builtin_with_config(batch, GPU_SHADER_3D_FLAT_SELECT_ID, sh_cfg);
-  GPU_batch_uniform_1ui(batch, "offset", 1);
-  if (world_clip_planes != NULL) {
-    bbs_world_clip_planes_from_rv3d(batch, world_clip_planes);
-  }
-  GPU_batch_draw(batch);
-}
-
-static void bbs_mesh_solid_verts(Depsgraph *UNUSED(depsgraph),
-                                 Scene *UNUSED(scene),
-                                 Object *ob,
-                                 const float world_clip_planes[6][4])
-{
-  Mesh *me = ob->data;
-
-  DRW_mesh_batch_cache_validate(me);
-
-  GPUBatch *geom_faces = DRW_mesh_batch_cache_get_triangles_with_select_id(me);
-  GPUBatch *geom_verts = DRW_mesh_batch_cache_get_verts_with_select_id(me);
-  DRW_mesh_batch_cache_create_requested(ob, me, NULL, false, true);
-
-  /* Only draw faces to mask out verts, we don't want their selection ID's. */
-  bbs_mesh_face(geom_faces, false, world_clip_planes);
-  bbs_mesh_verts(geom_verts, 1, world_clip_planes);
-
-  bm_vertoffs = me->totvert + 1;
-}
-
-static void bbs_mesh_solid_faces(Scene *UNUSED(scene),
-                                 Object *ob,
-                                 const float world_clip_planes[6][4])
-{
-  Mesh *me = ob->data;
-  Mesh *me_orig = DEG_get_original_object(ob)->data;
-
-  DRW_mesh_batch_cache_validate(me);
-
-  const bool use_hide = (me_orig->editflag & ME_EDIT_PAINT_FACE_SEL);
-  GPUBatch *geom_faces = DRW_mesh_batch_cache_get_triangles_with_select_id(me);
-  DRW_mesh_batch_cache_create_requested(ob, me, NULL, false, use_hide);
-
-  bbs_mesh_face(geom_faces, true, world_clip_planes);
-}
-
-void draw_object_select_id(Depsgraph *depsgraph,
-                           Scene *scene,
-                           View3D *v3d,
-                           RegionView3D *rv3d,
-                           Object *ob,
-                           short select_mode)
-{
-  ToolSettings *ts = scene->toolsettings;
-  if (select_mode == -1) {
-    select_mode = ts->selectmode;
-  }
-
-  GPU_matrix_mul(ob->obmat);
-  GPU_depth_test(true);
-
-  const float(*world_clip_planes)[4] = NULL;
-  if (rv3d->rflag & RV3D_CLIPPING) {
-    ED_view3d_clipping_local(rv3d, ob->obmat);
-    world_clip_planes = rv3d->clip_local;
-  }
-
-  switch (ob->type) {
-    case OB_MESH:
-      if (ob->mode & OB_MODE_EDIT) {
-        Mesh *me = ob->data;
-        BMEditMesh *em = me->edit_mesh;
-        const bool draw_facedot = check_ob_drawface_dot(scene, v3d, ob->dt);
-        const bool use_faceselect = (select_mode & SCE_SELECT_FACE) != 0;
-
-        DRW_mesh_batch_cache_validate(me);
-
-        BM_mesh_elem_table_ensure(em->bm, BM_VERT | BM_EDGE | BM_FACE);
-
-        GPUBatch *geom_faces, *geom_edges, *geom_verts, *geom_facedots;
-        geom_faces = DRW_mesh_batch_cache_get_triangles_with_select_id(me);
-        if (select_mode & SCE_SELECT_EDGE) {
-          geom_edges = DRW_mesh_batch_cache_get_edges_with_select_id(me);
-        }
-        if (select_mode & SCE_SELECT_VERTEX) {
-          geom_verts = DRW_mesh_batch_cache_get_verts_with_select_id(me);
-        }
-        if (draw_facedot) {
-          geom_facedots = DRW_mesh_batch_cache_get_facedots_with_select_id(me);
-        }
-        DRW_mesh_batch_cache_create_requested(ob, me, NULL, false, true);
-
-        bbs_mesh_face(geom_faces, use_faceselect, world_clip_planes);
-
-        if (use_faceselect && draw_facedot) {
-          bbs_mesh_face_dot(geom_facedots, world_clip_planes);
-        }
-
-        if (select_mode & SCE_SELECT_FACE) {
-          bm_solidoffs = 1 + em->bm->totface;
-        }
-        else {
-          bm_solidoffs = 1;
-        }
-
-        ED_view3d_polygon_offset(rv3d, 1.0);
-
-        /* we draw edges if edge select mode */
-        if (select_mode & SCE_SELECT_EDGE) {
-          bbs_mesh_wire(geom_edges, bm_solidoffs, world_clip_planes);
-          bm_wireoffs = bm_solidoffs + em->bm->totedge;
-        }
-        else {
-          /* `bm_vertoffs` is calculated from `bm_wireoffs`. (otherwise see T53512) */
-          bm_wireoffs = bm_solidoffs;
-        }
-
-        ED_view3d_polygon_offset(rv3d, 1.1);
-
-        /* we draw verts if vert select mode. */
-        if (select_mode & SCE_SELECT_VERTEX) {
-          bbs_mesh_verts(geom_verts, bm_wireoffs, world_clip_planes);
-          bm_vertoffs = bm_wireoffs + em->bm->totvert;
-        }
-        else {
-          bm_vertoffs = bm_wireoffs;
-        }
-
-        ED_view3d_polygon_offset(rv3d, 0.0);
-      }
-      else {
-        Mesh *me = DEG_get_original_object(ob)->data;
-        if ((me->editflag & ME_EDIT_PAINT_VERT_SEL) &&
-            /* currently vertex select supports weight paint and vertex paint*/
-            ((ob->mode & OB_MODE_WEIGHT_PAINT) || (ob->mode & OB_MODE_VERTEX_PAINT))) {
-          bbs_mesh_solid_verts(depsgraph, scene, ob, world_clip_planes);
-        }
-        else {
-          bbs_mesh_solid_faces(scene, ob, world_clip_planes);
-        }
-      }
-      break;
-    case OB_CURVE:
-    case OB_SURF:
-      break;
-  }
-
-  GPU_matrix_set(rv3d->viewmat);
-}
-
 void ED_draw_object_facemap(Depsgraph *depsgraph,
                             Object *ob,
                             const float col[4],
diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c
index b0cee18f8e3..e0dbe1f6543 100644
--- a/source/blender/editors/space_view3d/view3d_draw_legacy.c
+++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c
@@ -77,6 +77,7 @@
 #include "ED_armature.h"
 #include "ED_keyframing.h"
 #include "ED_gpencil.h"
+#include "ED_mesh.h"
 #include "ED_screen.h"
 #include "ED_space_api.h"
 #include "ED_screen_types.h"
@@ -208,7 +209,16 @@ static void validate_object_select_id(struct Depsgraph *depsgraph,
 
   if (obact_eval && ((obact_eval->base_flag & BASE_VISIBLE) != 0)) {
     DRW_framebuffer_select_id_setup(ar, true);
-    draw_object_select_id(depsgraph, scene_eval, v3d, rv3d, obact_eval, select_mode);
+    DRW_draw_select_id_object(scene_eval,
+                              rv3d,
+                              obact_eval,
+                              select_mode,
+                              false,
+                              0,
+                              &bm_vertoffs,
+                              &bm_wireoffs,
+                              &bm_solidoffs);
+
     DRW_framebuffer_select_id_release(ar);
   }
 
@@ -271,10 +281,8 @@ void ED_view3d_backbuf_depth_validate(ViewContext *vc)
   }
 }
 
-uint *ED_view3d_select_id_read_rect(ViewContext *vc, const rcti *clip, uint *r_buf_len)
+uint *ED_view3d_select_id_read_rect(ViewContext *UNUSED(vc), const rcti *clip, uint *r_buf_len)
 {
-  ED_view3d_select_id_validate(vc);
-
   uint width = BLI_rcti_size_x(clip);
   uint height = BLI_rcti_size_y(clip);
   uint buf_len = width * height;
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c
index 6f35c0aa748..9cbf179ab49 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c
@@ -304,15 +304,14 @@ static int gizmo_preselect_edgering_test_select(bContext *C, wmGizmo *gz, const
   em_setup_viewcontext(C, &vc);
   copy_v2_v2_int(vc.mval, mval);
 
-  for (uint base_index = 0; base_index < gz_ring->bases_len; base_index++) {
-    Object *ob_iter = gz_ring->bases[base_index]->object;
-    ED_view3d_viewcontext_init_object(&vc, ob_iter);
-    BMEdge *eed_test = EDBM_edge_find_nearest_ex(&vc, &best.dist, NULL, false, false, NULL);
-    if (eed_test) {
-      best.ob = ob_iter;
-      best.eed = eed_test;
-      best.base_index = base_index;
-    }
+  uint base_index;
+  BMEdge *eed_test = EDBM_edge_find_nearest_ex(
+      &vc, &best.dist, NULL, false, false, NULL, gz_ring->bases, gz_ring->bases_len, &base_index);
+
+  if (eed_test) {
+    best.ob = gz_ring->bases[base_index]->object;
+    best.eed = eed_test;
+    best.base_index = base_index;
   }
 
   BMesh *bm = NULL;
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h
index 9075909a6fe..e499672acc1 100644
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@ -127,13 +127,6 @@ void VIEW3D_OT_fly(struct wmOperatorType *ot);
 void VIEW3D_OT_walk(struct wmOperatorType *ot);
 
 /* drawobject.c */
-void draw_object_select_id(struct Depsgraph *depsgraph,
-                           Scene *scene,
-                           View3D *v3d,
-                           RegionView3D *rv3d,
-                           struct Object *ob,
-                           short select_mode);
-
 int view3d_effective_drawtype(const struct View3D *v3d);
 
 /* view3d_draw.c */
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index c916e470322..419ec87eec8 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -135,9 +135,6 @@ void ED_view3d_viewcontext_init_object(ViewContext *vc, Object *obact)
   if (vc->obedit) {
     BLI_assert(BKE_object_is_in_editmode(obact));
     vc->obedit = obact;
-    /* previous selections are now invalid. */
-    vc->v3d->flag |= V3D_INVALID_BACKBUF;
-
     if (vc->em) {
       vc->em = BKE_editmesh_from_object(vc->obedit);
     }
@@ -2359,14 +2356,14 @@ static bool do_paintvert_box_select(ViewContext *vc, const rcti *rect, const eSe
   }
   else if (use_zbuf) {
     MVert *mvert;
-    unsigned int *rt;
+    uint *rt, *buf, buf_len;
     int a, index;
     char *selar;
 
     selar = MEM_callocN(me->totvert + 1, "selar");
 
-    uint buf_len;
-    uint *buf = ED_view3d_select_id_read_rect(vc, rect, &buf_len);
+    ED_view3d_select_id_validate(vc);
+    buf = ED_view3d_select_id_read_rect(vc, rect, &buf_len);
 
     rt = buf;