From 2d71d13ea2cb7a7640e5139dc24341bd58416d57 Mon Sep 17 00:00:00 2001 From: Mike Erwin Date: Fri, 15 Jan 2016 22:59:42 -0500 Subject: OpenGL: fixes related to GL_POINTS I put all usage of GL_POINTS under the microscope. Fixed problems & optimized a couple of spots. - reduce calls to glPointSize by about 50% - draw selected & unselected vertices together for UV editor & EditMesh - draw initial gpencil stroke point the proper size - a few other smaller fixes New policy: each GL_POINTS draw call needs to set its desired point size. This eliminates half our calls to glPointSize (setting it back to its 1.0 default after every draw). --- source/blender/editors/space_clip/clip_draw.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 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 e00ebc14ee0..77934bb4099 100644 --- a/source/blender/editors/space_clip/clip_draw.c +++ b/source/blender/editors/space_clip/clip_draw.c @@ -467,7 +467,6 @@ static void draw_track_path(SpaceClip *sc, MovieClip *UNUSED(clip), MovieTrackin glVertex2f(path[i][0], path[i][1]); } glEnd(); - glPointSize(1.0f); } static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieTrackingMarker *marker, @@ -495,12 +494,10 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT if (isect_point_quad_v2(p, marker->pattern_corners[0], marker->pattern_corners[1], marker->pattern_corners[2], marker->pattern_corners[3])) { - if (tiny) glPointSize(3.0f); - else glPointSize(4.0f); + glPointSize(tiny ? 3.0f : 4.0f); glBegin(GL_POINTS); glVertex2f(pos[0], pos[1]); glEnd(); - glPointSize(1.0f); } else { if (!tiny) glLineWidth(3.0f); @@ -612,15 +609,10 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra if (isect_point_quad_v2(p, marker->pattern_corners[0], marker->pattern_corners[1], marker->pattern_corners[2], marker->pattern_corners[3])) { - if (!tiny) - glPointSize(2.0f); - + glPointSize(tiny ? 1.0f : 2.0f); glBegin(GL_POINTS); glVertex2f(pos[0], pos[1]); glEnd(); - - if (!tiny) - glPointSize(1.0f); } else { glBegin(GL_LINES); @@ -1451,7 +1443,6 @@ static void draw_tracking_tracks(SpaceClip *sc, Scene *scene, ARegion *ar, Movie track = track->next; } - glPointSize(1.0f); glDisable(GL_POINT_SMOOTH); } @@ -1677,7 +1668,6 @@ static void draw_distortion(SpaceClip *sc, ARegion *ar, MovieClip *clip, } glLineWidth(1.0f); - glPointSize(1.0f); } glPopMatrix(); -- cgit v1.2.3