blender
/
blender
133
398
Fork 577
Code Issues 6.3k Pull Requests 740 Projects 19 Wiki Activity

DRW: Remove uneeded calls to drw_viewport_engine_data_ensure when iterating 

This remove a bit of overhead specially in scene with lots of objects.
This commit is contained in:
Clément Foucault 2019-05-07 18:40:02 +02:00
parent 820a64b9e5
commit ac2e23c739
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/draw/intern/draw_manager.c
View File

@ -1043,9 +1043,14 @@ static void drw_engines_init(void)
static void drw_engines_cache_init(void)
{
for (LinkData *link = DST.enabled_engines.first; link; link = link->next) {
int enabled_engine_count = BLI_listbase_count(&DST.enabled_engines);
DST.vedata_array = MEM_mallocN(sizeof(void *) * enabled_engine_count, __func__);
int i = 0;
for (LinkData *link = DST.enabled_engines.first; link; link = link->next, i++) {
DrawEngineType *engine = link->data;
ViewportEngineData *data = drw_viewport_engine_data_ensure(engine);
DST.vedata_array[i] = data;
if (data->text_draw_cache) {
DRW_text_cache_destroy(data->text_draw_cache);
@ -1087,9 +1092,10 @@ static void drw_engines_cache_populate(Object *ob)
* ourselves here. */
drw_drawdata_unlink_dupli((ID *)ob);
for (LinkData *link = DST.enabled_engines.first; link; link = link->next) {
int i = 0;
for (LinkData *link = DST.enabled_engines.first; link; link = link->next, i++) {
DrawEngineType *engine = link->data;
ViewportEngineData *data = drw_viewport_engine_data_ensure(engine);
ViewportEngineData *data = DST.vedata_array[i];
if (engine->id_update) {
engine->id_update(data, &ob->id);
@ -1111,14 +1117,16 @@ static void drw_engines_cache_populate(Object *ob)
static void drw_engines_cache_finish(void)
{
for (LinkData *link = DST.enabled_engines.first; link; link = link->next) {
int i = 0;
for (LinkData *link = DST.enabled_engines.first; link; link = link->next, i++) {
DrawEngineType *engine = link->data;
ViewportEngineData *data = drw_viewport_engine_data_ensure(engine);
ViewportEngineData *data = DST.vedata_array[i];
if (engine->cache_finish) {
engine->cache_finish(data);
}
}
MEM_freeN(DST.vedata_array);
}
static void drw_engines_draw_background(void)

1
source/blender/draw/intern/draw_manager.h
View File

@ -364,6 +364,7 @@ typedef struct DRWManager {
struct DRWTextStore **text_store_p;
ListBase enabled_engines; /* RenderEngineType */
void **vedata_array; /* ViewportEngineData */
bool buffer_finish_called; /* Avoid bad usage of DRW_render_instance_buffer_finish */