From 5e889ebf19ae1bd3daf6930473dc1d19029bf837 Mon Sep 17 00:00:00 2001 From: Mike Erwin Date: Tue, 28 Feb 2017 13:15:11 -0500 Subject: OpenGL: no more display lists Part of the OpenGL core profile upgrade (T49165) Use the Batch drawing API (GPU_batch.h) when you want do draw something multiple times. --- source/blender/editors/space_graph/graph_draw.c | 31 ++++++++----------------- 1 file changed, 10 insertions(+), 21 deletions(-) (limited to 'source/blender/editors/space_graph/graph_draw.c') diff --git a/source/blender/editors/space_graph/graph_draw.c b/source/blender/editors/space_graph/graph_draw.c index cdc7d62e267..99a38862354 100644 --- a/source/blender/editors/space_graph/graph_draw.c +++ b/source/blender/editors/space_graph/graph_draw.c @@ -388,31 +388,20 @@ static void draw_fcurve_handles(SpaceIpo *sipo, FCurve *fcu) */ static void draw_fcurve_sample_control(float x, float y, float xscale, float yscale, float hsize) { - static GLuint displist = 0; - - /* initialize X shape */ - if (displist == 0) { - displist = glGenLists(1); - glNewList(displist, GL_COMPILE); - - glBegin(GL_LINES); - glVertex2f(-0.7f, -0.7f); - glVertex2f(+0.7f, +0.7f); - - glVertex2f(-0.7f, +0.7f); - glVertex2f(+0.7f, -0.7f); - glEnd(); /* GL_LINES */ - - glEndList(); - } /* adjust view transform before starting */ glTranslatef(x, y, 0.0f); glScalef(1.0f / xscale * hsize, 1.0f / yscale * hsize, 1.0f); - - /* draw! */ - glCallList(displist); - + + /* draw X shape */ + glBegin(GL_LINES); + glVertex2f(-0.7f, -0.7f); + glVertex2f(+0.7f, +0.7f); + + glVertex2f(-0.7f, +0.7f); + glVertex2f(+0.7f, -0.7f); + glEnd(); /* GL_LINES */ + /* restore view transform */ glScalef(xscale / hsize, yscale / hsize, 1.0); glTranslatef(-x, -y, 0.0f); -- cgit v1.2.3