Remove reference to WITH_LEGACY_OPENGL

We only keep this as a way to get GPU_stubs to run, in case we want to do a
throughout cleanup in the codebase and want code using legacy calls to
fail to build.

2 files changed, 2 insertions, 154 deletions

diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c
index 8db377c3061..896c20fbd96 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -1161,85 +1161,8 @@ static bool tex_mat_set_face_editmesh_cb(void *userData, int index)
 void draw_mesh_textured(Scene *scene, SceneLayer *sl, View3D *v3d, RegionView3D *rv3d,
                         Object *ob, DerivedMesh *dm, const int draw_flags)
 {
-#ifndef WITH_LEGACY_OPENGL
-	/* some legacy GL calls here will *crash* blender */
+	UNUSED_VARS(scene, sl, v3d, rv3d, ob, dm, draw_flags);
 	return;
-#endif
-
-	/* if not cycles, or preview-modifiers, or drawing matcaps */
-	if ((draw_flags & DRAW_MODIFIERS_PREVIEW) ||
-	    (v3d->flag2 & V3D_SHOW_SOLID_MATCAP) ||
-	    (BKE_scene_use_new_shading_nodes(scene) == false) ||
-	    ((ob->mode & OB_MODE_TEXTURE_PAINT) && ELEM(v3d->drawtype, OB_TEXTURE, OB_SOLID)))
-	{
-		draw_mesh_textured_old(scene, sl, v3d, rv3d, ob, dm, draw_flags);
-		return;
-	}
-	else if (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) {
-		draw_mesh_paint(v3d, rv3d, ob, dm, draw_flags);
-		return;
-	}
-
-	/* set opengl state for negative scale & color */
-	if (ob->transflag & OB_NEG_SCALE) glFrontFace(GL_CW);
-	else glFrontFace(GL_CCW);
-
-	Mesh *me = ob->data;
-
-	bool shadeless = ((v3d->flag2 & V3D_SHADELESS_TEX) &&
-	    ((v3d->drawtype == OB_TEXTURE) || (ob->mode & OB_MODE_TEXTURE_PAINT)));
-	bool two_sided_lighting = (me->flag & ME_TWOSIDED) != 0;
-
-	TexMatCallback data = {scene, ob, me, dm, shadeless, two_sided_lighting};
-	bool (*set_face_cb)(void *, int);
-	bool picking = (G.f & G_PICKSEL) != 0;
-	
-	/* face hiding callback depending on mode */
-	if (ob == scene->obedit)
-		set_face_cb = tex_mat_set_face_editmesh_cb;
-	else if (draw_flags & DRAW_FACE_SELECT)
-		set_face_cb = tex_mat_set_face_mesh_cb;
-	else
-		set_face_cb = NULL;
-
-	/* test if we can use glsl */
-	const int drawtype = view3d_effective_drawtype(v3d);
-	bool glsl = (drawtype == OB_MATERIAL) && !picking;
-
-	GPU_begin_object_materials(v3d, rv3d, scene, sl, ob, glsl, NULL);
-
-	if (glsl || picking) {
-		/* draw glsl or solid */
-		dm->drawMappedFacesMat(dm,
-		                       tex_mat_set_material_cb,
-		                       set_face_cb, &data);
-	}
-	else {
-		/* draw textured */
-		dm->drawMappedFacesMat(dm,
-		                       tex_mat_set_texture_cb,
-		                       set_face_cb, &data);
-	}
-
-	GPU_end_object_materials();
-
-	/* reset opengl state */
-	GPU_end_object_materials();
-	GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
-
-	glBindTexture(GL_TEXTURE_2D, 0);
-
-	glFrontFace(GL_CCW);
-
-	glMatrixMode(GL_TEXTURE);
-	glLoadIdentity(); /* TEXTURE */
-	glMatrixMode(GL_MODELVIEW);
-
-	/* faceselect mode drawing over textured mesh */
-	if (!(ob == scene->obedit) && (draw_flags & DRAW_FACE_SELECT)) {
-		bool draw_select_edges = (ob->mode & OB_MODE_TEXTURE_PAINT) == 0;
-		draw_mesh_face_select(rv3d, ob->data, dm, draw_select_edges);
-	}
 }
 
 /* Vertex Paint and Weight Paint */
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 5acc41643ef..2bae620a4ed 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -9422,21 +9422,6 @@ static void bbs_mesh_verts(BMEditMesh *em, DerivedMesh *dm, int offset)
 	immUnbindProgram();
 }
 
-#if defined(WITH_LEGACY_OPENGL)
-static DMDrawOption bbs_mesh_wire__setDrawOptions(void *userData, int index)
-{
-	drawBMOffset_userData *data = userData;
-	BMEdge *eed = BM_edge_at_index(data->bm, index);
-
-	if (!BM_elem_flag_test(eed, BM_ELEM_HIDDEN)) {
-		GPU_select_index_set(data->offset + index);
-		return DM_DRAW_OPTION_NORMAL;
-	}
-	else {
-		return DM_DRAW_OPTION_SKIP;
-	}
-}
-#else
 static void bbs_mesh_wire__mapFunc(void *userData, int index, const float v0co[3], const float v1co[3])
 {
 	drawBMOffset_userData *data = userData;
@@ -9450,16 +9435,13 @@ static void bbs_mesh_wire__mapFunc(void *userData, int index, const float v0co[3
 		immVertex3fv(data->pos, v1co);
 	}
 }
-#endif
+
 static void bbs_mesh_wire(BMEditMesh *em, DerivedMesh *dm, int offset)
 {
 	drawBMOffset_userData data;
 	data.bm = em->bm;
 	data.offset = offset;
 
-#if defined(WITH_LEGACY_OPENGL)
-	dm->drawMappedEdges(dm, bbs_mesh_wire__setDrawOptions, &data);
-#else
 	VertexFormat *format = immVertexFormat();
 
 	const int imm_len = dm->getNumEdges(dm) * 2;
@@ -9478,53 +9460,10 @@ static void bbs_mesh_wire(BMEditMesh *em, DerivedMesh *dm, int offset)
 	immEnd();
 
 	immUnbindProgram();
-#endif
 }
 
-#if defined(WITH_LEGACY_OPENGL)
-/**
- * dont set #GPU_framebuffer_index_set. just use to mask other
- */
-static DMDrawOption bbs_mesh_mask__setSolidDrawOptions(void *userData, int index)
-{
-	BMFace *efa = BM_face_at_index(userData, index);
-	
-	if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
-		return DM_DRAW_OPTION_NORMAL;
-	}
-	else {
-		return DM_DRAW_OPTION_SKIP;
-	}
-}
-
-static DMDrawOption bbs_mesh_solid__setSolidDrawOptions(void *userData, int index)
-{
-	BMFace *efa = BM_face_at_index(userData, index);
-
-	if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
-		GPU_select_index_set(index + 1);
-		return DM_DRAW_OPTION_NORMAL;
-	}
-	else {
-		return DM_DRAW_OPTION_SKIP;
-	}
-}
-#endif
-
 static void bbs_mesh_face(BMEditMesh *em, DerivedMesh *dm, const bool use_select)
 {
-#if defined(WITH_LEGACY_OPENGL)
-	if (use_select) {
-		dm->drawMappedFaces(
-		        dm, bbs_mesh_solid__setSolidDrawOptions, NULL, NULL, em->bm,
-		        DM_DRAW_SKIP_HIDDEN | DM_DRAW_SELECT_USE_EDITMODE);
-	}
-	else {
-		dm->drawMappedFaces(
-		        dm, bbs_mesh_mask__setSolidDrawOptions, NULL, NULL, em->bm,
-		        DM_DRAW_SKIP_HIDDEN | DM_DRAW_SELECT_USE_EDITMODE | DM_DRAW_SKIP_SELECT);
-	}
-#else
 	UNUSED_VARS(dm);
 
 	drawBMOffset_userData data;
@@ -9574,7 +9513,6 @@ static void bbs_mesh_face(BMEditMesh *em, DerivedMesh *dm, const bool use_select
 	immEnd();
 
 	immUnbindProgram();
-#endif
 }
 
 static void bbs_mesh_solid__drawCenter(void *userData, int index, const float cent[3], const float UNUSED(no[3]))
@@ -9675,18 +9613,6 @@ static void bbs_mesh_solid_verts(Scene *scene, Object *ob)
 static void bbs_mesh_solid_faces(Scene *scene, Object *ob)
 {
 	Mesh *me = ob->data;
-#if defined(WITH_LEGACY_OPENGL)
-	DerivedMesh *dm = mesh_get_derived_final(scene, ob, scene->customdata_mask);
-	
-	DM_update_materials(dm, ob);
-
-	if ((me->editflag & ME_EDIT_PAINT_FACE_SEL))
-		dm->drawMappedFaces(dm, bbs_mesh_solid_hide__setDrawOpts, NULL, NULL, me, DM_DRAW_SKIP_HIDDEN);
-	else
-		dm->drawMappedFaces(dm, bbs_mesh_solid__setDrawOpts, NULL, NULL, me, 0);
-
-	dm->release(dm);
-#else
 	UNUSED_VARS(scene, bbs_mesh_solid_hide__setDrawOpts, bbs_mesh_solid__setDrawOpts);
 	Batch *batch;
 	if ((me->editflag & ME_EDIT_PAINT_FACE_SEL)) {
@@ -9697,7 +9623,6 @@ static void bbs_mesh_solid_faces(Scene *scene, Object *ob)
 	}
 	Batch_set_builtin_program(batch, GPU_SHADER_3D_FLAT_COLOR_U32);
 	Batch_draw(batch);
-#endif
 }
 
 void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob)