GWN: Port to GPU module: Replace GWN prefix by GPU

1 files changed, 37 insertions, 37 deletions

diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index 29bc0543426..ebdf5342172 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -80,7 +80,7 @@ static void draw_keyframe(int frame, int cfra, int sfra, float framelen, int wid
 	int x = (frame - sfra) * framelen;
 
 	if (width == 1) {
-		immBegin(GWN_PRIM_LINES, 2);
+		immBegin(GPU_PRIM_LINES, 2);
 		immVertex2i(pos, x, 0);
 		immVertex2i(pos, x, height * UI_DPI_FAC);
 		immEnd();
@@ -167,7 +167,7 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
 	BKE_movieclip_get_cache_segments(clip, &sc->user, &totseg, &points);
 	ED_region_cache_draw_cached_segments(ar, totseg, points, sfra, efra);
 
-	uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_I32, 2, GPU_FETCH_INT_TO_FLOAT);
 	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
 	/* track */
@@ -248,7 +248,7 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
 
 	ED_region_cache_draw_curfra_label(sc->user.framenr, x, 8.0f * UI_DPI_FAC);
 
-	pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_I32, 2, GWN_FETCH_INT_TO_FLOAT);
+	pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_I32, 2, GPU_FETCH_INT_TO_FLOAT);
 	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
 	/* solver keyframes */
@@ -290,7 +290,7 @@ static void draw_movieclip_muted(ARegion *ar, int width, int height, float zoomx
 {
 	int x, y;
 
-	uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
 	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
 	/* find window pixel coordinates of origin */
@@ -349,7 +349,7 @@ static void draw_stabilization_border(SpaceClip *sc, ARegion *ar, int width, int
 
 	/* draw boundary border for frame if stabilization is enabled */
 	if (sc->flag & SC_SHOW_STABLE && clip->tracking.stabilization.flag & TRACKING_2D_STABILIZATION) {
-		const uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		const uint shdr_pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
 
 		/* Exclusive OR allows to get orig value when second operand is 0,
 		 * and negative of orig value when second operand is 1. */
@@ -452,7 +452,7 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
 		i++;
 	}
 
-	uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
 
 	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
@@ -463,7 +463,7 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
 			if ((b - a - 1) >= 1) {
 				GPU_point_size(5.0f);
 
-				immBegin(GWN_PRIM_POINTS, b - a - 1);
+				immBegin(GPU_PRIM_POINTS, b - a - 1);
 
 				for (i = a; i < b; i++) {
 					if (i != curindex) {
@@ -478,7 +478,7 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
 		if ((b - a) >= 2) {
 			GPU_line_width(3.0f);
 
-			immBegin(GWN_PRIM_LINE_STRIP, b - a);
+			immBegin(GPU_PRIM_LINE_STRIP, b - a);
 
 			for (i = a; i < b; i++) {
 				immVertex2f(pos, path[i][0], path[i][1]);
@@ -494,7 +494,7 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
 		if ((curindex - a) >= 1) {
 			immUniformThemeColor(TH_PATH_BEFORE);
 
-			immBegin(GWN_PRIM_POINTS, curindex - a);
+			immBegin(GPU_PRIM_POINTS, curindex - a);
 
 			for (i = a; i < curindex; i++) {
 				immVertex2f(pos, path[i][0], path[i][1]);
@@ -506,7 +506,7 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
 		if ((b - curindex - 1) >= 1) {
 			immUniformThemeColor(TH_PATH_AFTER);
 
-			immBegin(GWN_PRIM_POINTS, b - curindex - 1);
+			immBegin(GPU_PRIM_POINTS, b - curindex - 1);
 
 			for (i = curindex + 1; i < b; i++) {
 				immVertex2f(pos, path[i][0], path[i][1]);
@@ -521,7 +521,7 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
 	if ((curindex - a + 1) >= 2) {
 		immUniformThemeColor(TH_PATH_BEFORE);
 
-		immBegin(GWN_PRIM_LINE_STRIP, curindex - a + 1);
+		immBegin(GPU_PRIM_LINE_STRIP, curindex - a + 1);
 
 		for (i = a; i <= curindex; i++) {
 			immVertex2f(pos, path[i][0], path[i][1]);
@@ -533,7 +533,7 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin
 	if ((b - curindex) >= 2) {
 		immUniformThemeColor(TH_PATH_AFTER);
 
-		immBegin(GWN_PRIM_LINE_STRIP, b - curindex);
+		immBegin(GPU_PRIM_LINE_STRIP, b - curindex);
 
 		for (i = curindex; i < b; i++) {
 			immVertex2f(pos, path[i][0], path[i][1]);
@@ -579,12 +579,12 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT
 		{
 			GPU_point_size(tiny ? 3.0f : 4.0f);
 
-			immBegin(GWN_PRIM_POINTS, 1);
+			immBegin(GPU_PRIM_POINTS, 1);
 			immVertex2f(position, pos[0], pos[1]);
 			immEnd();
 		}
 		else {
-			immBegin(GWN_PRIM_LINES, 8);
+			immBegin(GPU_PRIM_LINES, 8);
 
 			immVertex2f(position, pos[0] + px[0] * 2, pos[1]);
 			immVertex2f(position, pos[0] + px[0] * 8, pos[1]);
@@ -607,7 +607,7 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT
 	GPU_matrix_translate_2fv(marker_pos);
 
 	if (sc->flag & SC_SHOW_MARKER_PATTERN) {
-		immBegin(GWN_PRIM_LINE_LOOP, 4);
+		immBegin(GPU_PRIM_LINE_LOOP, 4);
 		immVertex2fv(position, marker->pattern_corners[0]);
 		immVertex2fv(position, marker->pattern_corners[1]);
 		immVertex2fv(position, marker->pattern_corners[2]);
@@ -705,14 +705,14 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
 
 			immUniform1f("dash_factor", 2.0f);  /* Solid "line" */
 
-			immBegin(GWN_PRIM_POINTS, 1);
+			immBegin(GPU_PRIM_POINTS, 1);
 			immVertex2f(shdr_pos, pos[0], pos[1]);
 			immEnd();
 		}
 		else {
 			immUniform1f("dash_factor", 2.0f);  /* Solid line */
 
-			immBegin(GWN_PRIM_LINES, 8);
+			immBegin(GPU_PRIM_LINES, 8);
 
 			immVertex2f(shdr_pos, pos[0] + px[0] * 3, pos[1]);
 			immVertex2f(shdr_pos, pos[0] + px[0] * 7, pos[1]);
@@ -735,7 +735,7 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
 			glEnable(GL_COLOR_LOGIC_OP);
 			glLogicOp(GL_XOR);
 
-			immBegin(GWN_PRIM_LINES, 2);
+			immBegin(GPU_PRIM_LINES, 2);
 			immVertex2fv(shdr_pos, pos);
 			immVertex2fv(shdr_pos, marker_pos);
 			immEnd();
@@ -783,7 +783,7 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
 	}
 
 	if ((track->pat_flag & SELECT) == sel && (sc->flag & SC_SHOW_MARKER_PATTERN)) {
-		immBegin(GWN_PRIM_LINE_LOOP, 4);
+		immBegin(GPU_PRIM_LINE_LOOP, 4);
 		immVertex2fv(shdr_pos, marker->pattern_corners[0]);
 		immVertex2fv(shdr_pos, marker->pattern_corners[1]);
 		immVertex2fv(shdr_pos, marker->pattern_corners[2]);
@@ -805,7 +805,7 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
 	/* Restore default shader */
 	immUnbindProgram();
 
-	const uint pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	const uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
 	BLI_assert(pos == shdr_pos);
 	UNUSED_VARS_NDEBUG(pos);
 
@@ -857,7 +857,7 @@ static void draw_marker_slide_triangle(float x, float y, float dx, float dy, int
 		tdy += px[1];
 	}
 
-	immBegin(GWN_PRIM_TRIS, 3);
+	immBegin(GPU_PRIM_TRIS, 3);
 	immVertex2f(pos, x, y);
 	immVertex2f(pos, x - tdx, y);
 	immVertex2f(pos, x, y + tdy);
@@ -935,7 +935,7 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
 
 		GPU_line_width(outline ? 3.0f : 1.0f);
 
-		immBegin(GWN_PRIM_LINES, 2);
+		immBegin(GPU_PRIM_LINES, 2);
 		immVertex2f(pos, 0.0f, 0.0f);
 		immVertex2fv(pos, tilt_ctrl);
 		immEnd();
@@ -1144,15 +1144,15 @@ static void draw_plane_marker_image(Scene *scene,
 			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);
-			uint texCoord = GWN_vertformat_attr_add(imm_format, "texCoord", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+			GPUVertFormat *imm_format = immVertexFormat();
+			uint pos = GPU_vertformat_attr_add(imm_format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
+			uint texCoord = GPU_vertformat_attr_add(imm_format, "texCoord", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
 
 			immBindBuiltinProgram(GPU_SHADER_2D_IMAGE_COLOR);
 			immUniformColor4f(1.0f, 1.0f, 1.0f, plane_track->image_opacity);
 			immUniform1i("image", 0);
 
-			immBegin(GWN_PRIM_TRI_FAN, 4);
+			immBegin(GPU_PRIM_TRI_FAN, 4);
 
 			immAttrib2f(texCoord, 0.0f, 0.0f);
 			immVertex2f(pos, 0.0f, 0.0f);
@@ -1206,7 +1206,7 @@ static void draw_plane_marker_ex(SpaceClip *sc, Scene *scene, MovieTrackingPlane
 	}
 
 	if (draw_plane_quad || is_selected_track) {
-		const uint shdr_pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		const uint shdr_pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
 
 		immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR);
 
@@ -1239,7 +1239,7 @@ static void draw_plane_marker_ex(SpaceClip *sc, Scene *scene, MovieTrackingPlane
 			}
 
 			/* Draw rectangle itself. */
-			immBegin(GWN_PRIM_LINE_LOOP, 4);
+			immBegin(GPU_PRIM_LINE_LOOP, 4);
 			immVertex2fv(shdr_pos, plane_marker->corners[0]);
 			immVertex2fv(shdr_pos, plane_marker->corners[1]);
 			immVertex2fv(shdr_pos, plane_marker->corners[2]);
@@ -1252,7 +1252,7 @@ static void draw_plane_marker_ex(SpaceClip *sc, Scene *scene, MovieTrackingPlane
 
 				immUniformColor3f(1.0f, 0.0f, 0.0f);
 
-				immBegin(GWN_PRIM_LINES, 2);
+				immBegin(GPU_PRIM_LINES, 2);
 
 				getArrowEndPoint(width, height, sc->zoom, plane_marker->corners[0], plane_marker->corners[1], end_point);
 				immVertex2fv(shdr_pos, plane_marker->corners[0]);
@@ -1262,7 +1262,7 @@ static void draw_plane_marker_ex(SpaceClip *sc, Scene *scene, MovieTrackingPlane
 
 				immUniformColor3f(0.0f, 1.0f, 0.0f);
 
-				immBegin(GWN_PRIM_LINES, 2);
+				immBegin(GPU_PRIM_LINES, 2);
 
 				getArrowEndPoint(width, height, sc->zoom, plane_marker->corners[0], plane_marker->corners[3], end_point);
 				immVertex2fv(shdr_pos, plane_marker->corners[0]);
@@ -1414,7 +1414,7 @@ static void draw_tracking_tracks(SpaceClip *sc, Scene *scene, ARegion *ar, Movie
 		}
 	}
 
-	uint position = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+	uint position = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
 
 	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
@@ -1519,7 +1519,7 @@ static void draw_tracking_tracks(SpaceClip *sc, Scene *scene, ARegion *ar, Movie
 							immUniformColor3f(1.0f, 0.0f, 0.0f);
 						}
 
-						immBegin(GWN_PRIM_POINTS, 1);
+						immBegin(GPU_PRIM_POINTS, 1);
 
 						if (undistort) {
 							immVertex2f(position, pos[0] / width, pos[1] / (height * aspy));
@@ -1598,7 +1598,7 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 	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);
+	uint position = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
 
 	immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
@@ -1675,7 +1675,7 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 		immUniformColor3f(1.0f, 0.0f, 0.0f);
 
 		for (i = 0; i <= n; i++) {
-			immBegin(GWN_PRIM_LINE_STRIP, n + 1);
+			immBegin(GPU_PRIM_LINE_STRIP, n + 1);
 
 			for (j = 0; j <= n; j++) {
 				immVertex2fv(position, grid[i][j]);
@@ -1685,7 +1685,7 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 		}
 
 		for (j = 0; j <= n; j++) {
-			immBegin(GWN_PRIM_LINE_STRIP, n + 1);
+			immBegin(GPU_PRIM_LINE_STRIP, n + 1);
 
 			for (i = 0; i <= n; i++) {
 				immVertex2fv(position, grid[i][j]);
@@ -1743,7 +1743,7 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 								sub_v2_v2v2(dpos, npos, pos);
 								mul_v2_fl(dpos, 1.0f / steps);
 
-								immBegin(GWN_PRIM_LINE_STRIP, steps + 1);
+								immBegin(GPU_PRIM_LINE_STRIP, steps + 1);
 
 								for (j = 0; j <= steps; j++) {
 									BKE_tracking_distort_v2(tracking, pos, tpos);
@@ -1756,7 +1756,7 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip,
 							}
 						}
 						else if (stroke->totpoints == 1) {
-							immBegin(GWN_PRIM_POINTS, 1);
+							immBegin(GPU_PRIM_POINTS, 1);
 							immVertex2f(position, stroke->points[0].x + offsx, stroke->points[0].y + offsy);
 							immEnd();
 						}