From 8815f2f11632ea84d706bacd18e60639cb13d6eb Mon Sep 17 00:00:00 2001
From: Campbell Barton <campbell@blender.org>
Date: Mon, 31 Jan 2022 13:01:29 +1100
Subject: Cleanup: use struct for GPU the select buffer

GPU_select originally used GL_SELECT which defined the format for
storing the selection result.

Now this is no longer the case, define our own struct - making the code
easier to follow:

- Avoid having to deal with arrays in both `uint*` and `uint(*)[4]`
  multiplying offsets by 4 in some cases & not others.

- No magic numbers for the offsets of depth & selection-ID.

- No need to allocate unused members to match GL_SELECT
  (halving the buffer size).
---
 source/blender/editors/space_view3d/view3d_view.c | 24 +++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'source/blender/editors/space_view3d/view3d_view.c')

diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index 3b975fa0cfd..9a2cc76c44e 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -863,7 +863,7 @@ void view3d_opengl_select_cache_end(void)
 struct DrawSelectLoopUserData {
   uint pass;
   uint hits;
-  uint *buffer;
+  GPUSelectResult *buffer;
   uint buffer_len;
   const rcti *rect;
   eGPUSelectMode gpu_select_mode;
@@ -927,8 +927,8 @@ static bool drw_select_filter_object_mode_lock_for_weight_paint(Object *ob, void
 }
 
 int view3d_opengl_select_ex(ViewContext *vc,
-                            uint *buffer,
-                            uint bufsize,
+                            GPUSelectResult *buffer,
+                            uint buffer_len,
                             const rcti *input,
                             eV3DSelectMode select_mode,
                             eV3DSelectObjectFilter select_filter,
@@ -1043,7 +1043,7 @@ int view3d_opengl_select_ex(ViewContext *vc,
   /* Re-use cache (rect must be smaller than the cached)
    * other context is assumed to be unchanged */
   if (GPU_select_is_cached()) {
-    GPU_select_begin(buffer, bufsize, &rect, gpu_select_mode, 0);
+    GPU_select_begin(buffer, buffer_len, &rect, gpu_select_mode, 0);
     GPU_select_cache_load_id();
     hits = GPU_select_end();
     goto finally;
@@ -1071,7 +1071,7 @@ int view3d_opengl_select_ex(ViewContext *vc,
         .pass = 0,
         .hits = 0,
         .buffer = buffer,
-        .buffer_len = bufsize,
+        .buffer_len = buffer_len,
         .rect = &rect,
         .gpu_select_mode = gpu_select_mode,
     };
@@ -1101,7 +1101,7 @@ int view3d_opengl_select_ex(ViewContext *vc,
         .pass = 0,
         .hits = 0,
         .buffer = buffer,
-        .buffer_len = bufsize,
+        .buffer_len = buffer_len,
         .rect = &rect,
         .gpu_select_mode = gpu_select_mode,
     };
@@ -1144,24 +1144,24 @@ finally:
 }
 
 int view3d_opengl_select(ViewContext *vc,
-                         uint *buffer,
-                         uint bufsize,
+                         GPUSelectResult *buffer,
+                         uint buffer_len,
                          const rcti *input,
                          eV3DSelectMode select_mode,
                          eV3DSelectObjectFilter select_filter)
 {
-  return view3d_opengl_select_ex(vc, buffer, bufsize, input, select_mode, select_filter, false);
+  return view3d_opengl_select_ex(vc, buffer, buffer_len, input, select_mode, select_filter, false);
 }
 
 int view3d_opengl_select_with_id_filter(ViewContext *vc,
-                                        uint *buffer,
-                                        uint bufsize,
+                                        GPUSelectResult *buffer,
+                                        const uint buffer_len,
                                         const rcti *input,
                                         eV3DSelectMode select_mode,
                                         eV3DSelectObjectFilter select_filter,
                                         uint select_id)
 {
-  int hits = view3d_opengl_select(vc, buffer, bufsize, input, select_mode, select_filter);
+  int hits = view3d_opengl_select(vc, buffer, buffer_len, input, select_mode, select_filter);
 
   /* Selection sometimes uses -1 for an invalid selection ID, remove these as they
    * interfere with detection of actual number of hits in the selection. */
-- 
cgit v1.2.3