Revert "Fix use-after free in DRW_shader_create_with_lib"

Caused an error entering edit-mode.

d60f26f37a & 2659500835

7 files changed, 43 insertions, 43 deletions

diff --git a/source/blender/draw/modes/edit_curve_mode.c b/source/blender/draw/modes/edit_curve_mode.c
index 6b37e04a794..ec12f7570c2 100644
--- a/source/blender/draw/modes/edit_curve_mode.c
+++ b/source/blender/draw/modes/edit_curve_mode.c
@@ -164,14 +164,14 @@ static void EDIT_CURVE_engine_init(void *vedata)
 		        datatoc_edit_curve_overlay_loosevert_vert_glsl,
 		        datatoc_edit_curve_overlay_handle_geom_glsl,
 		        datatoc_gpu_shader_flat_color_frag_glsl,
-		        NULL, datatoc_common_globals_lib_glsl);
+		        datatoc_common_globals_lib_glsl, NULL);
 	}
 
 	if (!e_data.overlay_vert_sh) {
 		e_data.overlay_vert_sh = DRW_shader_create_with_lib(
 		        datatoc_edit_curve_overlay_loosevert_vert_glsl, NULL,
 		        datatoc_edit_curve_overlay_frag_glsl,
-		        NULL, datatoc_common_globals_lib_glsl);
+		        datatoc_common_globals_lib_glsl, NULL);
 	}
 }
 
diff --git a/source/blender/draw/modes/edit_lattice_mode.c b/source/blender/draw/modes/edit_lattice_mode.c
index 23352118e04..ff4c557326e 100644
--- a/source/blender/draw/modes/edit_lattice_mode.c
+++ b/source/blender/draw/modes/edit_lattice_mode.c
@@ -151,7 +151,7 @@ static void EDIT_LATTICE_engine_init(void *vedata)
 		e_data.overlay_vert_sh = DRW_shader_create_with_lib(
 		        datatoc_edit_lattice_overlay_loosevert_vert_glsl, NULL,
 		        datatoc_edit_lattice_overlay_frag_glsl,
-		        NULL, datatoc_common_globals_lib_glsl);
+		        datatoc_common_globals_lib_glsl, NULL);
 	}
 }
 
diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c
index 110988a8420..1a8c03e3933 100644
--- a/source/blender/draw/modes/edit_mesh_mode.c
+++ b/source/blender/draw/modes/edit_mesh_mode.c
@@ -156,72 +156,72 @@ static void EDIT_MESH_engine_init(void *vedata)
 		        datatoc_edit_mesh_overlay_vert_glsl,
 		        datatoc_edit_mesh_overlay_geom_tri_glsl,
 		        datatoc_edit_mesh_overlay_frag_glsl,
+		        datatoc_common_globals_lib_glsl,
 		        "#define EDGE_FIX\n"
 		        "#define ANTI_ALIASING\n"
-		        "#define VERTEX_FACING",
-		        datatoc_common_globals_lib_glsl);
+		        "#define VERTEX_FACING");
 	}
 	if (!e_data.overlay_tri_fast_sh) {
 		e_data.overlay_tri_fast_sh = DRW_shader_create_with_lib(
 		        datatoc_edit_mesh_overlay_vert_glsl,
 		        datatoc_edit_mesh_overlay_geom_tri_glsl,
 		        datatoc_edit_mesh_overlay_frag_glsl,
+		        datatoc_common_globals_lib_glsl,
 		        "#define ANTI_ALIASING\n"
-		        "#define VERTEX_FACING\n",
-		        datatoc_common_globals_lib_glsl);
+		        "#define VERTEX_FACING\n");
 	}
 	if (!e_data.overlay_tri_vcol_sh) {
 		e_data.overlay_tri_vcol_sh = DRW_shader_create_with_lib(
 		        datatoc_edit_mesh_overlay_vert_glsl,
 		        datatoc_edit_mesh_overlay_geom_tri_glsl,
 		        datatoc_edit_mesh_overlay_frag_glsl,
+		        datatoc_common_globals_lib_glsl,
 		        "#define EDGE_FIX\n"
 		        "#define VERTEX_SELECTION\n"
 		        "#define ANTI_ALIASING\n"
-		        "#define VERTEX_FACING\n",
-		        datatoc_common_globals_lib_glsl);
+		        "#define VERTEX_FACING\n");
 	}
 	if (!e_data.overlay_tri_vcol_fast_sh) {
 		e_data.overlay_tri_vcol_fast_sh = DRW_shader_create_with_lib(
 		        datatoc_edit_mesh_overlay_vert_glsl,
 		        datatoc_edit_mesh_overlay_geom_tri_glsl,
 		        datatoc_edit_mesh_overlay_frag_glsl,
+		        datatoc_common_globals_lib_glsl,
 		        "#define VERTEX_SELECTION\n"
 		        "#define ANTI_ALIASING\n"
-		        "#define VERTEX_FACING\n",
-		        datatoc_common_globals_lib_glsl);
+		        "#define VERTEX_FACING\n");
 	}
 	if (!e_data.overlay_edge_sh) {
 		e_data.overlay_edge_sh = DRW_shader_create_with_lib(
 		        datatoc_edit_mesh_overlay_vert_glsl,
 		        datatoc_edit_mesh_overlay_geom_edge_glsl,
 		        datatoc_edit_mesh_overlay_frag_glsl,
+		        datatoc_common_globals_lib_glsl,
 		        "#define ANTI_ALIASING\n"
-		        "#define VERTEX_FACING\n",
-		        datatoc_common_globals_lib_glsl);
+		        "#define VERTEX_FACING\n");
 	}
 	if (!e_data.overlay_edge_vcol_sh) {
 		e_data.overlay_edge_vcol_sh = DRW_shader_create_with_lib(
 		        datatoc_edit_mesh_overlay_vert_glsl,
 		        datatoc_edit_mesh_overlay_geom_edge_glsl,
 		        datatoc_edit_mesh_overlay_frag_glsl,
+		        datatoc_common_globals_lib_glsl,
 		        "#define VERTEX_SELECTION\n"
-		        "#define VERTEX_FACING\n",
-		        datatoc_common_globals_lib_glsl);
+		        "#define VERTEX_FACING\n");
 	}
 	if (!e_data.overlay_vert_sh) {
 		e_data.overlay_vert_sh = DRW_shader_create_with_lib(
 		        datatoc_edit_mesh_overlay_loosevert_vert_glsl, NULL,
 		        datatoc_edit_mesh_overlay_frag_glsl,
-		        "#define VERTEX_SELECTION\n",
-		        datatoc_common_globals_lib_glsl);
+		        datatoc_common_globals_lib_glsl,
+		        "#define VERTEX_SELECTION\n");
 	}
 	if (!e_data.overlay_facedot_sh) {
 		e_data.overlay_facedot_sh = DRW_shader_create_with_lib(
 		        datatoc_edit_mesh_overlay_facedot_vert_glsl, NULL,
 		        datatoc_edit_mesh_overlay_facedot_frag_glsl,
-		        "#define VERTEX_FACING\n",
-		        datatoc_common_globals_lib_glsl);
+		        datatoc_common_globals_lib_glsl,
+		        "#define VERTEX_FACING\n");
 	}
 	if (!e_data.overlay_mix_sh) {
 		e_data.overlay_mix_sh = DRW_shader_create_fullscreen(datatoc_edit_mesh_overlay_mix_frag_glsl, NULL);
@@ -230,27 +230,27 @@ static void EDIT_MESH_engine_init(void *vedata)
 		e_data.overlay_facefill_sh = DRW_shader_create_with_lib(
 		        datatoc_edit_mesh_overlay_facefill_vert_glsl, NULL,
 		        datatoc_edit_mesh_overlay_facefill_frag_glsl,
-		        NULL, datatoc_common_globals_lib_glsl);
+		        datatoc_common_globals_lib_glsl, NULL);
 	}
 	if (!e_data.normals_face_sh) {
 		e_data.normals_face_sh = DRW_shader_create(
 		        datatoc_edit_normals_vert_glsl,
 		        datatoc_edit_normals_geom_glsl,
-		        "#define FACE_NORMALS\n",
-		        datatoc_gpu_shader_uniform_color_frag_glsl);
+		        datatoc_gpu_shader_uniform_color_frag_glsl,
+		        "#define FACE_NORMALS\n");
 	}
 	if (!e_data.normals_loop_sh) {
 		e_data.normals_loop_sh = DRW_shader_create(
 		        datatoc_edit_normals_vert_glsl,
 		        datatoc_edit_normals_geom_glsl,
-		        "#define LOOP_NORMALS\n",
-		        datatoc_gpu_shader_uniform_color_frag_glsl);
+		        datatoc_gpu_shader_uniform_color_frag_glsl,
+		        "#define LOOP_NORMALS\n");
 	}
 	if (!e_data.normals_sh) {
 		e_data.normals_sh = DRW_shader_create(
 		        datatoc_edit_normals_vert_glsl,
 		        datatoc_edit_normals_geom_glsl,
-		        NULL, datatoc_gpu_shader_uniform_color_frag_glsl);
+		        datatoc_gpu_shader_uniform_color_frag_glsl, NULL);
 	}
 	if (!e_data.depth_sh) {
 		e_data.depth_sh = DRW_shader_create_3D_depth_only();
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 06c19844d7c..4e19eff3cfb 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -291,9 +291,9 @@ static void OBJECT_engine_init(void *vedata)
 		e_data.outline_resolve_aa_sh = DRW_shader_create_with_lib(
 		            datatoc_gpu_shader_fullscreen_vert_glsl, NULL,
 		            datatoc_object_outline_resolve_frag_glsl,
+		            datatoc_common_fxaa_lib_glsl,
 		            "#define FXAA_ALPHA\n"
-		            "#define USE_FXAA\n",
-		            datatoc_common_fxaa_lib_glsl);
+		            "#define USE_FXAA\n");
 	}
 
 	if (!e_data.outline_detect_sh) {
@@ -307,23 +307,23 @@ static void OBJECT_engine_init(void *vedata)
 	if (!e_data.object_empty_image_sh) {
 		e_data.object_empty_image_sh = DRW_shader_create_with_lib(
 		           datatoc_object_empty_image_vert_glsl, NULL,
-		           datatoc_object_empty_image_frag_glsl, NULL,
-		           datatoc_common_globals_lib_glsl);
+		           datatoc_object_empty_image_frag_glsl,
+		           datatoc_common_globals_lib_glsl, NULL);
 	}
 
 	if (!e_data.object_empty_image_wire_sh) {
 		e_data.object_empty_image_wire_sh = DRW_shader_create_with_lib(
 		           datatoc_object_empty_image_vert_glsl, NULL,
 		           datatoc_object_empty_image_frag_glsl,
-		           "#define USE_WIRE\n",
-		           datatoc_common_globals_lib_glsl);
+		           datatoc_common_globals_lib_glsl,
+		           "#define USE_WIRE\n");
 	}
 
 	if (!e_data.grid_sh) {
 		e_data.grid_sh = DRW_shader_create_with_lib(
 		        datatoc_object_grid_vert_glsl, NULL,
-		        datatoc_object_grid_frag_glsl, NULL,
-		        datatoc_common_globals_lib_glsl);
+		        datatoc_object_grid_frag_glsl,
+		        datatoc_common_globals_lib_glsl, NULL);
 	}
 
 	if (!e_data.part_prim_sh) {
diff --git a/source/blender/draw/modes/paint_texture_mode.c b/source/blender/draw/modes/paint_texture_mode.c
index 505f4d1494d..b49da0cba2f 100644
--- a/source/blender/draw/modes/paint_texture_mode.c
+++ b/source/blender/draw/modes/paint_texture_mode.c
@@ -161,8 +161,8 @@ static void PAINT_TEXTURE_engine_init(void *vedata)
 
 		e_data.image_sh = DRW_shader_create_with_lib(
 		        datatoc_paint_texture_vert_glsl, NULL,
-		        datatoc_paint_texture_frag_glsl, NULL,
-		        datatoc_common_globals_lib_glsl);
+		        datatoc_paint_texture_frag_glsl,
+		        datatoc_common_globals_lib_glsl, NULL);
 
 	}
 
@@ -170,8 +170,8 @@ static void PAINT_TEXTURE_engine_init(void *vedata)
 		e_data.wire_overlay_shader = DRW_shader_create_with_lib(
 		        datatoc_paint_wire_vert_glsl, NULL,
 		        datatoc_paint_wire_frag_glsl,
-		        "#define VERTEX_MODE\n",
-		        datatoc_common_globals_lib_glsl);
+		        datatoc_common_globals_lib_glsl,
+		        "#define VERTEX_MODE\n");
 	}
 
 	if (!e_data.face_overlay_shader) {
diff --git a/source/blender/draw/modes/paint_vertex_mode.c b/source/blender/draw/modes/paint_vertex_mode.c
index 53686b052a7..e430fca5742 100644
--- a/source/blender/draw/modes/paint_vertex_mode.c
+++ b/source/blender/draw/modes/paint_vertex_mode.c
@@ -87,8 +87,8 @@ static void PAINT_VERTEX_engine_init(void *UNUSED(vedata))
 	if (!e_data.wire_overlay_shader) {
 		e_data.wire_overlay_shader = DRW_shader_create_with_lib(
 		        datatoc_paint_wire_vert_glsl, NULL,
-		        datatoc_paint_wire_frag_glsl, "#define VERTEX_MODE\n",
-		        datatoc_common_globals_lib_glsl);
+		        datatoc_paint_wire_frag_glsl,
+		        datatoc_common_globals_lib_glsl, "#define VERTEX_MODE\n");
 	}
 
 	if (!e_data.face_overlay_shader) {
diff --git a/source/blender/draw/modes/paint_weight_mode.c b/source/blender/draw/modes/paint_weight_mode.c
index 067baf6a199..e139b4af97f 100644
--- a/source/blender/draw/modes/paint_weight_mode.c
+++ b/source/blender/draw/modes/paint_weight_mode.c
@@ -102,8 +102,8 @@ static void PAINT_WEIGHT_engine_init(void *UNUSED(vedata))
 	if (!e_data.wire_overlay_shader) {
 		e_data.wire_overlay_shader = DRW_shader_create_with_lib(
 		        datatoc_paint_wire_vert_glsl, NULL,
-		        datatoc_paint_wire_frag_glsl, "#define WEIGHT_MODE\n",
-		        datatoc_common_globals_lib_glsl);
+		        datatoc_paint_wire_frag_glsl,
+		        datatoc_common_globals_lib_glsl, "#define WEIGHT_MODE\n");
 	}
 
 	if (!e_data.face_overlay_shader) {
@@ -113,8 +113,8 @@ static void PAINT_WEIGHT_engine_init(void *UNUSED(vedata))
 	if (!e_data.vert_overlay_shader) {
 		e_data.vert_overlay_shader = DRW_shader_create_with_lib(
 		        datatoc_paint_wire_vert_glsl, NULL,
-		        datatoc_paint_vert_frag_glsl, NULL,
-		        datatoc_common_globals_lib_glsl);
+		        datatoc_paint_vert_frag_glsl,
+		        datatoc_common_globals_lib_glsl, NULL);
 	}
 }