Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-25 14:57:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] don't calculate FPS if we are not showing it

Browse Source
This commit is contained in:
Geoffrey McRae 2018-12-13 01:28:00 +11:00
parent 49bd091359
commit 692d48df87
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
client/main.c
View File

@ -67,7 +67,6 @@ struct AppState
int shmFD; int shmFD;
struct KVMFRHeader * shm; struct KVMFRHeader * shm;
unsigned int shmSize; unsigned int shmSize;
int64_t fpsSleep;
uint64_t lastFrameTime; uint64_t lastFrameTime;
uint64_t renderTime; uint64_t renderTime;
@ -204,20 +203,23 @@ int renderThread(void * unused)
if (!state.lgr->render(state.lgrData, state.window)) if (!state.lgr->render(state.lgrData, state.window))
break; break;
const uint64_t t = nanotime(); if (params.showFPS)
state.renderTime += t - state.lastFrameTime;
state.lastFrameTime = t;
++state.renderCount;
if (state.renderTime > 1e9)
{ {
const float avgUPS = 1000.0f / (((float)state.renderTime / state.frameCount ) / 1e6f); const uint64_t t = nanotime();
const float avgFPS = 1000.0f / (((float)state.renderTime / state.renderCount) / 1e6f); state.renderTime += t - state.lastFrameTime;
state.lgr->update_fps(state.lgrData, avgUPS, avgFPS); state.lastFrameTime = t;
++state.renderCount;
state.renderTime = 0; if (state.renderTime > 1e9)
state.frameCount = 0; {
state.renderCount = 0; const float avgUPS = 1000.0f / (((float)state.renderTime / state.frameCount ) / 1e6f);
const float avgFPS = 1000.0f / (((float)state.renderTime / state.renderCount) / 1e6f);
state.lgr->update_fps(state.lgrData, avgUPS, avgFPS);
state.renderTime = 0;
state.frameCount = 0;
state.renderCount = 0;
}
} }
uint64_t nsec = time.tv_nsec + (1e9 / params.fpsLimit); uint64_t nsec = time.tv_nsec + (1e9 / params.fpsLimit);
@ -758,7 +760,6 @@ int run()
state.running = true; state.running = true;
state.scaleX = 1.0f; state.scaleX = 1.0f;
state.scaleY = 1.0f; state.scaleY = 1.0f;
state.fpsSleep = 1000000 / params.fpsLimit;
char* XDG_SESSION_TYPE = getenv("XDG_SESSION_TYPE"); char* XDG_SESSION_TYPE = getenv("XDG_SESSION_TYPE");