1 files changed, 10 insertions, 22 deletions

diff --git a/source/blender/editors/space_view3d/view3d_placement.c b/source/blender/editors/space_view3d/view3d_placement.c
index a828dbc2ee0..6c2f4df7004 100644
--- a/source/blender/editors/space_view3d/view3d_placement.c
+++ b/source/blender/editors/space_view3d/view3d_placement.c
@@ -258,12 +258,10 @@ static void draw_line_loop(const float coords[][3], int coords_len, const float
     GPU_vertbuf_attr_set(vert, pos, i, coords[i]);
   }
 
-  GPU_blend(true);
+  GPU_blend(GPU_BLEND_ALPHA);
   GPUBatch *batch = GPU_batch_create_ex(GPU_PRIM_LINE_LOOP, vert, NULL, GPU_BATCH_OWNS_VBO);
   GPU_batch_program_set_builtin(batch, GPU_SHADER_3D_POLYLINE_UNIFORM_COLOR);
 
-  GPU_batch_bind(batch);
-
   GPU_batch_uniform_4fv(batch, "color", color);
 
   float viewport[4];
@@ -273,10 +271,8 @@ static void draw_line_loop(const float coords[][3], int coords_len, const float
 
   GPU_batch_draw(batch);
 
-  GPU_batch_program_use_end(batch);
-
   GPU_batch_discard(batch);
-  GPU_blend(false);
+  GPU_blend(GPU_BLEND_NONE);
 }
 
 static void draw_line_pairs(const float coords_a[][3],
@@ -295,12 +291,10 @@ static void draw_line_pairs(const float coords_a[][3],
     GPU_vertbuf_attr_set(vert, pos, (i * 2) + 1, coords_b[i]);
   }
 
-  GPU_blend(true);
+  GPU_blend(GPU_BLEND_ALPHA);
   GPUBatch *batch = GPU_batch_create_ex(GPU_PRIM_LINES, vert, NULL, GPU_BATCH_OWNS_VBO);
   GPU_batch_program_set_builtin(batch, GPU_SHADER_3D_POLYLINE_UNIFORM_COLOR);
 
-  GPU_batch_bind(batch);
-
   GPU_batch_uniform_4fv(batch, "color", color);
 
   float viewport[4];
@@ -310,10 +304,8 @@ static void draw_line_pairs(const float coords_a[][3],
 
   GPU_batch_draw(batch);
 
-  GPU_batch_program_use_end(batch);
-
   GPU_batch_discard(batch);
-  GPU_blend(false);
+  GPU_blend(GPU_BLEND_NONE);
 }
 
 static void draw_line_bounds(const BoundBox *bounds, const float color[4])
@@ -347,12 +339,10 @@ static void draw_line_bounds(const BoundBox *bounds, const float color[4])
     GPU_vertbuf_attr_set(vert, pos, j++, bounds->vec[edges[i][1]]);
   }
 
-  GPU_blend(true);
+  GPU_blend(GPU_BLEND_ALPHA);
   GPUBatch *batch = GPU_batch_create_ex(GPU_PRIM_LINES, vert, NULL, GPU_BATCH_OWNS_VBO);
   GPU_batch_program_set_builtin(batch, GPU_SHADER_3D_POLYLINE_UNIFORM_COLOR);
 
-  GPU_batch_bind(batch);
-
   GPU_batch_uniform_4fv(batch, "color", color);
 
   float viewport[4];
@@ -362,10 +352,8 @@ static void draw_line_bounds(const BoundBox *bounds, const float color[4])
 
   GPU_batch_draw(batch);
 
-  GPU_batch_program_use_end(batch);
-
   GPU_batch_discard(batch);
-  GPU_blend(false);
+  GPU_blend(GPU_BLEND_NONE);
 }
 
 static bool calc_bbox(struct InteractivePlaceData *ipd, BoundBox *bounds)
@@ -598,23 +586,23 @@ static void draw_primitive_view(const struct bContext *C, ARegion *UNUSED(region
   UI_GetThemeColor3fv(TH_GIZMO_PRIMARY, color);
 
   const bool use_depth = !XRAY_ENABLED(ipd->v3d);
-  const bool depth_test_enabled = GPU_depth_test_enabled();
+  const eGPUDepthTest depth_test_enabled = GPU_depth_test_get();
 
   if (use_depth) {
-    GPU_depth_test(false);
+    GPU_depth_test(GPU_DEPTH_NONE);
     color[3] = 0.15f;
     draw_primitive_view_impl(C, ipd, color);
   }
 
   if (use_depth) {
-    GPU_depth_test(true);
+    GPU_depth_test(GPU_DEPTH_LESS_EQUAL);
   }
   color[3] = 1.0f;
   draw_primitive_view_impl(C, ipd, color);
 
   if (use_depth) {
     if (depth_test_enabled == false) {
-      GPU_depth_test(false);
+      GPU_depth_test(GPU_DEPTH_NONE);
     }
   }
 }