Cleanup: remove unused Blender Internal render stats code

This commit is contained in:
Brecht Van Lommel 2020-10-29 12:22:25 +01:00
parent f4e8c0c104
commit 569b7c2821
6 changed files with 6 additions and 38 deletions

@ -435,20 +435,6 @@ static void make_renderinfo_string(const RenderStats *rs,
} }
} }
else { else {
if (rs->totvert || rs->totface || rs->totlamp) {
spos += sprintf(spos, "| ");
}
if (rs->totvert) {
spos += sprintf(spos, TIP_("Ve:%d "), rs->totvert);
}
if (rs->totface) {
spos += sprintf(spos, TIP_("Fa:%d "), rs->totface);
}
if (rs->totlamp) {
spos += sprintf(spos, TIP_("Li:%d "), rs->totlamp);
}
if (rs->mem_peak == 0.0f) { if (rs->mem_peak == 0.0f) {
spos += sprintf(spos, TIP_("| Mem:%.2fM (Peak %.2fM) "), megs_used_memory, megs_peak_memory); spos += sprintf(spos, TIP_("| Mem:%.2fM (Peak %.2fM) "), megs_used_memory, megs_peak_memory);
} }

@ -927,12 +927,7 @@ Render *Controller::RenderStrokes(Render *re, bool render)
float megs_used_memory = (mem_in_use) / (1024.0 * 1024.0); float megs_used_memory = (mem_in_use) / (1024.0 * 1024.0);
float megs_peak_memory = (peak_memory) / (1024.0 * 1024.0); float megs_peak_memory = (peak_memory) / (1024.0 * 1024.0);
printf("%d objs, %d verts, %d faces, mem %.2fM (peak %.2fM)\n", printf("%d objs, mem %.2fM (peak %.2fM)\n", totmesh, megs_used_memory, megs_peak_memory);
totmesh,
freestyle_render->i.totvert,
freestyle_render->i.totface,
megs_used_memory,
megs_peak_memory);
} }
delete blenderRenderer; delete blenderRenderer;

@ -159,7 +159,6 @@ typedef struct RenderResult {
typedef struct RenderStats { typedef struct RenderStats {
int cfra; int cfra;
int totface, totvert, totlamp, totpart;
bool localview; bool localview;
double starttime, lastframetime; double starttime, lastframetime;
const char *infostr, *statstr; const char *infostr, *statstr;

@ -674,7 +674,6 @@ bool RE_bake_engine(Render *re,
/* set render info */ /* set render info */
re->i.cfra = re->scene->r.cfra; re->i.cfra = re->scene->r.cfra;
BLI_strncpy(re->i.scene_name, re->scene->id.name + 2, sizeof(re->i.scene_name) - 2); BLI_strncpy(re->i.scene_name, re->scene->id.name + 2, sizeof(re->i.scene_name) - 2);
re->i.totface = re->i.totvert = re->i.totlamp = 0;
/* render */ /* render */
engine = re->engine; engine = re->engine;
@ -812,7 +811,6 @@ int RE_engine_render(Render *re, int do_all)
/* set render info */ /* set render info */
re->i.cfra = re->scene->r.cfra; re->i.cfra = re->scene->r.cfra;
BLI_strncpy(re->i.scene_name, re->scene->id.name + 2, sizeof(re->i.scene_name)); BLI_strncpy(re->i.scene_name, re->scene->id.name + 2, sizeof(re->i.scene_name));
re->i.totface = re->i.totvert = re->i.totlamp = 0;
/* render */ /* render */
engine = re->engine; engine = re->engine;

@ -268,9 +268,6 @@ void RE_parts_init(Render *re)
re->parts = BLI_ghash_new( re->parts = BLI_ghash_new(
BLI_ghashutil_inthash_v4_p, BLI_ghashutil_inthash_v4_cmp, "render parts"); BLI_ghashutil_inthash_v4_p, BLI_ghashutil_inthash_v4_cmp, "render parts");
/* this is render info for caller, is not reset when parts are freed! */
re->i.totpart = 0;
/* just for readable code.. */ /* just for readable code.. */
xminb = re->disprect.xmin; xminb = re->disprect.xmin;
yminb = re->disprect.ymin; yminb = re->disprect.ymin;
@ -328,7 +325,6 @@ void RE_parts_init(Render *re)
pa->recty = recty; pa->recty = recty;
BLI_ghash_insert(re->parts, &pa->disprect, pa); BLI_ghash_insert(re->parts, &pa->disprect, pa);
re->i.totpart++;
} }
} }
} }

@ -188,6 +188,10 @@ static int default_break(void *UNUSED(arg))
static void stats_background(void *UNUSED(arg), RenderStats *rs) static void stats_background(void *UNUSED(arg), RenderStats *rs)
{ {
if (rs->infostr == NULL) {
return;
}
uintptr_t mem_in_use, peak_memory; uintptr_t mem_in_use, peak_memory;
float megs_used_memory, megs_peak_memory; float megs_used_memory, megs_peak_memory;
char info_time_str[32]; char info_time_str[32];
@ -208,17 +212,7 @@ static void stats_background(void *UNUSED(arg), RenderStats *rs)
info_time_str, sizeof(info_time_str), PIL_check_seconds_timer() - rs->starttime); info_time_str, sizeof(info_time_str), PIL_check_seconds_timer() - rs->starttime);
fprintf(stdout, TIP_("| Time:%s | "), info_time_str); fprintf(stdout, TIP_("| Time:%s | "), info_time_str);
if (rs->infostr) {
fprintf(stdout, "%s", rs->infostr); fprintf(stdout, "%s", rs->infostr);
}
else {
fprintf(stdout,
TIP_("Sce: %s Ve:%d Fa:%d La:%d"),
rs->scene_name,
rs->totvert,
rs->totface,
rs->totlamp);
}
/* Flush stdout to be sure python callbacks are printing stuff after blender. */ /* Flush stdout to be sure python callbacks are printing stuff after blender. */
fflush(stdout); fflush(stdout);