GPU_matrix: use Blender's naming conventions

Thanks to @sergey for review

1 files changed, 35 insertions, 35 deletions

diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index 164565192fd..29bc0543426 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -356,11 +356,11 @@ static void draw_stabilization_border(SpaceClip *sc, ARegion *ar, int width, int
 		glEnable(GL_COLOR_LOGIC_OP);
 		glLogicOp(GL_XOR);
 
-		gpuPushMatrix();
-		gpuTranslate2f(x, y);
+		GPU_matrix_push();
+		GPU_matrix_translate_2f(x, y);
 
-		gpuScale2f(zoomx, zoomy);
-		gpuMultMatrix(sc->stabmat);
+		GPU_matrix_scale_2f(zoomx, zoomy);
+		GPU_matrix_mul(sc->stabmat);
 
 		immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
 
@@ -377,7 +377,7 @@ static void draw_stabilization_border(SpaceClip *sc, ARegion *ar, int width, int
 
 		immUnbindProgram();
 
-		gpuPopMatrix();
+		GPU_matrix_pop();
 
 		glDisable(GL_COLOR_LOGIC_OP);
 	}
@@ -603,8 +603,8 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT
 	}
 
 	/* pattern and search outline */
-	gpuPushMatrix();
-	gpuTranslate2fv(marker_pos);
+	GPU_matrix_push();
+	GPU_matrix_translate_2fv(marker_pos);
 
 	if (sc->flag & SC_SHOW_MARKER_PATTERN) {
 		immBegin(GWN_PRIM_LINE_LOOP, 4);
@@ -625,7 +625,7 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT
 		                            marker->search_max[1]);
 	}
 
-	gpuPopMatrix();
+	GPU_matrix_pop();
 }
 
 static void track_colors(MovieTrackingTrack *track, int act, float col[3], float scol[3])
@@ -745,8 +745,8 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
 	}
 
 	/* pattern */
-	gpuPushMatrix();
-	gpuTranslate2fv(marker_pos);
+	GPU_matrix_push();
+	GPU_matrix_translate_2fv(marker_pos);
 
 	if (track->flag & TRACK_LOCKED) {
 		if (act) {
@@ -800,7 +800,7 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
 		                            marker->search_max[0], marker->search_max[1]);
 	}
 
-	gpuPopMatrix();
+	GPU_matrix_pop();
 
 	/* Restore default shader */
 	immUnbindProgram();
@@ -884,8 +884,8 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
 		immUniformThemeColor(TH_MARKER_OUTLINE);
 	}
 
-	gpuPushMatrix();
-	gpuTranslate2fv(marker_pos);
+	GPU_matrix_push();
+	GPU_matrix_translate_2fv(marker_pos);
 
 	dx = 6.0f / width / sc->zoom;
 	dy = 6.0f / height / sc->zoom;
@@ -944,7 +944,7 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
 		draw_marker_slide_square(tilt_ctrl[0], tilt_ctrl[1], patdx, patdy, outline, px, pos);
 	}
 
-	gpuPopMatrix();
+	GPU_matrix_pop();
 }
 
 static void draw_marker_texts(SpaceClip *sc, MovieTrackingTrack *track, MovieTrackingMarker *marker,
@@ -1141,8 +1141,8 @@ static void draw_plane_marker_image(Scene *scene,
 			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, ibuf->x, ibuf->y, 0, GL_RGBA,
 			             GL_UNSIGNED_BYTE, display_buffer);
 
-			gpuPushMatrix();
-			gpuMultMatrix(gl_matrix);
+			GPU_matrix_push();
+			GPU_matrix_mul(gl_matrix);
 
 			Gwn_VertFormat *imm_format = immVertexFormat();
 			uint pos = GWN_vertformat_attr_add(imm_format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
@@ -1170,7 +1170,7 @@ static void draw_plane_marker_image(Scene *scene,
 
 			immUnbindProgram();
 
-			gpuPopMatrix();
+			GPU_matrix_pop();
 
 			glBindTexture(GL_TEXTURE_2D, 0);
 
@@ -1342,13 +1342,13 @@ static void draw_tracking_tracks(SpaceClip *sc, Scene *scene, ARegion *ar, Movie
 
 	UI_view2d_view_to_region_fl(&ar->v2d, 0.0f, 0.0f, &x, &y);
 
-	gpuPushMatrix();
-	gpuTranslate2f(x, y);
+	GPU_matrix_push();
+	GPU_matrix_translate_2f(x, y);
 
-	gpuPushMatrix();
-	gpuScale2f(zoomx, zoomy);
-	gpuMultMatrix(sc->stabmat);
-	gpuScale2f(width, height);
+	GPU_matrix_push();
+	GPU_matrix_scale_2f(zoomx, zoomy);
+	GPU_matrix_mul(sc->stabmat);
+	GPU_matrix_scale_2f(width, height);
 
 	act_track = BKE_tracking_track_get_active(tracking);
 
@@ -1539,7 +1539,7 @@ static void draw_tracking_tracks(SpaceClip *sc, Scene *scene, ARegion *ar, Movie
 
 	immUnbindProgram();
 
-	gpuPopMatrix();
+	GPU_matrix_pop();
 
 	if (sc->flag & SC_SHOW_NAMES) {
 		/* scaling should be cleared before drawing texts, otherwise font would also be scaled */
@@ -1565,7 +1565,7 @@ static void draw_tracking_tracks(SpaceClip *sc, Scene *scene, ARegion *ar, Movie
 		}
 	}
 
-	gpuPopMatrix();
+	GPU_matrix_pop();
 
 	if (marker_pos)
 		MEM_freeN(marker_pos);
@@ -1592,11 +1592,11 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 
 	UI_view2d_view_to_region_fl(&ar->v2d, 0.0f, 0.0f, &x, &y);
 
-	gpuPushMatrix();
-	gpuTranslate2f(x, y);
-	gpuScale2f(zoomx, zoomy);
-	gpuMultMatrix(sc->stabmat);
-	gpuScale2f(width, height);
+	GPU_matrix_push();
+	GPU_matrix_translate_2f(x, y);
+	GPU_matrix_scale_2f(zoomx, zoomy);
+	GPU_matrix_mul(sc->stabmat);
+	GPU_matrix_scale_2f(width, height);
 
 	uint position = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 
@@ -1774,7 +1774,7 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 
 	immUnbindProgram();
 
-	gpuPopMatrix();
+	GPU_matrix_pop();
 }
 
 void clip_draw_main(const bContext *C, SpaceClip *sc, ARegion *ar)
@@ -1871,8 +1871,8 @@ void clip_draw_grease_pencil(bContext *C, int onlyv2d)
 		 * associated with the clip is already drawn in draw_distortion
 		 */
 		if ((sc->flag & SC_MANUAL_CALIBRATION) == 0 || is_track_source) {
-			gpuPushMatrix();
-			gpuMultMatrix(sc->unistabmat);
+			GPU_matrix_push();
+			GPU_matrix_mul(sc->unistabmat);
 
 			if (is_track_source) {
 				MovieTrackingTrack *track = BKE_tracking_track_get_active(&sc->clip->tracking);
@@ -1881,13 +1881,13 @@ void clip_draw_grease_pencil(bContext *C, int onlyv2d)
 					int framenr = ED_space_clip_get_clip_frame_number(sc);
 					MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
 
-					gpuTranslate2fv(marker->pos);
+					GPU_matrix_translate_2fv(marker->pos);
 				}
 			}
 
 			ED_gpencil_draw_2dimage(C);
 
-			gpuPopMatrix();
+			GPU_matrix_pop();
 		}
 	}
 	else {