From 4b043994e8795f37e9227362fe24fd66d45c6b39 Mon Sep 17 00:00:00 2001 From: Mike Erwin Date: Sat, 15 Apr 2017 01:29:25 -0400 Subject: GPU Matrix API: clean up after 2D-3D unification See GPU_matrix.h & gpu_matrix.c for the important changes. Other files are mostly just updated to use the latest API. - remove unused functions, defines, enums, comments - remove "3D" from function names - init to Identity transform (otherwise empty stack) - gpuMatrixReset lets outside code return to initial state Part of T49450 Follow up to D2626 and 49fc9cff3b90 --- source/blender/editors/space_clip/clip_draw.c | 12 ++++++------ source/blender/editors/space_clip/space_clip.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'source/blender/editors/space_clip') diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c index 0986a4bc4a7..dfedfa5bc12 100644 --- a/source/blender/editors/space_clip/clip_draw.c +++ b/source/blender/editors/space_clip/clip_draw.c @@ -357,7 +357,7 @@ static void draw_stabilization_border(SpaceClip *sc, ARegion *ar, int width, int gpuTranslate2f(x, y); gpuScale2f(zoomx, zoomy); - gpuMultMatrix3D(sc->stabmat); /* XXX can we make stabmat a 2D matrix? --merwin */ + gpuMultMatrix(sc->stabmat); unsigned int pos = VertexFormat_add_attrib(immVertexFormat(), "pos", COMP_F32, 2, KEEP_FLOAT); @@ -1079,7 +1079,7 @@ static void draw_plane_marker_image(Scene *scene, plane_marker->corners, perspective_matrix); - homogeneous_2d_to_gl_matrix(perspective_matrix, gl_matrix); /* XXX update for new 2D matrix API --merwin */ + homogeneous_2d_to_gl_matrix(perspective_matrix, gl_matrix); if (plane_track->image_opacity != 1.0f || ibuf->planes == 32) { transparent = true; @@ -1098,7 +1098,7 @@ static void draw_plane_marker_image(Scene *scene, GL_UNSIGNED_BYTE, display_buffer); gpuPushMatrix(); - gpuMultMatrix3D(gl_matrix); /* XXX update for new 2D matrix API --merwin */ + gpuMultMatrix(gl_matrix); VertexFormat *imm_format = immVertexFormat(); unsigned int pos = VertexFormat_add_attrib(imm_format, "pos", COMP_F32, 2, KEEP_FLOAT); @@ -1296,7 +1296,7 @@ static void draw_tracking_tracks(SpaceClip *sc, Scene *scene, ARegion *ar, Movie gpuPushMatrix(); gpuScale2f(zoomx, zoomy); - gpuMultMatrix3D(sc->stabmat); /* XXX would like 2D stabmat --merwin */ + gpuMultMatrix(sc->stabmat); gpuScale2f(width, height); act_track = BKE_tracking_track_get_active(tracking); @@ -1544,7 +1544,7 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip, gpuPushMatrix(); gpuTranslate2f(x, y); gpuScale2f(zoomx, zoomy); - gpuMultMatrix3D(sc->stabmat); /* XXX make 2D */ + gpuMultMatrix(sc->stabmat); gpuScale2f(width, height); unsigned int position = VertexFormat_add_attrib(immVertexFormat(), "pos", COMP_F32, 2, KEEP_FLOAT); @@ -1821,7 +1821,7 @@ void clip_draw_grease_pencil(bContext *C, int onlyv2d) */ if ((sc->flag & SC_MANUAL_CALIBRATION) == 0 || is_track_source) { gpuPushMatrix(); - gpuMultMatrix3D(sc->unistabmat); /* XXX make 2D */ + gpuMultMatrix(sc->unistabmat); if (is_track_source) { MovieTrackingTrack *track = BKE_tracking_track_get_active(&sc->clip->tracking); diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c index 9f35fff5e78..a480338798d 100644 --- a/source/blender/editors/space_clip/space_clip.c +++ b/source/blender/editors/space_clip/space_clip.c @@ -1216,7 +1216,7 @@ static void clip_main_region_draw(const bContext *C, ARegion *ar) gpuPushMatrix(); gpuTranslate2f(x, y); gpuScale2f(zoomx, zoomy); - gpuMultMatrix3D(sc->stabmat); /* XXX make this a 2D matrix */ + gpuMultMatrix(sc->stabmat); gpuScale2f(width, height); ED_image_draw_cursor(ar, sc->cursor); gpuPopMatrix(); -- cgit v1.2.3