1 files changed, 60 insertions, 65 deletions

diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c
index 897e2f13774..df8d3cfb8db 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -86,16 +86,12 @@ static int draw_uvs_face_check(const ToolSettings *ts)
     if (ts->selectmode == SCE_SELECT_FACE) {
       return 2;
     }
-    else if (ts->selectmode & SCE_SELECT_FACE) {
+    if (ts->selectmode & SCE_SELECT_FACE) {
       return 1;
     }
-    else {
-      return 0;
-    }
-  }
-  else {
-    return (ts->uv_selectmode == UV_SELECT_FACE);
+    return 0;
   }
+  return (ts->uv_selectmode == UV_SELECT_FACE);
 }
 
 /* ------------------------- */
@@ -409,70 +405,68 @@ static void draw_uvs(SpaceImage *sima,
       GPU_blend(true);
     }
 
-    switch (sima->dt_uv) {
-      case SI_UVDT_DASH: {
-        float dash_colors[2][4] = {
-            {0.56f, 0.56f, 0.56f, overlay_alpha},
-            {0.07f, 0.07f, 0.07f, overlay_alpha},
-        };
-        float viewport_size[4];
-        GPU_viewport_size_get_f(viewport_size);
-
-        GPU_line_width(1.0f);
-        GPU_batch_program_set_builtin(batch->edges, GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
-        GPU_batch_uniform_4fv_array(batch->edges, "colors", 2, (float *)dash_colors);
-        GPU_batch_uniform_2f(batch->edges,
-                             "viewport_size",
-                             viewport_size[2] / UI_DPI_FAC,
-                             viewport_size[3] / UI_DPI_FAC);
-        GPU_batch_uniform_1i(batch->edges, "colors_len", 2); /* "advanced" mode */
-        GPU_batch_uniform_1f(batch->edges, "dash_width", 4.0f);
-        GPU_batch_uniform_1f(batch->edges, "dash_factor", 0.5f);
+    {
+      /* We could modify the vbo's data filling
+       * instead of modifying the provoking vert. */
+      GPU_provoking_vertex(GPU_VERTEX_FIRST);
+
+      UI_GetThemeColor3fv(TH_EDGE_SELECT, col2);
+      col2[3] = overlay_alpha;
+
+      const float dash_width = (sima->dt_uv == SI_UVDT_DASH) ? (4.0f * UI_DPI_FAC) : 9999.0f;
+      eGPUBuiltinShader shader = (interpedges) ? GPU_SHADER_2D_UV_EDGES_SMOOTH :
+                                                 GPU_SHADER_2D_UV_EDGES;
+#ifdef __APPLE__
+      if (sima->dt_uv == SI_UVDT_OUTLINE) {
+        /* Apple drivers do not support wide line. This is a workaround awaiting the 2D view
+         * refactor. Limiting to OSX since this will slow down the drawing. (see T76806) */
+        GPU_batch_program_set_builtin(batch->edges, GPU_SHADER_3D_POLYLINE_UNIFORM_COLOR);
+
+        float viewport[4];
+        GPU_viewport_size_get_f(viewport);
+
+        /* No U.pixelsize scaling for now since the inner line is not scalled. */
+        GPU_batch_uniform_1f(batch->edges, "lineWidth", 2.0f);
+        GPU_batch_uniform_4f(batch->edges, "color", 0.0f, 0.0f, 0.0f, 1.0f);
+        GPU_batch_uniform_2fv(batch->edges, "viewportSize", &viewport[2]);
+
         GPU_batch_draw(batch->edges);
-        break;
       }
-      case SI_UVDT_BLACK:
-      case SI_UVDT_WHITE:
-      case SI_UVDT_OUTLINE: {
-        /* We could modify the vbo's data filling
-         * instead of modifying the provoking vert. */
-        glProvokingVertex(GL_FIRST_VERTEX_CONVENTION);
-
-        UI_GetThemeColor3fv(TH_EDGE_SELECT, col2);
-        col2[3] = overlay_alpha;
-
-        GPU_batch_program_set_builtin(
-            batch->edges, (interpedges) ? GPU_SHADER_2D_UV_EDGES_SMOOTH : GPU_SHADER_2D_UV_EDGES);
-
-        if (sima->dt_uv == SI_UVDT_OUTLINE) {
-          /* Black Outline. */
-          GPU_line_width(3.0f);
-          GPU_batch_uniform_4f(batch->edges, "edgeColor", 0.0f, 0.0f, 0.0f, overlay_alpha);
-          GPU_batch_uniform_4f(batch->edges, "selectColor", 0.0f, 0.0f, 0.0f, overlay_alpha);
-          GPU_batch_draw(batch->edges);
-
-          UI_GetThemeColor3fv(TH_WIRE_EDIT, col1);
-        }
-        else if (sima->dt_uv == SI_UVDT_WHITE) {
-          copy_v3_fl3(col1, 1.0f, 1.0f, 1.0f);
-        }
-        else {
-          copy_v3_fl3(col1, 0.0f, 0.0f, 0.0f);
-        }
-        col1[3] = overlay_alpha;
+#endif
 
-        /* Inner Line. Use depth test to insure selection is drawn on top. */
-        GPU_depth_test(true);
-        GPU_line_width(1.0f);
-        GPU_batch_uniform_4fv(batch->edges, "edgeColor", col1);
-        GPU_batch_uniform_4fv(batch->edges, "selectColor", col2);
-        GPU_batch_draw(batch->edges);
-        GPU_depth_test(false);
+      GPU_batch_program_set_builtin(batch->edges, shader);
 
-        glProvokingVertex(GL_LAST_VERTEX_CONVENTION);
-        break;
+      if (sima->dt_uv == SI_UVDT_OUTLINE) {
+#ifndef __APPLE__
+        /* Black Outline. */
+        GPU_line_width(3.0f);
+        GPU_batch_uniform_4f(batch->edges, "edgeColor", 0.0f, 0.0f, 0.0f, overlay_alpha);
+        GPU_batch_uniform_4f(batch->edges, "selectColor", 0.0f, 0.0f, 0.0f, overlay_alpha);
+        GPU_batch_uniform_1f(batch->edges, "dashWidth", dash_width);
+        GPU_batch_draw(batch->edges);
+#endif
+        UI_GetThemeColor3fv(TH_WIRE_EDIT, col1);
       }
+      else if (sima->dt_uv == SI_UVDT_BLACK) {
+        copy_v3_fl3(col1, 0.0f, 0.0f, 0.0f);
+      }
+      else {
+        copy_v3_fl3(col1, 1.0f, 1.0f, 1.0f);
+      }
+      col1[3] = overlay_alpha;
+
+      /* Inner Line. Use depth test to insure selection is drawn on top. */
+      GPU_depth_test(true);
+      GPU_line_width(1.0f);
+      GPU_batch_uniform_4fv(batch->edges, "edgeColor", col1);
+      GPU_batch_uniform_4fv(batch->edges, "selectColor", col2);
+      GPU_batch_uniform_1f(batch->edges, "dashWidth", dash_width);
+      GPU_batch_draw(batch->edges);
+      GPU_depth_test(false);
+
+      GPU_provoking_vertex(GPU_VERTEX_LAST);
     }
+
     if (sima->flag & SI_SMOOTH_UV) {
       GPU_line_smooth(false);
       GPU_blend(false);
@@ -481,6 +475,7 @@ static void draw_uvs(SpaceImage *sima,
       GPU_blend(false);
     }
   }
+
   if (batch->verts || batch->facedots) {
     UI_GetThemeColor4fv(TH_VERTEX_SELECT, col2);
     if (batch->verts) {