OpenGL: convert to new matrix API (part 2 of x)

Part of T49450

For this batch I focused on usage of gpuMatrixUpdate_legacy.

2 files changed, 4 insertions, 16 deletions

diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index 4117a15594c..a76731da9d5 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -583,7 +583,6 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT
 	/* pattern and search outline */
 	gpuPushMatrix();
 	gpuTranslate2fv(marker_pos);
-	gpuMatrixUpdate_legacy(); /* remove */
 
 	if (sc->flag & SC_SHOW_MARKER_PATTERN) {
 		immBegin(GL_LINE_LOOP, 4);
@@ -605,7 +604,6 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT
 	}
 
 	gpuPopMatrix();
-	gpuMatrixUpdate_legacy(); /* remove */
 }
 
 static void track_colors(MovieTrackingTrack *track, int act, float col[3], float scol[3])
@@ -712,7 +710,6 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
 	/* pattern */
 	gpuPushMatrix();
 	gpuTranslate2fv(marker_pos);
-	gpuMatrixUpdate_legacy(); /* remove */
 
 	if (tiny) {
 		setlinestyle(3);
@@ -769,7 +766,6 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
 	}
 
 	gpuPopMatrix();
-	gpuMatrixUpdate_legacy(); /* remove */
 }
 
 static float get_shortest_pattern_side(MovieTrackingMarker *marker)
@@ -846,7 +842,6 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
 
 	gpuPushMatrix();
 	gpuTranslate2fv(marker_pos);
-	gpuMatrixUpdate_legacy(); /* remove */
 
 	dx = 6.0f / width / sc->zoom;
 	dy = 6.0f / height / sc->zoom;
@@ -906,7 +901,6 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
 	}
 
 	gpuPopMatrix();
-	gpuMatrixUpdate_legacy(); /* remove */
 }
 
 static void draw_marker_texts(SpaceClip *sc, MovieTrackingTrack *track, MovieTrackingMarker *marker,
diff --git a/source/blender/editors/space_clip/clip_graph_draw.c b/source/blender/editors/space_clip/clip_graph_draw.c
index 7afa2ae8145..a9d02018f49 100644
--- a/source/blender/editors/space_clip/clip_graph_draw.c
+++ b/source/blender/editors/space_clip/clip_graph_draw.c
@@ -119,14 +119,13 @@ static void tracking_segment_knot_cb(void *userdata, MovieTrackingTrack *track,
 	if (sel == data->sel) {
 		immUniformThemeColor(sel ? TH_HANDLE_VERTEX_SELECT : TH_HANDLE_VERTEX);
 
-		glPushMatrix();
-		glTranslatef(scene_framenr, val, 0.0f);
-		glScalef(1.0f / data->xscale * data->hsize, 1.0f / data->yscale * data->hsize, 1.0f);
-		gpuMatrixUpdate_legacy();
+		gpuPushMatrix();
+		gpuTranslate2f(scene_framenr, val);
+		gpuScale2f(1.0f / data->xscale * data->hsize, 1.0f / data->yscale * data->hsize);
 
 		imm_draw_lined_circle(data->pos, 0, 0, 0.7, 8);
 
-		glPopMatrix();
+		gpuPopMatrix();
 	}
 }
 
@@ -153,9 +152,6 @@ static void draw_tracks_motion_curves(View2D *v2d, SpaceClip *sc, unsigned int p
 	                                   (sc->flag & SC_SHOW_GRAPH_SEL_ONLY) != 0,
 	                                   (sc->flag & SC_SHOW_GRAPH_HIDDEN) != 0,
 	                                   &userdata, tracking_segment_knot_cb, NULL, NULL);
-
-	gpuMatrixUpdate_legacy();
-
 	/* draw graph lines */
 	glEnable(GL_BLEND);
 	clip_graph_tracking_values_iterate(sc,
@@ -171,8 +167,6 @@ static void draw_tracks_motion_curves(View2D *v2d, SpaceClip *sc, unsigned int p
 	                                   (sc->flag & SC_SHOW_GRAPH_SEL_ONLY) != 0,
 	                                   (sc->flag & SC_SHOW_GRAPH_HIDDEN) != 0,
 	                                   &userdata, tracking_segment_knot_cb, NULL, NULL);
-
-	gpuMatrixUpdate_legacy();
 }
 
 typedef struct TrackErrorCurveUserData {