Draw manager: Cleanup, naming

Similar to previous commit in Eevee.

13 files changed, 35 insertions, 35 deletions

diff --git a/source/blender/draw/engines/clay/clay_engine.c b/source/blender/draw/engines/clay/clay_engine.c
index c7c591555d5..5f68af1f615 100644
--- a/source/blender/draw/engines/clay/clay_engine.c
+++ b/source/blender/draw/engines/clay/clay_engine.c
@@ -197,7 +197,7 @@ static void clay_view_layer_data_free(void *storage)
 
 static CLAY_ViewLayerData *CLAY_view_layer_data_get(void)
 {
-	CLAY_ViewLayerData **sldata = (CLAY_ViewLayerData **)DRW_view_layer_engine_data_get(&draw_engine_clay_type, &clay_view_layer_data_free);
+	CLAY_ViewLayerData **sldata = (CLAY_ViewLayerData **)DRW_view_layer_engine_data_ensure(&draw_engine_clay_type, &clay_view_layer_data_free);
 
 	if (*sldata == NULL) {
 		*sldata = MEM_callocN(sizeof(**sldata), "CLAY_ViewLayerData");
diff --git a/source/blender/draw/engines/eevee/eevee_data.c b/source/blender/draw/engines/eevee/eevee_data.c
index 998f089db73..ef1ff026855 100644
--- a/source/blender/draw/engines/eevee/eevee_data.c
+++ b/source/blender/draw/engines/eevee/eevee_data.c
@@ -80,7 +80,7 @@ static void eevee_lightprobe_data_free(void *storage)
 
 EEVEE_ViewLayerData *EEVEE_view_layer_data_ensure(void)
 {
-	EEVEE_ViewLayerData **sldata = (EEVEE_ViewLayerData **)DRW_view_layer_engine_data_get(
+	EEVEE_ViewLayerData **sldata = (EEVEE_ViewLayerData **)DRW_view_layer_engine_data_ensure(
 	        &draw_engine_eevee_type, &eevee_view_layer_data_free);
 
 	if (*sldata == NULL) {
@@ -92,7 +92,7 @@ EEVEE_ViewLayerData *EEVEE_view_layer_data_ensure(void)
 
 EEVEE_ObjectEngineData *EEVEE_object_data_ensure(Object *ob)
 {
-	EEVEE_ObjectEngineData **oedata = (EEVEE_ObjectEngineData **)DRW_object_engine_data_get(
+	EEVEE_ObjectEngineData **oedata = (EEVEE_ObjectEngineData **)DRW_object_engine_data_ensure(
 	        ob, &draw_engine_eevee_type, NULL);
 
 	if (*oedata == NULL) {
@@ -104,7 +104,7 @@ EEVEE_ObjectEngineData *EEVEE_object_data_ensure(Object *ob)
 
 EEVEE_LightProbeEngineData *EEVEE_lightprobe_data_ensure(Object *ob)
 {
-	EEVEE_LightProbeEngineData **pedata = (EEVEE_LightProbeEngineData **)DRW_object_engine_data_get(
+	EEVEE_LightProbeEngineData **pedata = (EEVEE_LightProbeEngineData **)DRW_object_engine_data_ensure(
 	        ob, &draw_engine_eevee_type, &eevee_lightprobe_data_free);
 
 	if (*pedata == NULL) {
@@ -118,7 +118,7 @@ EEVEE_LightProbeEngineData *EEVEE_lightprobe_data_ensure(Object *ob)
 
 EEVEE_LampEngineData *EEVEE_lamp_data_ensure(Object *ob)
 {
-	EEVEE_LampEngineData **ledata = (EEVEE_LampEngineData **)DRW_object_engine_data_get(
+	EEVEE_LampEngineData **ledata = (EEVEE_LampEngineData **)DRW_object_engine_data_ensure(
 	        ob, &draw_engine_eevee_type, &eevee_lamp_data_free);
 
 	if (*ledata == NULL) {
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index f9ee87dfd89..a34485e7e40 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -384,12 +384,12 @@ struct DefaultTextureList     *DRW_viewport_texture_list_get(void);
 void DRW_viewport_request_redraw(void);
 
 /* ViewLayers */
-void **DRW_view_layer_engine_data_get(DrawEngineType *engine_type, void (*callback)(void *storage));
+void **DRW_view_layer_engine_data_ensure(DrawEngineType *engine_type, void (*callback)(void *storage));
 
 /* Objects */
-void **DRW_object_engine_data_get(
+void **DRW_object_engine_data_ensure(
         Object *ob, DrawEngineType *engine_type, void (*callback)(void *storage));
-struct LampEngineData *DRW_lamp_engine_data_get(Object *ob, struct RenderEngineType *engine_type);
+struct LampEngineData *DRW_lamp_engine_data_ensure(Object *ob, struct RenderEngineType *engine_type);
 void DRW_lamp_engine_data_free(struct LampEngineData *led);
 
 /* Settings */
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index ca36e054613..9efbf067591 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -2489,7 +2489,7 @@ void DRW_transform_to_display(GPUTexture *tex)
 /** \name Viewport (DRW_viewport)
  * \{ */
 
-static void *DRW_viewport_engine_data_get(void *engine_type)
+static void *DRW_viewport_engine_data_ensure(void *engine_type)
 {
 	void *data = GPU_viewport_engine_data_get(DST.viewport, engine_type);
 
@@ -2702,7 +2702,7 @@ void DRW_viewport_request_redraw(void)
 /** \name ViewLayers (DRW_scenelayer)
  * \{ */
 
-void **DRW_view_layer_engine_data_get(DrawEngineType *engine_type, void (*callback)(void *storage))
+void **DRW_view_layer_engine_data_ensure(DrawEngineType *engine_type, void (*callback)(void *storage))
 {
 	ViewLayerEngineData *sled;
 
@@ -2728,7 +2728,7 @@ void **DRW_view_layer_engine_data_get(DrawEngineType *engine_type, void (*callba
 /** \name Objects (DRW_object)
  * \{ */
 
-void **DRW_object_engine_data_get(
+void **DRW_object_engine_data_ensure(
         Object *ob, DrawEngineType *engine_type, void (*callback)(void *storage))
 {
 	ObjectEngineData *oed;
@@ -2747,9 +2747,9 @@ void **DRW_object_engine_data_get(
 	return &oed->storage;
 }
 
-/* XXX There is definitly some overlap between this and DRW_object_engine_data_get.
+/* XXX There is definitly some overlap between this and DRW_object_engine_data_ensure.
  * We should get rid of one of the two. */
-LampEngineData *DRW_lamp_engine_data_get(Object *ob, RenderEngineType *engine_type)
+LampEngineData *DRW_lamp_engine_data_ensure(Object *ob, RenderEngineType *engine_type)
 {
 	BLI_assert(ob->type == OB_LAMP);
 
@@ -2777,7 +2777,7 @@ static void DRW_engines_init(void)
 {
 	for (LinkData *link = DST.enabled_engines.first; link; link = link->next) {
 		DrawEngineType *engine = link->data;
-		ViewportEngineData *data = DRW_viewport_engine_data_get(engine);
+		ViewportEngineData *data = DRW_viewport_engine_data_ensure(engine);
 		PROFILE_START(stime);
 
 		if (engine->engine_init) {
@@ -2792,7 +2792,7 @@ static void DRW_engines_cache_init(void)
 {
 	for (LinkData *link = DST.enabled_engines.first; link; link = link->next) {
 		DrawEngineType *engine = link->data;
-		ViewportEngineData *data = DRW_viewport_engine_data_get(engine);
+		ViewportEngineData *data = DRW_viewport_engine_data_ensure(engine);
 
 		if (data->text_draw_cache) {
 			DRW_text_cache_destroy(data->text_draw_cache);
@@ -2812,7 +2812,7 @@ static void DRW_engines_cache_populate(Object *ob)
 {
 	for (LinkData *link = DST.enabled_engines.first; link; link = link->next) {
 		DrawEngineType *engine = link->data;
-		ViewportEngineData *data = DRW_viewport_engine_data_get(engine);
+		ViewportEngineData *data = DRW_viewport_engine_data_ensure(engine);
 
 		if (engine->cache_populate) {
 			engine->cache_populate(data, ob);
@@ -2824,7 +2824,7 @@ static void DRW_engines_cache_finish(void)
 {
 	for (LinkData *link = DST.enabled_engines.first; link; link = link->next) {
 		DrawEngineType *engine = link->data;
-		ViewportEngineData *data = DRW_viewport_engine_data_get(engine);
+		ViewportEngineData *data = DRW_viewport_engine_data_ensure(engine);
 
 		if (engine->cache_finish) {
 			engine->cache_finish(data);
@@ -2836,7 +2836,7 @@ static void DRW_engines_draw_background(void)
 {
 	for (LinkData *link = DST.enabled_engines.first; link; link = link->next) {
 		DrawEngineType *engine = link->data;
-		ViewportEngineData *data = DRW_viewport_engine_data_get(engine);
+		ViewportEngineData *data = DRW_viewport_engine_data_ensure(engine);
 
 		if (engine->draw_background) {
 			PROFILE_START(stime);
@@ -2858,7 +2858,7 @@ static void DRW_engines_draw_scene(void)
 {
 	for (LinkData *link = DST.enabled_engines.first; link; link = link->next) {
 		DrawEngineType *engine = link->data;
-		ViewportEngineData *data = DRW_viewport_engine_data_get(engine);
+		ViewportEngineData *data = DRW_viewport_engine_data_ensure(engine);
 		PROFILE_START(stime);
 
 		if (engine->draw_scene) {
@@ -2875,7 +2875,7 @@ static void DRW_engines_draw_text(void)
 {
 	for (LinkData *link = DST.enabled_engines.first; link; link = link->next) {
 		DrawEngineType *engine = link->data;
-		ViewportEngineData *data = DRW_viewport_engine_data_get(engine);
+		ViewportEngineData *data = DRW_viewport_engine_data_ensure(engine);
 		PROFILE_START(stime);
 
 		if (data->text_draw_cache) {
@@ -2896,7 +2896,7 @@ int DRW_draw_region_engine_info_offset(void)
 	int lines = 0;
 	for (LinkData *link = DST.enabled_engines.first; link; link = link->next) {
 		DrawEngineType *engine = link->data;
-		ViewportEngineData *data = DRW_viewport_engine_data_get(engine);
+		ViewportEngineData *data = DRW_viewport_engine_data_ensure(engine);
 
 		/* Count the number of lines. */
 		if (data->info[0] != '\0') {
@@ -2931,7 +2931,7 @@ void DRW_draw_region_engine_info(void)
 
 	for (LinkData *link = DST.enabled_engines.first; link; link = link->next) {
 		DrawEngineType *engine = link->data;
-		ViewportEngineData *data = DRW_viewport_engine_data_get(engine);
+		ViewportEngineData *data = DRW_viewport_engine_data_ensure(engine);
 
 		if (data->info[0] != '\0') {
 			char *chr_current = data->info;
@@ -3133,7 +3133,7 @@ static void DRW_debug_cpu_stats(void)
 	for (LinkData *link = DST.enabled_engines.first; link; link = link->next) {
 		u = 0;
 		DrawEngineType *engine = link->data;
-		ViewportEngineData *data = DRW_viewport_engine_data_get(engine);
+		ViewportEngineData *data = DRW_viewport_engine_data_ensure(engine);
 
 		draw_stat(&rect, u++, v, engine->idname, sizeof(engine->idname));
 
@@ -3245,7 +3245,7 @@ void DRW_notify_view_update(const DRWUpdateContext *update_ctx)
 
 	for (LinkData *link = DST.enabled_engines.first; link; link = link->next) {
 		DrawEngineType *draw_engine = link->data;
-		ViewportEngineData *data = DRW_viewport_engine_data_get(draw_engine);
+		ViewportEngineData *data = DRW_viewport_engine_data_ensure(draw_engine);
 
 		if (draw_engine->view_update) {
 			draw_engine->view_update(data);
@@ -3288,7 +3288,7 @@ void DRW_notify_id_update(const DRWUpdateContext *update_ctx, ID *id)
 	DRW_engines_enable(scene, view_layer, engine_type);
 	for (LinkData *link = DST.enabled_engines.first; link; link = link->next) {
 		DrawEngineType *draw_engine = link->data;
-		ViewportEngineData *data = DRW_viewport_engine_data_get(draw_engine);
+		ViewportEngineData *data = DRW_viewport_engine_data_ensure(draw_engine);
 		if (draw_engine->id_update) {
 			draw_engine->id_update(data, id);
 		}
diff --git a/source/blender/draw/modes/edit_curve_mode.c b/source/blender/draw/modes/edit_curve_mode.c
index 1d542fc8e7e..1ecf1a60a35 100644
--- a/source/blender/draw/modes/edit_curve_mode.c
+++ b/source/blender/draw/modes/edit_curve_mode.c
@@ -89,7 +89,7 @@ typedef struct EDIT_CURVE_StorageList {
 } EDIT_CURVE_StorageList;
 
 typedef struct EDIT_CURVE_Data {
-	/* Struct returned by DRW_viewport_engine_data_get.
+	/* Struct returned by DRW_viewport_engine_data_ensure.
 	 * If you don't use one of these, just make it a (void *) */
 	// void *fbl;
 	void *engine_type; /* Required */
diff --git a/source/blender/draw/modes/edit_lattice_mode.c b/source/blender/draw/modes/edit_lattice_mode.c
index 675ea925a39..ff4c557326e 100644
--- a/source/blender/draw/modes/edit_lattice_mode.c
+++ b/source/blender/draw/modes/edit_lattice_mode.c
@@ -85,7 +85,7 @@ typedef struct EDIT_LATTICE_StorageList {
 } EDIT_LATTICE_StorageList;
 
 typedef struct EDIT_LATTICE_Data {
-	/* Struct returned by DRW_viewport_engine_data_get.
+	/* Struct returned by DRW_viewport_engine_data_ensure.
 	 * If you don't use one of these, just make it a (void *) */
 	// void *fbl;
 	void *engine_type; /* Required */
diff --git a/source/blender/draw/modes/edit_metaball_mode.c b/source/blender/draw/modes/edit_metaball_mode.c
index fb61114686b..a83f5ae33bc 100644
--- a/source/blender/draw/modes/edit_metaball_mode.c
+++ b/source/blender/draw/modes/edit_metaball_mode.c
@@ -81,7 +81,7 @@ typedef struct EDIT_METABALL_StorageList {
 } EDIT_METABALL_StorageList;
 
 typedef struct EDIT_METABALL_Data {
-	/* Struct returned by DRW_viewport_engine_data_get.
+	/* Struct returned by DRW_viewport_engine_data_ensure.
 	 * If you don't use one of these, just make it a (void *) */
 	// void *fbl;
 	void *engine_type; /* Required */
diff --git a/source/blender/draw/modes/edit_surface_mode.c b/source/blender/draw/modes/edit_surface_mode.c
index e99973144aa..4e60c4abff5 100644
--- a/source/blender/draw/modes/edit_surface_mode.c
+++ b/source/blender/draw/modes/edit_surface_mode.c
@@ -76,7 +76,7 @@ typedef struct EDIT_SURFACE_StorageList {
 } EDIT_SURFACE_StorageList;
 
 typedef struct EDIT_SURFACE_Data {
-	/* Struct returned by DRW_viewport_engine_data_get.
+	/* Struct returned by DRW_viewport_engine_data_ensure.
 	 * If you don't use one of these, just make it a (void *) */
 	// void *fbl;
 	void *engine_type; /* Required */
diff --git a/source/blender/draw/modes/edit_text_mode.c b/source/blender/draw/modes/edit_text_mode.c
index 476a2ab9ac2..b375bad84b5 100644
--- a/source/blender/draw/modes/edit_text_mode.c
+++ b/source/blender/draw/modes/edit_text_mode.c
@@ -83,7 +83,7 @@ typedef struct EDIT_TEXT_StorageList {
 } EDIT_TEXT_StorageList;
 
 typedef struct EDIT_TEXT_Data {
-	/* Struct returned by DRW_viewport_engine_data_get.
+	/* Struct returned by DRW_viewport_engine_data_ensure.
 	 * If you don't use one of these, just make it a (void *) */
 	// void *fbl;
 	void *engine_type; /* Required */
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index a1bb12aec25..91b64818eff 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -1110,7 +1110,7 @@ static void DRW_shgroup_lamp(OBJECT_StorageList *stl, Object *ob, ViewLayer *vie
 	int theme_id = DRW_object_wire_theme_get(ob, view_layer, &color);
 	static float zero = 0.0f;
 
-	float **la_mats = (float **)DRW_object_engine_data_get(ob, &draw_engine_object_type, NULL);
+	float **la_mats = (float **)DRW_object_engine_data_ensure(ob, &draw_engine_object_type, NULL);
 	if (*la_mats == NULL) {
 		/* we need 2 matrices */
 		*la_mats = MEM_mallocN(sizeof(float) * 16 * 2, "Lamp Object Mode Matrices");
@@ -1456,7 +1456,7 @@ static void DRW_shgroup_lightprobe(OBJECT_StorageList *stl, OBJECT_PassList *psl
 	DRW_object_wire_theme_get(ob, view_layer, &color);
 
 	OBJECT_LightProbeEngineData *prb_data;
-	OBJECT_LightProbeEngineData **prb_data_pt = (OBJECT_LightProbeEngineData **)DRW_object_engine_data_get(ob, &draw_engine_object_type, NULL);
+	OBJECT_LightProbeEngineData **prb_data_pt = (OBJECT_LightProbeEngineData **)DRW_object_engine_data_ensure(ob, &draw_engine_object_type, NULL);
 	if (*prb_data_pt == NULL) {
 		*prb_data_pt = MEM_mallocN(sizeof(OBJECT_LightProbeEngineData), "Probe Clip distances Matrices");
 	}
diff --git a/source/blender/draw/modes/paint_texture_mode.c b/source/blender/draw/modes/paint_texture_mode.c
index f898770acef..b49da0cba2f 100644
--- a/source/blender/draw/modes/paint_texture_mode.c
+++ b/source/blender/draw/modes/paint_texture_mode.c
@@ -90,7 +90,7 @@ typedef struct PAINT_TEXTURE_StorageList {
 } PAINT_TEXTURE_StorageList;
 
 typedef struct PAINT_TEXTURE_Data {
-	/* Struct returned by DRW_viewport_engine_data_get.
+	/* Struct returned by DRW_viewport_engine_data_ensure.
 	 * If you don't use one of these, just make it a (void *) */
 	// void *fbl;
 	void *engine_type; /* Required */
diff --git a/source/blender/draw/modes/particle_mode.c b/source/blender/draw/modes/particle_mode.c
index be076815f4c..6a3e53a72c2 100644
--- a/source/blender/draw/modes/particle_mode.c
+++ b/source/blender/draw/modes/particle_mode.c
@@ -70,7 +70,7 @@ typedef struct PARTICLE_StorageList {
 } PARTICLE_StorageList;
 
 typedef struct PARTICLE_Data {
-	/* Struct returned by DRW_viewport_engine_data_get.
+	/* Struct returned by DRW_viewport_engine_data_ensure.
 	 * If you don't use one of these, just make it a (void *) */
 	// void *fbl;
 	void *engine_type; /* Required */
diff --git a/source/blender/draw/modes/sculpt_mode.c b/source/blender/draw/modes/sculpt_mode.c
index f38e6565065..d9f1f5ebe91 100644
--- a/source/blender/draw/modes/sculpt_mode.c
+++ b/source/blender/draw/modes/sculpt_mode.c
@@ -80,7 +80,7 @@ typedef struct SCULPT_StorageList {
 } SCULPT_StorageList;
 
 typedef struct SCULPT_Data {
-	/* Struct returned by DRW_viewport_engine_data_get.
+	/* Struct returned by DRW_viewport_engine_data_ensure.
 	 * If you don't use one of these, just make it a (void *) */
 	// void *fbl;
 	void *engine_type; /* Required */